Update deps and fixup main executable.

Author: Tim McGilchrist

Setup.hs

@@ -5,13 +5,15 @@ import           Data.List (intercalate)
 import           Data.Monoid ((<>))
 import           Data.Version (showVersion)
 
+import           Distribution.InstalledPackageInfo
 import           Distribution.PackageDescription
-import           Distribution.Verbosity
 import           Distribution.Simple
 import           Distribution.Simple.Setup (BuildFlags(..), ReplFlags(..), TestFlags(..), fromFlag)
 import           Distribution.Simple.LocalBuildInfo
+import           Distribution.Simple.PackageIndex
 import           Distribution.Simple.BuildPaths (autogenModulesDir)
 import           Distribution.Simple.Utils (createDirectoryIfMissingVerbose, rewriteFile, rawSystemStdout)
+import           Distribution.Verbosity
 
 main :: IO ()
 main =
@@ -25,12 +27,15 @@ main =
        (sDistHook hooks) pd mlbi uh flags
    , buildHook = \pd lbi uh flags -> do
        genBuildInfo (fromFlag $ buildVerbosity flags) pd
+       genDependencyInfo (fromFlag $ buildVerbosity flags) pd lbi
        (buildHook hooks) pd lbi uh flags
    , replHook = \pd lbi uh flags args -> do
        genBuildInfo (fromFlag $ replVerbosity flags) pd
+       genDependencyInfo (fromFlag $ replVerbosity flags) pd lbi
        (replHook hooks) pd lbi uh flags args
    , testHook = \args pd lbi uh flags -> do
        genBuildInfo (fromFlag $ testVerbosity flags) pd
+       genDependencyInfo (fromFlag $ testVerbosity flags) pd lbi
        (testHook hooks) args pd lbi uh flags
    }
 
@@ -57,6 +62,30 @@ genBuildInfo verbosity pkg = do
     ]
   rewriteFile targetText buildVersion
 
+genDependencyInfo :: Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
+genDependencyInfo verbosity pkg info = do
+  let
+    (PackageName pname) = pkgName . package $ pkg
+    name = "DependencyInfo_" ++ (map (\c -> if c == '-' then '_' else c) pname)
+    targetHs = autogenModulesDir info ++ "/" ++ name ++ ".hs"
+    render p =
+      let
+        n = unPackageName $ pkgName p
+        v = intercalate "." . fmap show . versionBranch $ pkgVersion p
+      in
+       n ++ "-" ++ v
+    deps = fmap (render . sourcePackageId) . allPackages $ installedPkgs info
+    strs = flip fmap deps $ \d -> "\"" ++ d ++ "\""
+
+  createDirectoryIfMissingVerbose verbosity True (autogenModulesDir info)
+
+  rewriteFile targetHs $ unlines [
+      "module " ++ name ++ " where"
+    , "import Prelude"
+    , "dependencyInfo :: [String]"
+    , "dependencyInfo = [\n    " ++ intercalate "\n  , " strs ++ "\n  ]"
+    ]
+
 gitVersion :: Verbosity -> IO String
 gitVersion verbosity = do
   ver <- rawSystemStdout verbosity "git" ["log", "--pretty=format:%h", "-n", "1"]

lib/disorder

@@ -2,6 +2,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 
 import           BuildInfo_ambiata_project
+import           DependencyInfo_ambiata_project
 
 import           Options.Applicative
 
@@ -19,6 +20,8 @@ main = do
     case sc of
       VersionCommand ->
         putStrLn buildInfoVersion >> exitSuccess
+      DependencyCommand ->
+        mapM_ putStrLn dependencyInfo
       RunCommand DryRun c ->
         print c >> exitSuccess
       RunCommand RealRun c ->

lib/p

@@ -21,19 +21,21 @@ library
                     -Wall
 
   hs-source-dirs:
-                    src gen
+                    src
 
   exposed-modules:
                     Paths_ambiata_project
-                    BuildInfo_ambiata_project
                     Project
 
 executable project
   ghc-options:
                     -Wall -threaded -O2
 
+  hs-source-dirs:
+                    gen                    
+
   main-is:
-                    main/project.hs
+                    ../main/project.hs
 
   build-depends:
                       base