Rev 4594: more updates to get things to build cleanly. 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: 4594
revision-id: john at arbash-meinel.com-20090803203839-du9y39adazy9qdly
parent: john at arbash-meinel.com-20090803201338-cfrdbp2v0fyvc93o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.18-win32-buildbot
timestamp: Mon 2009-08-03 15:38:39 -0500
message:
  more updates to get things to build cleanly.
  
  1) delete the release directories because it seems that gf.recipe.bzr doesn't
  clean them up when you update to a new release.
  2) fix 'clean-installer-all'. It is a lot more simple now, as we just nuke the
  whole build-win32 directory.
-------------- next part --------------
=== modified file 'Makefile'
--- a/Makefile	2009-07-31 21:01:48 +0000
+++ b/Makefile	2009-08-03 20:38:39 +0000
@@ -234,35 +234,26 @@
 # Note that the path is relative to tools/win32
 BUILDOUT_FILES := buildout.cfg \
 	buildout-templates/bin/build-installer.bat.in \
-	ostools.py
+	ostools.py bootstrap.py
 
 installer-all:
 	@echo Make all the installers from scratch
 	@# Build everything in a separate directory, to avoid cluttering the WT
-	mkdir -p build-win32
+	$(PYTHON) tools/win32/ostools.py makedir build-win32
+	@# cd to tools/win32 so that the relative paths are copied correctly
 	cd tools/win32 && $(PYTHON) ostools.py copytree $(BUILDOUT_FILES) ../../build-win32
-	cd build-win32 && $(PYTHON) ../tools/win32/bootstrap.py
+	@# There seems to be a bug in gf.release.bzr, It doesn't correctly update
+	@# existing release directories, so delete them manually before building
+	@# It means things may be rebuilt that don't need to be, but at least
+	@# it will be correct when they do.
+	cd build-win32 && $(PYTHON) ostools.py remove release */release
+	cd build-win32 && $(PYTHON) bootstrap.py
 	cd build-win32 && bin/buildout
 	cd build-win32 && bin/build-installer.bat $(BZR_TARGET) $(PLUGIN_TARGET)
 
 
 clean-installer-all:
-	$(PYTHON) tools/win32/ostools.py remove tools/win32/.installed.cfg
-	$(PYTHON) tools/win32/ostools.py remove tools/win32/bin/
-	$(PYTHON) tools/win32/ostools.py remove tools/win32/bzr/
-	$(PYTHON) tools/win32/ostools.py remove tools/win32/bzr-rebase/
-	$(PYTHON) tools/win32/ostools.py remove tools/win32/bzr-svn/
-	$(PYTHON) tools/win32/ostools.py remove tools/win32/bzrtools/
-	$(PYTHON) tools/win32/ostools.py remove tools/win32/db4/
-	$(PYTHON) tools/win32/ostools.py remove tools/win32/develop-eggs/
-	$(PYTHON) tools/win32/ostools.py remove tools/win32/libintl/
-	$(PYTHON) tools/win32/ostools.py remove tools/win32/parts/
-	$(PYTHON) tools/win32/ostools.py remove tools/win32/qbzr/
-	$(PYTHON) tools/win32/ostools.py remove tools/win32/subvertpy/
-	$(PYTHON) tools/win32/ostools.py remove tools/win32/svn/
-	$(PYTHON) tools/win32/ostools.py remove tools/win32/tbzr/
-	$(PYTHON) tools/win32/ostools.py remove tools/win32/tortoise-overlays/
-	$(PYTHON) tools/win32/ostools.py remove tools/win32/zlib/
+	$(PYTHON) tools/win32/ostools.py remove build-win32
 
 # make bzr.exe for win32 with py2exe
 exe:

=== modified file 'tools/win32/buildout-templates/bin/build-installer.bat.in'
--- a/tools/win32/buildout-templates/bin/build-installer.bat.in	2009-08-03 20:13:38 +0000
+++ b/tools/win32/buildout-templates/bin/build-installer.bat.in	2009-08-03 20:38:39 +0000
@@ -57,7 +57,7 @@
 rem include any of the 3rd-party plugins, because we don't bundle
 rem their dependencies.
 cd %TARGET%
-make python-installer PYTHON24=${settings:python24} PYTHON25=${settings:python25} PYTHON26=${settings:python26}
+make python-installer PYTHON=${buildout:executable} PYTHON24=${settings:python24} PYTHON25=${settings:python25} PYTHON26=${settings:python26}
 rem @if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
 
 cd %ROOT%/subvertpy/%PLUGIN_TARGET%

=== modified file 'tools/win32/buildout.cfg'
--- a/tools/win32/buildout.cfg	2009-08-03 20:04:53 +0000
+++ b/tools/win32/buildout.cfg	2009-08-03 20:38:39 +0000
@@ -46,6 +46,8 @@
   http://www.zlib.net/zlib123-dll.zip
 
 bzr-release = 1.17
+# Older releases were @ http://bazaar-vcs.org, new releases are hosted directly
+# on Launchpad
 # bzr-release-url = http://bazaar-vcs.org/bzr/bzr.${settings:bzr-release}
 bzr-release-url = lp:bzr/${settings:bzr-release}
 bzr-trunk-url = http://bazaar-vcs.org/bzr/bzr.dev