[commit: ghc] wip/nfs-locking: Move Shake database to shake-build/.db, rename _shake to .shake for consistency. (ddfe5bc)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/ddfe5bcdfaf7147bee73d790e42584c78485127c/ghc

>---------------------------------------------------------------

commit ddfe5bcdfaf7147bee73d790e42584c78485127c
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Dec 20 04:04:07 2015 +0000

    Move Shake database to shake-build/.db, rename _shake to .shake for consistency.


>---------------------------------------------------------------

ddfe5bcdfaf7147bee73d790e42584c78485127c
 .gitignore  | 7 ++-----
 build.bat   | 4 ++--
 build.sh    | 6 +++---
 src/Base.hs | 4 ++--
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 94b9664..74a0c27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-*.o
-*.hi
-_shake/
-_build/
+.shake/
+.db/
 cfg/system.config
-arg/*/*.txt
diff --git a/build.bat b/build.bat
index b45bdde..ab26e07 100644
--- a/build.bat
+++ b/build.bat
@@ -1,2 +1,2 @@
- at mkdir _shake 2> nul
- at ghc --make -Wall src/Main.hs -isrc -rtsopts -with-rtsopts=-I0 -outputdir=_shake -o _shake/build && _shake\build --lint --directory ".." %*
+ at mkdir .shake 2> nul
+ at ghc --make -Wall src/Main.hs -isrc -rtsopts -with-rtsopts=-I0 -outputdir=.shake -o .shake/build && .shake\build --lint --directory ".." %*
diff --git a/build.sh b/build.sh
index cf217bd..d350779 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
 root=`dirname $0`
-mkdir -p $root/_shake
-ghc --make -Wall $root/src/Main.hs -i$root/src -rtsopts -with-rtsopts=-I0 -outputdir=$root/_shake -o $root/_shake/build
-$root/_shake/build --lint --directory $root/.. $@
+mkdir -p $root/.shake
+ghc --make -Wall $root/src/Main.hs -i$root/src -rtsopts -with-rtsopts=-I0 -outputdir=$root/.shake -o $root/.shake/build
+$root/.shake/build --lint --directory $root/.. $@
diff --git a/src/Base.hs b/src/Base.hs
index e95aa94..33b01bd 100644
--- a/src/Base.hs
+++ b/src/Base.hs
@@ -49,10 +49,10 @@ configPath :: FilePath
 configPath = shakePath -/- "cfg"
 
 bootPackageConstraints :: FilePath
-bootPackageConstraints = shakeFilesPath ++ "boot-package-constraints"
+bootPackageConstraints = shakeFilesPath -/- "boot-package-constraints"
 
 packageDependencies :: FilePath
-packageDependencies = shakeFilesPath ++ "package-dependencies"
+packageDependencies = shakeFilesPath -/- "package-dependencies"
 
 -- Utility functions
 -- Find and replace all occurrences of a value in a list