Clean up.
authorAndrey Mokhov <andrey.mokhov@gmail.com>
Tue, 13 Jan 2015 05:12:38 +0000 (05:12 +0000)
committerAndrey Mokhov <andrey.mokhov@gmail.com>
Tue, 13 Jan 2015 05:12:38 +0000 (05:12 +0000)
doc/deepseq-build-progress.txt
src/Oracles.hs
src/Oracles/Builder.hs
src/Package/Base.hs
src/Package/Compile.hs
src/Package/Data.hs
src/Package/Library.hs

index 0df6c05..84845fe 100644 (file)
@@ -70,9 +70,15 @@ echo        >> libraries/deepseq/dist-install/build/libHSdeeps_FT5iVCELxOr62eHY0
 # Skipping:
 /usr/bin/find libraries/deepseq/dist-install/build/Control/DeepSeq_p_o_split -name '*.p_o' -print >> libraries/deepseq/dist-install/build/libHSdeeps_FT5iVCELxOr62eHY0nbvnU_p.a.contents
 echo        >> libraries/deepseq/dist-install/build/libHSdeeps_FT5iVCELxOr62eHY0nbvnU_p.a.contents
+
+# Done:
 "/usr/bin/ar" q  libraries/deepseq/dist-install/build/libHSdeeps_FT5iVCELxOr62eHY0nbvnU_p.a @libraries/deepseq/dist-install/build/libHSdeeps_FT5iVCELxOr62eHY0nbvnU_p.a.contents
 /usr/bin/ar: creating libraries/deepseq/dist-install/build/libHSdeeps_FT5iVCELxOr62eHY0nbvnU_p.a
+
+# Skipping:
 "rm" -f libraries/deepseq/dist-install/build/libHSdeeps_FT5iVCELxOr62eHY0nbvnU_p.a.contents
+
+
 "inplace/bin/mkdirhier" libraries/deepseq/dist-install/doc/html/deepseq//.
 "C:/msys/home/chEEtah/ghc/inplace/bin/haddock" --odir="libraries/deepseq/dist-install/doc/html/deepseq" --no-tmp-comp-dir --dump-interface=libraries/deepseq/dist-install/doc/html/deepseq/deepseq.haddock --html --hoogle --title="deepseq-1.4.0.0: Deep evaluation of data structures" --prologue="libraries/deepseq/dist-install/haddock-prologue.txt"  --read-interface=../array-0.5.0.1,../array-0.5.0.1/src/%{MODULE/./-}.html\#%{NAME},libraries/array/dist-install/doc/html/array/array.haddock --read-interface=../base-4.8.0.0,../base-4.8.0.0/src/%{MODULE/./-}.html\#%{NAME},libraries/base/dist-install/doc/html/base/base.haddock --read-interface=../ghc-prim-0.3.1.0,../ghc-prim-0.3.1.0/src/%{MODULE/./-}.html\#%{NAME},libraries/ghc-prim/dist-install/doc/html/ghc-prim/ghc-prim.haddock --optghc=-hisuf --optghc=hi --optghc=-osuf --optghc=o --optghc=-hcsuf --optghc=hc --optghc=-static --optghc=-H32m --optghc=-O --optghc=-this-package-key --optghc=deeps_FT5iVCELxOr62eHY0nbvnU --optghc=-hide-all-packages --optghc=-i --optghc=-ilibraries/deepseq/. --optghc=-ilibraries/deepseq/dist-install/build --optghc=-ilibraries/deepseq/dist-install/build/autogen --optghc=-Ilibraries/deepseq/dist-install/build --optghc=-Ilibraries/deepseq/dist-install/build/autogen --optghc=-Ilibraries/deepseq/. --optghc=-optP-include --optghc=-optPlibraries/deepseq/dist-install/build/autogen/cabal_macros.h --optghc=-package-key --optghc=array_3w0nMK0JfaFJPpLFn2yWAJ --optghc=-package-key --optghc=base_469rOtLAqwTGFEOGWxSUiQ --optghc=-package-key --optghc=ghcpr_FgrV6cgh2JHBlbcx1OSlwt --optghc=-Wall --optghc=-XHaskell2010 --optghc=-O2 --optghc=-no-user-package-db --optghc=-rtsopts --optghc=-odir --optghc=libraries/deepseq/dist-install/build --optghc=-hidir --optghc=libraries/deepseq/dist-install/build --optghc=-stubdir --optghc=libraries/deepseq/dist-install/build --optghc=-split-objs    libraries/deepseq/./Control/DeepSeq.hs  +RTS -tlibraries/deepseq/dist-install/doc/html/deepseq/deepseq.haddock.t --machine-readable
 Haddock coverage:
