Mark packages uninstalled before rebuilding #365

Author: snoyberg

ChangeLog.md

@@ -17,6 +17,7 @@ Bug fixes:
 
 * Haddock links to global packages no longer broken on Windows [#375](https://github.com/commercialhaskell/stack/issues/375)
 * Make flags case-insensitive [#397](https://github.com/commercialhaskell/stack/issues/397)
+* Mark packages uninstalled before rebuilding [#365](https://github.com/commercialhaskell/stack/issues/365)
 
 ## 0.1.0.0
 

src/Stack/Build/Cache.hs

@@ -13,13 +13,14 @@ module Stack.Build.Cache
     , tryGetFlagCache
     , deleteCaches
     , markExeInstalled
+    , markExeNotInstalled
     , writeFlagCache
     , writeBuildCache
     , writeConfigCache
     , writeCabalMod
     ) where
 
-import           Control.Exception.Enclosed (handleIO, tryIO)
+import           Control.Exception.Enclosed (catchIO, handleIO, tryIO)
 import           Control.Monad.Catch        (MonadCatch, MonadThrow, catch,
                                              throwM)
 import           Control.Monad.IO.Class
@@ -42,7 +43,8 @@ import           Stack.Package
 import           Stack.Types
 import           System.Directory           (createDirectoryIfMissing,
                                              getDirectoryContents,
-                                             getModificationTime)
+                                             getModificationTime,
+                                             removeFile)
 import           System.IO.Error (isDoesNotExistError)
 
 -- | Directory containing files to mark an executable as installed
@@ -72,6 +74,15 @@ markExeInstalled loc ident = do
     -- longer exist
     liftIO $ writeFile fp "Installed"
 
+-- | Mark the given executable as not installed
+markExeNotInstalled :: (MonadReader env m, HasEnvConfig env, MonadIO m, MonadThrow m)
+                    => InstallLocation -> PackageIdentifier -> m ()
+markExeNotInstalled loc ident = do
+    dir <- exeInstalledDir loc
+    ident' <- parseRelFile $ packageIdentifierString ident
+    let fp = toFilePath $ dir </> ident'
+    liftIO $ catchIO (removeFile fp) (\_ -> return ())
+
 -- | Stored on disk to know whether the flags have changed or any
 -- files have changed.
 data BuildCache = BuildCache

src/Stack/Build/Execute.hs

@@ -619,6 +619,7 @@ singleBuild ac@ActionContext {..} ee@ExecuteEnv {..} task@Task {..} =
     (cache, _neededConfig) <- ensureConfig pkgDir ee task (announce "configure") cabal cabalfp []
 
     fileModTimes <- getPackageFileModTimes package cabalfp
+    markExeNotInstalled (taskLocation task) taskProvides
     writeBuildCache pkgDir fileModTimes
 
     announce "build"