[commit: ghc] wip/nfs-locking: Build Hadrian in /hadrian/bin (179f5b1)

[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/179f5b14a138c41cd06423c17a41684157fcdb89/ghc

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

commit 179f5b14a138c41cd06423c17a41684157fcdb89
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Oct 23 19:06:09 2016 +0100

    Build Hadrian in /hadrian/bin


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

179f5b14a138c41cd06423c17a41684157fcdb89
 .gitignore |  3 +--
 build.bat  | 32 ++++++++++++++++----------------
 build.sh   |  8 ++++----
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index 87bedb8..6b06fea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,7 @@
 cfg/system.config
 
 # build.bat and build.sh specific
-/hadrian
-/hadrian.exe
+/bin/
 
 # build.cabal.sh specific
 /dist/
diff --git a/build.bat b/build.bat
index 6e86d42..2bc9a95 100644
--- a/build.bat
+++ b/build.bat
@@ -1,20 +1,20 @@
 @cd %~dp0
- at mkdir ../_build/hadrian 2> nul
+ at mkdir bin 2> nul
 
- at set ghcArgs=--make                       ^
-             -Wall                        ^
-             -fno-warn-name-shadowing     ^
-             -XRecordWildCards            ^
-             src/Main.hs                  ^
-             -threaded                    ^
-             -isrc                        ^
-             -rtsopts                     ^
-             -with-rtsopts=-I0            ^
-             -outputdir=../_build/hadrian ^
-             -i../libraries/Cabal/Cabal   ^
-             -j                           ^
-             -O                           ^
-             -o hadrian
+ at set ghcArgs=--make                     ^
+             -Wall                      ^
+             -fno-warn-name-shadowing   ^
+             -XRecordWildCards          ^
+             src\Main.hs                ^
+             -threaded                  ^
+             -isrc                      ^
+             -i..\libraries\Cabal\Cabal ^
+             -rtsopts                   ^
+             -with-rtsopts=-I0          ^
+             -outputdir=bin             ^
+             -j                         ^
+             -O                         ^
+             -o bin\hadrian
 
 @set hadrianArgs=--lint      ^
                  --directory ^
@@ -28,4 +28,4 @@
 
 @rem Unset GHC_PACKAGE_PATH variable, as otherwise ghc-cabal complains
 @set GHC_PACKAGE_PATH=
- at hadrian %hadrianArgs%
+ at bin\hadrian %hadrianArgs%
diff --git a/build.sh b/build.sh
index d627c58..0f957cf 100755
--- a/build.sh
+++ b/build.sh
@@ -39,7 +39,7 @@ if type cabal > /dev/null 2>&1; then
     fi
 fi
 
-mkdir -p "$root/../_build/hadrian"
+mkdir -p "$root/bin"
 
 ghc                                      \
     "$root/src/Main.hs"                  \
@@ -51,11 +51,11 @@ ghc                                      \
     -rtsopts                             \
     -with-rtsopts=-I0                    \
     -threaded                            \
-    -outputdir="$root/../_build/hadrian" \
+    -outputdir="$root/bin" \
     -j -O                                \
-    -o "$root/hadrian"
+    -o "$root/bin/hadrian"
 
-"$root/hadrian"            \
+"$root/bin/hadrian"        \
     --lint                 \
     --directory "$root/.." \
     "$@"