Rev 4583: Change the Makefile to stage things into a build directory in http://bazaar.launchpad.net/~jameinel/bzr/1.18-win32-buildbot

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/1.18-win32-buildbot

------------------------------------------------------------
revno: 4583
revision-id: john at arbash-meinel.com-20090731195619-xabumey07q2w1fge
parent: john at arbash-meinel.com-20090731193124-0wdkp5kpfn5vfu61
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.18-win32-buildbot
timestamp: Fri 2009-07-31 14:56:19 -0500
message:
  Change the Makefile to stage things into a build directory
  rather than building inside the tree.
-------------- next part --------------
=== modified file '.bzrignore'
--- a/.bzrignore	2009-07-22 13:41:01 +0000
+++ b/.bzrignore	2009-07-31 19:56:19 +0000
@@ -11,7 +11,8 @@
 ./tutorial.html
 BRANCH-INFO
 # setup.py working directory
-build
+./build
+./build-win32
 # Editor temporary/working/backup files
 *$
 .*.sw[nop]

=== modified file 'Makefile'
--- a/Makefile	2009-07-31 19:09:31 +0000
+++ b/Makefile	2009-07-31 19:56:19 +0000
@@ -229,11 +229,22 @@
 
 # make all the installers completely from scratch, using zc.buildout
 # to fetch the dependencies
+# These are files that need to be copied into the build location to boostrap
+# the build process.
+# Note that the path is relative to tools/win32
+BUILDOUT_FILES := buildout.cfg \
+	buildout-templates/bin/build-installer.bat.in
+
 installer-all:
 	@echo *** Make all the installers from scratch
-	cd tools/win32 && $(PYTHON) bootstrap.py
-	cd tools/win32 && bin/buildout
-	cd tools/win32 && bin/build-installer.bat $(BZR_TARGET) $(PLUGIN_TARGET)
+	# Build everything in a separate directory, which has an extra shared repo
+	# The repo is there to make sure none of the fetches 'leak' into the local
+	# shared repo
+	mkdir -p build-win32
+	cd tools/win32 && $(PYTHON) ostools.py copytree $(BUILDOUT_FILES) ../../build-win32
+	cd build-win32 && $(PYTHON) ../tools/win32/bootstrap.py
+	cd build-win32 && bin/buildout
+	cd build-win32 && bin/build-installer.bat $(BZR_TARGET) $(PLUGIN_TARGET)
 
 
 clean-installer-all: