Offload some work from AutoDeps

src/Development/Shake/Args.hs

@@ -6,6 +6,7 @@ import Paths_shake
 import Development.Shake.Types
 import Development.Shake.Core
 import Development.Shake.Demo
+import Development.Shake.FilePath
 import Development.Shake.Rules.File
 import Development.Shake.Progress
 import Development.Shake.Shake
@@ -115,7 +116,12 @@ shakeArgsWith baseOpts userOptions rules = do
         progressRecords = [x | ProgressRecord x <- flagsExtra]
         changeDirectory = listToMaybe [x | ChangeDirectory x <- flagsExtra]
         printDirectory = last $ False : [x | PrintDirectory x <- flagsExtra]
-        shakeOpts = foldl' (flip ($)) baseOpts flagsShake
+        oshakeOpts = foldl' (flip ($)) baseOpts flagsShake
+        shakeOpts = oshakeOpts {shakeLintInside = map (toStandard . normalise . addTrailingPathSeparator) $
+                                                  shakeLintInside oshakeOpts
+                               ,shakeLintIgnore = map toStandard $
+                                                  shakeLintIgnore oshakeOpts
+                               }
 
     -- error if you pass some clean and some dirty with specific flags
     errs <- return $ errs ++ flagsError ++ ["cannot mix " ++ a ++ " and " ++ b | a:b:_ <-

src/Development/Shake/Command.hs

@@ -126,7 +126,7 @@ commandExplicit funcName icopts results exe args = do
             Just LintFSATrace -> fsatrace act
             _ -> if autodepping then autodeps act else act exe args
         autodepping = AutoDeps `elem` copts
-        inside = map (toStandard . addTrailingPathSeparator . normalise) $ shakeLintInside opts
+        inside = shakeLintInside opts
         ignore = map (?==) $ shakeLintIgnore opts
         ham cwd xs = [makeRelative cwd x | x <- map toStandard xs
                                          , any (`isPrefixOf` x) inside
@@ -158,7 +158,7 @@ commandExplicit funcName icopts results exe args = do
             cwd <- liftIO getCurrentDirectory
             let reader (FSATRead x) = x
                 reader _ = error "autodeps"
-            needed $ ham cwd $ map reader xs
+            needNorm $ ham cwd $ map reader xs
             return res
 
     skipper $ tracker $ \exe args -> verboser $ tracer $ commandExplicitIO funcName copts results exe args

src/Development/Shake/Rules/File.hs

@@ -2,7 +2,7 @@
 {-# LANGUAGE ViewPatterns #-}
 
 module Development.Shake.Rules.File(
-    need, needBS, needed, neededBS, want,
+    need, needBS, needed, neededBS, needNorm, want,
     trackRead, trackWrite, trackAllow,
     defaultRuleFile,
     (%>), (|%>), (?>), phony, (~>), phonys,
@@ -116,6 +116,9 @@ defaultRuleFile = priority 0 $ rule $ \x -> Just $ do
 need :: [FilePath] -> Action ()
 need xs = (apply $ map (FileQ . packU_ . filepathNormalise . unpackU_ . packU) xs :: Action [FileA]) >> return ()
 
+needNorm :: [FilePath] -> Action ()
+needNorm xs = (apply $ map (FileQ . packU) xs :: Action [FileA]) >> return ()
+
 needBS :: [BS.ByteString] -> Action ()
 needBS xs = (apply $ map (FileQ . packU_ . filepathNormalise) xs :: Action [FileA]) >> return ()
 

src/Test/Type.hs

@@ -72,8 +72,7 @@ shaken test rules sleeper = do
                                  ,shakeReport = ["output/" ++ name ++ "/report.html"]
                                  ,shakeLint = Just t
                                  ,shakeLintInside = [cwd]
-                                 ,shakeLintIgnore = map (toStandard (normalise cwd) </>)
-                                                    [".cabal-sandbox//",".stack-work//"]
+                                 ,shakeLintIgnore = map (cwd </>) [".cabal-sandbox//",".stack-work//"]
                                  })
                     -- if you have passed sleep, supress the "no errors" warning
                     (do rules files obj; when ("--sleep" `elem` args) $ action $ return ())