Rev 29: I think I've sorted out the issue with the new icons. in http://bazaar.launchpad.net/~bzr/bzr-windows-installers/trunk

[John Arbash Meinel]

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

------------------------------------------------------------
revno: 29
revision-id: john at arbash-meinel.com-20090925145111-zegtb1rjbp8mcwah
parent: john at arbash-meinel.com-20090925024824-vj6q5c8kdgykl1h0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: trunk
timestamp: Fri 2009-09-25 09:51:11 -0500
message:
  I think I've sorted out the issue with the new icons.
  
  1) Paths in bzr.iss are relative to the win32_bzr.exe directory because it
     is detailed as the 'Source' directory (relative to the .iss file, I might add)
  2) The main problem was that the build-installer.bat file was trying to copy the
    files from the 'tools' directory in the bzr source, which doesn't have them.
    So we needed to bootstrap it into copying them from the root of build-win32.
-------------- next part --------------
=== modified file 'Makefile'
--- a/Makefile	2009-09-16 20:32:11 +0000
+++ b/Makefile	2009-09-25 14:51:11 +0000
@@ -34,7 +34,8 @@
 # boostrap the build process. Note that the paths are relative to tools/win32.
 BUILDOUT_FILES := buildout.cfg \
 	buildout-templates/bin/build-installer.bat.in \
-	ostools.py bootstrap.py
+	ostools.py bootstrap.py \
+	bzr-48.bmp bzr-164x314.bmp
 
 BUILD_DIR := build-win32
 
@@ -61,3 +62,5 @@
 	rem cd build-win32 && bin/buildout
 	cd build-win32 && bin/build-installer.bat $(BZR_TARGET) $(PLUGIN_TARGET)
 
+
+# vim: noexpandtab

=== modified file 'tools/win32/buildout-templates/bin/build-installer.bat.in'
--- a/tools/win32/buildout-templates/bin/build-installer.bat.in	2009-09-22 14:23:38 +0000
+++ b/tools/win32/buildout-templates/bin/build-installer.bat.in	2009-09-25 14:51:11 +0000
@@ -139,8 +139,8 @@
 %PYTHON% tools/win32/ostools.py copytodir %ROOT%/chm-files/*.chm win32_bzr.exe
 %PYTHON% tools/win32/ostools.py copytodir tools/win32/start_bzr.bat win32_bzr.exe
 %PYTHON% tools/win32/ostools.py copytodir tools/win32/bazaar.url win32_bzr.exe
-%PYTHON% tools/win32/ostools.py copytodir tools/win32/bzr-48.bmp win32_bzr.exe
-%PYTHON% tools/win32/ostools.py copytodir tools/win32/bzr-164x314.bmp win32_bzr.exe
+%PYTHON% tools/win32/ostools.py copytodir %ROOT%/bzr-48.bmp win32_bzr.exe
+%PYTHON% tools/win32/ostools.py copytodir %ROOT%/bzr-164x314.bmp win32_bzr.exe
 %PYTHON% tools/win32/run_script.py cog.py -d -o tools/win32/bzr.iss tools/win32/bzr.iss.cog
 iscc /Q tools/win32/bzr.iss
 @if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End