More edge-case fixes.

- Fix the `xhtml` package by doing a better job filtering out built-in
  packages that aren't in the build plan.
- Fix `Paths_` modules for packages with dashes in their name.  (Unit testing
  deferred to #54.)

.circleci/config.yml

@@ -28,7 +28,7 @@ jobs:
       - run: weeder . --build
 
       # Run pier on some sample packages
-      - run: $(stack exec which pier) build lens pandoc c2hs unix-time pier -j4
+      - run: $(stack exec which pier) build lens pandoc c2hs unix-time xhtml pier -j4
       - run: $(stack exec which pier) run -j4 hlint --sandbox $PWD/src
       - run: $(stack exec which pier) run hlint src
 

src/Pier/Build/Components.hs

@@ -317,10 +317,11 @@ buildExecutable confd exe = do
                                     datas
         }
   where
-    pathsMod = fromString $ "Paths_" ++ display (packageName confd)
+    pathsMod = fromString $ "Paths_" ++ fixDashes (display $ packageName confd)
     addIfMissing m ms
         | m `elem` ms = ms
         | otherwise = m : ms
+    fixDashes = map $ \c -> if c == '-' then '_' else c
 
 
 -- TODO: issue if this doesn't preserve ".lhs" vs ".hs", for example?

src/Pier/Build/Config.hs

@@ -84,7 +84,7 @@ askConfig :: Action Config
 askConfig = do
     yaml <- askPersistent PierYamlQ
     p <- askBuildPlan (resolver yaml)
-    ghc <- askInstalledGhc (ghcVersion p)
+    ghc <- askInstalledGhc p
     -- TODO: don't parse local package defs twice.
     -- We do it again later so the full PackageDescription
     -- doesn't need to get saved in the cache.

src/Pier/Build/Package.hs

@@ -35,7 +35,8 @@ getPackageSourceDir :: PackageIdentifier -> Action Artifact
 getPackageSourceDir pkg = do
     tarball <- downloadCabalPackage pkg
     runCommand (output outDir)
-        $ prog "tar" ["-xzf", pathIn tarball, "-C", pathOut (takeDirectory outDir)]
+        $ message ("Unpacking " ++ display pkg)
+        <> prog "tar" ["-xzf", pathIn tarball, "-C", pathOut (takeDirectory outDir)]
         <> input tarball
   where
     outDir = "package/raw" </> display pkg

src/Pier/Build/Stackage.hs

@@ -104,7 +104,7 @@ askBuildPlan :: PlanName -> Action BuildPlan
 askBuildPlan = askPersistent . ReadPlan
 
 
-newtype InstallGhc = InstallGhc Version
+data InstallGhc = InstallGhc Version [PackageName]
     deriving (Show, Typeable, Eq, Hashable, Binary, NFData, Generic)
 
 -- | TODO: make the below functions that use Version take InstalledGhc directly instead
@@ -127,8 +127,10 @@ packageConfD = "package.conf.d"
 ghcArtifacts :: InstalledGhc -> Set.Set Artifact
 ghcArtifacts g = Set.fromList [ghcInstallDir g, globalPackageDb g]
 
-askInstalledGhc :: Version -> Action InstalledGhc
-askInstalledGhc = askPersistent . InstallGhc
+askInstalledGhc :: BuildPlan -> Action InstalledGhc
+askInstalledGhc plan
+    = askPersistent $ InstallGhc (ghcVersion plan)
+                    $ HM.keys $ corePackageVersions plan
 
 ghcLibRoot :: InstalledGhc -> Artifact
 ghcLibRoot g = ghcLibRootA (ghcInstalledVersion g) (ghcInstallDir g)
@@ -179,7 +181,7 @@ hsc2hsProg ghc args =
     template = ghcLibRoot ghc /> "template-hsc.h"
 
 installGhcRules :: Rules ()
-installGhcRules = addPersistent $ \(InstallGhc version) -> do
+installGhcRules = addPersistent $ \(InstallGhc version corePkgs) -> do
     setupYaml <- askDownload Download
                     { downloadFilePrefix = "stackage/setup"
                     , downloadName = "stack-setup-2.yaml"
@@ -191,7 +193,7 @@ installGhcRules = addPersistent $ \(InstallGhc version) -> do
         Left err -> throw err
         Right x
             | Just download <- HM.lookup version (ghcVersions x)
-                -> downloadAndInstallGHC version download
+                -> downloadAndInstallGHC version corePkgs download
             | otherwise -> error $ "Couldn't find GHC version" ++ Cabal.display version
   where
     setupUrl = "https://raw.githubusercontent.com/fpco/stackage-content/master/stack"
@@ -237,8 +239,9 @@ platformKey = case buildPlatform of
     _ -> error $ "Unrecognized platform: " ++ Cabal.display buildPlatform
 
 
-downloadAndInstallGHC :: Version -> DownloadInfo -> Action InstalledGhc
-downloadAndInstallGHC version download = do
+downloadAndInstallGHC
+    :: Version -> [PackageName] -> DownloadInfo -> Action InstalledGhc
+downloadAndInstallGHC version corePkgs download = do
     -- TODO: reenable this once we've fixed the issue with nondetermistic
     -- temp file locations.
     -- rerunIfCleaned
@@ -264,20 +267,23 @@ downloadAndInstallGHC version download = do
                 <> progTemp (unpackedDir </> "configure")
                         ["--prefix=${TMPDIR}/" ++ pathOut installDir]
                 <> prog "make" ["install"])
-    fixed <- makeRelativeGlobalDb
+    fixed <- makeRelativeGlobalDb corePkgs
                     InstalledGhc { ghcInstallDir = installed
                                  , ghcInstalledVersion = version
                                  }
     runCommand_ $ ghcPkgProg fixed ["check"]
     return fixed
 
-makeRelativeGlobalDb :: InstalledGhc -> Action InstalledGhc
-makeRelativeGlobalDb ghc = do
+makeRelativeGlobalDb :: [PackageName] -> InstalledGhc -> Action InstalledGhc
+makeRelativeGlobalDb corePkgs ghc = do
+    let corePkgsSet = Set.fromList corePkgs
     -- List all packages, excluding Cabal which stack doesn't consider a "core"
     -- package.
     -- TODO: if our package ids included a hash, this wouldn't be as big a problem
     -- because two versions of the same package could exist simultaneously.
-    builtinPackages <- fmap (filter (/= "Cabal") . words) $ runCommandStdout
+    builtinPackages <- fmap (filter ((`Set.member` corePkgsSet) . mkPackageName)
+                                . words)
+                        . runCommandStdout
                         $ ghcPkgProg ghc
                             ["list", "--global", "--names-only",
                              "--simple-output" ]