index 5b2ff11..2fe8430 100644 (file)
@@ -49,7 +49,7 @@ packageDataOracle :: Rules ()
 packageDataOracle = do
     pkgData <- newCache $ \file -> do
         need [file]
-        putNormal $ "Parsing " ++ file ++ "..."
+        putNormal $ "Parsing " ++ toStandard file ++ "..."
         liftIO $ readConfigFile file
     addOracle $ \(PackageDataKey (file, key)) -> M.lookup key <$> pkgData file
     return ()
index 71f8575..8a2c5b2 100644 (file)
@@ -27,7 +27,7 @@ data Builder = Ar
              deriving Show
 
 instance ShowArgs Builder where
-    showArgs builder = showArgs $ fmap words $ do
+    showArgs builder = showArgs $ fmap (map toStandard . words) $ do
         let key = case builder of
                 Ar            -> "ar"
                 Ld            -> "ld"
index a8de80d..9882900 100644 (file)
@@ -49,7 +49,7 @@ libraryPackage :: String -> Stage -> (Stage -> Settings) -> Package
 libraryPackage name stage settings =
     Package
         name
-        ("libraries" </> name)
+        (toStandard $ "libraries" </> name)
         [(
             stage,
             if stage == Stage0 then "dist-boot" else "dist-install",
@@ -123,7 +123,7 @@ pkgDepObjects path dist way = do
         buildDir = path </> dist </> "build"
         hs2obj   = (buildDir ++) . drop (length path) . (-<.> osuf way)
     srcs <- pkgHsSources path dist
-    return $ map hs2obj srcs
+    return $ map (toStandard . hs2obj) srcs
 
 -- Find objects that go to library
 pkgLibObjects :: FilePath -> FilePath -> Stage -> Way -> Action [FilePath]
@@ -145,4 +145,4 @@ findModuleFiles pkgData directories suffixes = do
         modPath <- map (replaceEq '.' pathSeparator) mods
         suffix  <- suffixes
         return $ dir </> modPath ++ suffix
-    return $ map normaliseEx files
+    return $ map (toStandard . normaliseEx) files
index 6badbb7..760c96f 100644 (file)
@@ -53,4 +53,4 @@ buildPackageCompile (Package name path _) (stage, dist, settings) =
             <> productArgs ["-odir", "-hidir", "-stubdir"] buildDir
             <> when (splitObjects stage) (arg "-split-objs")
             <> arg ("-c":srcs)
-            <> arg ["-o", out]
+            <> arg ["-o", toStandard out]
index a73a521..ef89ed0 100644 (file)
@@ -79,7 +79,7 @@ buildPackageData (Package name path _) (stage, dist, settings) =
         ghcPkgArgs = arg ["update", "--force"]
             <> (stage == Stage0) <?>
                arg "--package-db=libraries/bootstrapping.conf"
-            <> arg (pathDist </> "inplace-pkg-config")
+            <> arg (toStandard $ pathDist </> "inplace-pkg-config")
     in
     (pathDist </>) <$>
     [ "package-data.mk"
index 529d777..9f200e4 100644 (file)
@@ -15,12 +15,7 @@ arRule (Package _ path _) (stage, dist, _) =
         need depObjs
         libObjs <- pkgLibObjects path dist stage way
         liftIO $ removeFiles "." [out]
-        terseRun Ar $ "q" <+> out <+> libObjs
-
-{- "C:/msys/home/chEEtah/ghc/inplace/mingw/bin/ld.exe"  -r -o 
-libraries/deepseq/dist-install/build/HSdeeps_FT5iVCELxOr62eHY0nbvnU.o  
-libraries/deepseq/dist-install/build/Control/DeepSeq.o
--}
+        terseRun Ar $ "q" <+> toStandard out <+> libObjs
 
 ldRule :: Package -> TodoItem -> Rules ()
 ldRule (Package name path _) (stage, dist, _) =
@@ -32,7 +27,7 @@ ldRule (Package name path _) (stage, dist, _) =
         depObjs <- pkgDepObjects path dist vanilla
         need depObjs
         terseRun Ld $ arg (ConfLdLinkerArgs stage)
-            <> arg ["-r", "-o", out]
+            <> arg ["-r", "-o", toStandard out]
             <> arg depObjs
         synopsis <- unwords <$> arg (Synopsis pkgData)
         putNormal $ "Successfully built package " ++ name ++ "."