Rev 32: Change tactics slightly. in http://bazaar.launchpad.net/~bzr/bzr-windows-installers/trunk

[John Arbash Meinel]

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

------------------------------------------------------------
revno: 32
revision-id: john at arbash-meinel.com-20090925184702-qlmev5r63k48v221
parent: john at arbash-meinel.com-20090925183014-to6uleeqby6ylxtx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: trunk
timestamp: Fri 2009-09-25 13:47:02 -0500
message:
  Change tactics slightly.
  
  Instead of always nuking the target chm files, instead we set the 'ignore-existing=True'
  for all chm files.
-------------- next part --------------
=== modified file 'Makefile'
--- a/Makefile	2009-09-25 18:30:14 +0000
+++ b/Makefile	2009-09-25 18:47:02 +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 chm-files/* downloads/*.chm
+	cd $(BUILD_DIR) && $(PYTHON) ostools.py remove release */release
 	cd $(BUILD_DIR) && $(PYTHON) bootstrap.py
 	cd $(BUILD_DIR) && bin/buildout
 	cd $(BUILD_DIR) && bin/build-installer.bat $(BZR_TARGET) $(PLUGIN_TARGET)

=== modified file 'tools/win32/buildout.cfg'
--- a/tools/win32/buildout.cfg	2009-09-25 02:48:24 +0000
+++ b/tools/win32/buildout.cfg	2009-09-25 18:47:02 +0000
@@ -39,6 +39,7 @@
 python25=c:\Python25\python.exe
 python26=c:\Python26\python.exe
 download-ignore-existing = false
+download-chm-ignore-existing = true
 
 
 # URLs for archives to download
@@ -172,28 +173,28 @@
 [bzr-chm-en]
 recipe = hexagonit.recipe.download
 url = ${settings:bzr-chm-en-url}
-ignore-existing = ${settings:download-ignore-existing}
+ignore-existing = ${settings:download-chm-ignore-existing}
 destination = chm-files
 download-only = true
 
 [bzr-chm-developers]
 recipe = hexagonit.recipe.download
 url = ${settings:bzr-chm-developers-url}
-ignore-existing = ${settings:download-ignore-existing}
+ignore-existing = ${settings:download-chm-ignore-existing}
 destination = chm-files
 download-only = true
 
 [bzr-chm-es]
 recipe = hexagonit.recipe.download
 url = ${settings:bzr-chm-es-url}
-ignore-existing = ${settings:download-ignore-existing}
+ignore-existing = ${settings:download-chm-ignore-existing}
 destination = chm-files
 download-only = true
 
 [bzr-chm-ru]
 recipe = hexagonit.recipe.download
 url = ${settings:bzr-chm-ru-url}
-ignore-existing = ${settings:download-ignore-existing}
+ignore-existing = ${settings:download-chm-ignore-existing}
 destination = chm-files
 download-only = true