Rev 36: Work around the bugs in updating by nuking the 'trunk' dirs. in http://bazaar.launchpad.net/~bzr/bzr-windows-installers/trunk

[John Arbash Meinel]

At http://bazaar.launchpad.net/~bzr/bzr-windows-installers/trunk

------------------------------------------------------------
revno: 36
revision-id: john at arbash-meinel.com-20091015173606-ppl7535yxl901zka
parent: john at arbash-meinel.com-20091015165851-ntk8a91xh362s0ex
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: trunk
timestamp: Thu 2009-10-15 12:36:06 -0500
message:
  Work around the bugs in updating by nuking the 'trunk' dirs.
  
  This will make it harder to 'fake' tags, but hopefully I won't have to do that.
  I wonder if the issue is that the update code is runinng 'bzr update', but these
  branches aren't checkouts, so it *should* be running 'bzr pull'...
  
  Anyway, the code is currently set up to create shared repositories, so
  this should allow us to re-use everything we have downloaded, and just
  have to rebuild the working tree for each project. A bit of a shame, but
  a small price to pay for updates that actually work.
-------------- next part --------------
=== modified file 'Makefile'
--- a/Makefile	2009-09-25 18:47:02 +0000
+++ b/Makefile	2009-10-15 17:36:06 +0000
@@ -50,7 +50,7 @@
 	cd tools/win32 && $(PYTHON) ostools.py copytree $(BUILDOUT_FILES) ../../$(BUILD_DIR)
 	$(PYTHON) tools/win32/ostools.py makedir $(BUILD_DIR)/inno
 	$(PYTHON) tools/win32/ostools.py copytodir tools/win32/bzr.iss.cog $(BUILD_DIR)/inno
-	cd $(BUILD_DIR) && $(PYTHON) ostools.py remove release */release
+	cd $(BUILD_DIR) && $(PYTHON) ostools.py remove release */release */trunk
 	cd $(BUILD_DIR) && $(PYTHON) bootstrap.py
 	cd $(BUILD_DIR) && bin/buildout
 	cd $(BUILD_DIR) && bin/build-installer.bat $(BZR_TARGET) $(PLUGIN_TARGET)