diff options
author | James Foster <ratherforky@gmail.com> | 2019-07-30 18:01:29 +0100 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-08-06 20:25:18 -0400 |
commit | 0c1ccf3cad5da8ae974c2813767cfcc489391e21 (patch) | |
tree | 4d7a06534123379a0d4d2903632bba30cb629c49 /hadrian/src/Main.hs | |
parent | ea16f6cb22148982f9a0956be82288d380c1d9d9 (diff) | |
download | haskell-0c1ccf3cad5da8ae974c2813767cfcc489391e21.tar.gz |
hadrian: Refactor file patterns for future Shake changes (fixes #17005)
Shake will be moving from its current implementation of ?== to one from
System.FilePattern. Support for `//` is being dropped, leaving only `*`
and `**` as special forms. This commit converts the existing file
patterns in Hadrian to the new format. It also removes all occurances
of <//> and changes the user-settings docs to remove references to //
and add **.
The conversion is as follows:
- //a ==> **/a
- a// ==> a/**
- a//b ==> a/**/b
Diffstat (limited to 'hadrian/src/Main.hs')
-rw-r--r-- | hadrian/src/Main.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hadrian/src/Main.hs b/hadrian/src/Main.hs index 3692047317..7e8c593453 100644 --- a/hadrian/src/Main.hs +++ b/hadrian/src/Main.hs @@ -29,7 +29,7 @@ main = do BuildRoot buildRoot = CommandLine.lookupBuildRoot argsMap - rebuild = [ (RebuildLater, buildRoot -/- "stage0//*") + rebuild = [ (RebuildLater, buildRoot -/- "stage0/**") | CommandLine.lookupFreeze1 argsMap ] cwd <- getCurrentDirectory @@ -60,11 +60,11 @@ main = do , shakeLintIgnore = -- Ignore access to the package database caches. -- They are managed externally by the ghc-pkg tool. - [ buildRoot -/- "//package.conf.d/package.cache" + [ buildRoot -/- "**/package.conf.d/package.cache" -- Ignore access to autom4te.cache directories. -- They are managed externally by auto tools. - , "//autom4te.cache//*" + , "**/autom4te.cache/**" ] } |