Use .build-env for the build environment path.

GPGTools · Apr 2, 2012 · 4a68880 · 4a68880
1 parent c239554
commit 4a68880
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.build-env b/.build-env
@@ -0,0 +1 @@
+BUILDENV_DMG="/GPGTools/buildbot/MacGPG2PPCBuildEnv.dmg"
diff --git a/Makefile.config b/Makefile.config
@@ -1,4 +1,3 @@
-BUILDENV_DMG="/GPGTools/buildbot/MacGPG2PPCBuildEnv.dmg"
 name="MacGPG2"
 volumeName="$name"
 version="2.0.19"

diff --git a/build.sh b/build.sh
@@ -6,13 +6,15 @@ export BUILDDIR="$SOURCEDIR/build"
 export LOGPATH="$BUILDDIR"
 export INSTALLDIR="$BUILDDIR/homebrew"
 export DEPLOYDIR="$BUILDDIR/MacGPG2"
-export BUILDENV_DMG="/Users/lukele/Desktop/MacGPG2PPCBuildEnv.dmg"
+export BUILDENV_DMG=""
 export BUILDENV_MOUNT_DIR="$SOURCEDIR/build-env"
 export BUILD_PPC=0
 export NO_BUILDROOT_EXISTS=$(test -d $INSTALLDIR -a -w $INSTALLDIR; echo $?)
 
-# Include the make file config.
-. Makefile.config
+# Include the build-env file.
+test -f ".build-env" && source ".build-env"
+# Include the local build-env file which is not in git.
+test -f ".build-env.local" && source ".build-env.local"
 
 # Include status messages functions.
 . status.sh