ats-pkg 3.4.0.0 → 3.4.0.1
raw patch · 4 files changed
+17/−10 lines, 4 files
Files
- CHANGELOG.md +5/−0
- ats-pkg.cabal +1/−1
- man/atspkg.1 +0/−6
- src/Language/ATS/Package/Build.hs +11/−3
CHANGELOG.md view
@@ -1,5 +1,10 @@ # ats-pkg +## 3.4.0.1++ * Install manpages to `/usr/local/share/man/man1` on Mac+ * Disable optimizations when running `--debug`+ ## 3.4.0.0 * Add `--debug` flag to `test` and `build` subcommands
ats-pkg.cabal view
@@ -1,6 +1,6 @@ cabal-version: 2.0 name: ats-pkg-version: 3.4.0.0+version: 3.4.0.1 license: BSD3 license-file: LICENSE copyright: Copyright: (c) 2018-2019 Vanessa McHale
man/atspkg.1 view
@@ -64,9 +64,6 @@ .B \f[B]--pkg-args\f[R] Arguments to be passed to atspkg.dhall .TP-.B \f[B]-c\f[R] \f[B]--no-cache\f[R]-Ignore cached configuration file-.TP .B \f[B]-r\f[R], \f[B]--rebuild\f[R] Rebuild all binary targets. .TP@@ -78,9 +75,6 @@ .TP .B \f[B]-v\f[R], \f[B]--verbose\f[R] Turn up the verbosity-.TP-.B \f[B]-d\f[R], \f[B]--detailed\f[R]-Enable detailed error messages when checking configuration files .TP .B \f[B]--debug\f[R] Disable binary stripping and pass -g to the C compiler
src/Language/ATS/Package/Build.hs view
@@ -29,6 +29,7 @@ import Language.ATS.Package.Dependency import Language.ATS.Package.Type import Quaalude+import System.Info (os) check :: Maybe String -> Maybe FilePath -> IO Bool check mStr p = do@@ -96,9 +97,9 @@ case man config of Just mt -> when pa $ do let mt' = manTarget mt- manDest = home </> ".local" </> "share" </> "man" </> "man1" </> takeFileName mt'+ manDestActual = manDest home mt' need [mt']- copyFile' mt' manDest+ copyFile' mt' manDestActual Nothing -> pure () co <- compleat case completions config of@@ -109,6 +110,13 @@ copyFile' com' comDest Nothing -> pure () +manDest :: FilePath -> FilePath -> FilePath+manDest home mt' =+ case os of+ "darwin" -> "/usr/local/share/man/man1" </> takeFileName mt'+ "linux" -> home </> ".local" </> "share" </> "man" </> "man1" </> takeFileName mt'+ _ -> error "Don't know where to install manpages for your OS"+ mkManpage :: Maybe String -> Rules () mkManpage mStr = do c <- getConfig mStr Nothing@@ -350,7 +358,7 @@ h ph (Lib _ s t ls _ hs' lnk atg extra sta) = atsBin (ATSTarget (dbgFlags (unpack <$> cf)) (atsToolConfig ph) False (unpack <$> ls) (unpack <$> s) hs' (unpackTgt <$> atg) (unpackLinks <$> lnk) (unpack t) (deps extra) (k sta) False) - dbgFlags = if dbg then ("-g":) else id+ dbgFlags = if dbg then ("-g":) . ("-O0":) . filter (/="-O2") else id k False = SharedLibrary k True = StaticLibrary