ats-pkg 3.2.5.6 → 3.2.5.10

raw patch · 5 files changed

+14/−6 lines, 5 files

Files

CHANGELOG.md +4/−0
ats-pkg.cabal +1/−1
dhall/atspkg-prelude.dhall +1/−1
src/Language/ATS/Package/Build.hs +2/−1
src/Language/ATS/Package/Compiler.hs +6/−3

CHANGELOG.md view

@@ -1,5 +1,9 @@ # ats-pkg +## 3.2.5.10++  * Use better URL+ ## 3.2.5.6    * Use `libarchive` instead of `tar`

ats-pkg.cabal view

@@ -1,6 +1,6 @@ cabal-version: 2.0 name: ats-pkg-version: 3.2.5.6+version: 3.2.5.10 license: BSD3 license-file: LICENSE copyright: Copyright: (c) 2018-2019 Vanessa McHale

dhall/atspkg-prelude.dhall view

@@ -74,7 +74,7 @@  let script =   λ(x : {dir : Text, target : Optional Text}) →-    { configure = [ "./configure --prefix=${x.dir}" ] : Optional Text, build = "make -j4", install = "make install" } : Script+    { configure = [ "./configure --prefix=${x.dir}" ] : Optional Text, build = "make -j6", install = "make install" } : Script in  let src =

src/Language/ATS/Package/Build.hs view

@@ -271,8 +271,9 @@  -- | The directory that will be @PATSHOME@. patsHomeAtsPkg :: MonadIO m => Version -> m String-patsHomeAtsPkg v = fmap (</> (vs </> "ATS2-Postiats-" ++ vs)) (pkgHome (GCC Nothing Nothing))+patsHomeAtsPkg v = fmap (</> vs) (pkgHome (GCC Nothing Nothing))     where vs = show v+          -- gmp = if v >= Version [0,3,13] then "gmp-" else ""  home' :: MonadIO m => Version -- ^ Compiler version                    -> Version -- ^ Library version

src/Language/ATS/Package/Compiler.hs view

@@ -26,13 +26,16 @@  compilerDir :: Version -> IO FilePath compilerDir v = makeAbsolute =<< dir-    where dir = getAppUserDataDirectory ("atspkg" </> vs </> "ATS2-Postiats-" ++ vs)+    where dir = getAppUserDataDirectory ("atspkg" </> vs)           vs = show v+          -- gmp = if v >= Version [0,3,13] then "gmp-" else ""  pkgUrl :: Version -> String pkgUrl v =     let vs = show v-        in "https://cytranet.dl.sourceforge.net/project/ats2-lang/ats2-lang/ats2-postiats-" ++ vs ++ "/ATS2-Postiats-" ++ vs ++ ".tgz"+        in "https://github.com/vmchale/atspkg/releases/download/compiler/ATS2-Postiats-" ++ vs ++ ".tar.gz"+        -- gmp = if v >= Version [0,3,13] then "gmp-" else ""+        -- in "https://cytranet.dl.sourceforge.net/project/ats2-lang/ats2-lang/ats2-postiats-" ++ vs ++ "/ATS2-Postiats-" ++ gmp ++ vs ++ ".tgz"  withCompiler :: String -> Version -> IO () withCompiler s v = putStrLn $ s ++ " compiler v" ++ show v ++ "..."@@ -51,7 +54,7 @@         response <- responseBody <$> httpLbs (initialRequest { method = "GET" }) manager          withCompiler "Unpacking" v-        Archive.unpackToDir (takeDirectory cd) (BS.toStrict $ decompress response)+        Archive.unpackToDir cd (BS.toStrict $ decompress response)  make :: Verbosity -> Version -> FilePath -> IO () make v' v cd =