Rev 4592: Updates to buildout.cfg etc to have 'make installer-all' start being in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Wed Aug 5 19:56:39 BST 2009


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4592 [merge]
revision-id: pqm at pqm.ubuntu.com-20090805185637-3f0y10upzcdw7e0g
parent: pqm at pqm.ubuntu.com-20090805170444-r6el9za77gdxzbfy
parent: john at arbash-meinel.com-20090803213316-ww6fknh3z1l6fupu
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-08-05 19:56:37 +0100
message:
  Updates to buildout.cfg etc to have 'make installer-all' start being
  	the preferred way to build win32 installer.
modified:
  .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  tools/win32/build_release.py   build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
  tools/win32/buildout-templates/bin/build-installer.bat.in buildinstaller.bat.i-20090605013541-8oqmqjw1he033eoj-3
  tools/win32/buildout.cfg       buildout.cfg-20090529141919-d4paovt3buwxgjpd-1
  tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
=== 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-22 14:07:56 +0000
+++ b/Makefile	2009-08-03 20:38:39 +0000
@@ -23,6 +23,7 @@
 PYTHON=python
 PYTHON24=python24
 PYTHON25=python25
+PYTHON26=python26
 BZR_TARGET=release
 PLUGIN_TARGET=plugin-release
 PYTHON_BUILDFLAGS=
@@ -228,30 +229,31 @@
 
 # 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 \
+	ostools.py bootstrap.py
+
 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)
+	@echo Make all the installers from scratch
+	@# Build everything in a separate directory, to avoid cluttering the WT
+	$(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
+	@# 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:
@@ -277,7 +279,7 @@
 	$(PYTHON25) setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
 
 py-inst-26: docs
-	python26 setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
+	$(PYTHON26) setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
 
 python-installer: py-inst-24 py-inst-25 py-inst-26
 

=== modified file 'tools/win32/build_release.py'
--- a/tools/win32/build_release.py	2009-07-14 15:00:14 +0000
+++ b/tools/win32/build_release.py	2009-07-31 19:09:31 +0000
@@ -7,8 +7,8 @@
     'bzr': '1.17',
     'qbzr': '0.12',
     'bzrtools': '1.17.0',
-    'bzr-svn': '0.6.3-win32-1',
-    'bzr-rewrite': '0.5.1',
+    'bzr-svn': '0.6.3',
+    'bzr-rewrite': '0.5.2',
     'subvertpy': '0.6.8',
 }
 
@@ -85,9 +85,10 @@
     bzr_dir = get_bzr_dir()
     if not os.path.isdir(bzr_dir):
         bzr_version = VERSIONS['bzr']
-        bzr_url = 'http://bazaar-vcs.org/bzr/bzr.' + bzr_version
+        # bzr_url = 'http://bazaar-vcs.org/bzr/bzr.' + bzr_version
+        bzr_url = 'lp:bzr/' + bzr_version
         print "Getting bzr release %s from %s" % (bzr_version, bzr_url)
-        call_or_fail([bzr(), 'co', bzr_url])
+        call_or_fail([bzr(), 'co', bzr_url, bzr_dir])
     else:
         print "Ensuring %s is up-to-date" % (bzr_dir,)
         call_or_fail([bzr(), 'update', bzr_dir])

=== modified file 'tools/win32/buildout-templates/bin/build-installer.bat.in'
--- a/tools/win32/buildout-templates/bin/build-installer.bat.in	2009-07-04 03:03:46 +0000
+++ b/tools/win32/buildout-templates/bin/build-installer.bat.in	2009-08-03 20:41:39 +0000
@@ -49,9 +49,17 @@
 %PYTHON% %ROOT%/ostools.py makedir %INSTALLERS%
 @if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
 
-bzr co %ROOT%/bzr/%BZR_TARGET% %TARGET%
+rem Use %COMSPEC% /c in case bzr is actually a .bat file
+%COMSPEC% /c bzr co %ROOT%/bzr/%BZR_TARGET% %TARGET%
 @if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
 
+rem Build the python-installer first, because we don't want to
+rem include any of the 3rd-party plugins, because we don't bundle
+rem their dependencies.
+cd %TARGET%
+make python-installer PYTHON=%CYG_PYTHON% 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%
 %PYTHON% setup.py install -O1 --install-lib=%TARGET%
 @if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
@@ -68,7 +76,7 @@
 %PYTHON% setup.py install -O1 --install-lib=%TARGET%
 @if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
 
-cd %ROOT%/bzr-rebase/%PLUGIN_TARGET%
+cd %ROOT%/bzr-rewrite/%PLUGIN_TARGET%
 %PYTHON% setup.py install -O1 --install-lib=%TARGET%
 @if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
 
@@ -81,16 +89,6 @@
 make installer PYTHON=%CYG_PYTHON%
 @if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
 
-rem Enable this when this branch is merged.
-rem make python-installer PYTHON24=${settings:python24} PYTHON25=${settings:python25}
-rem @if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
-
-${settings:python24} setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
- at if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
-
-${settings:python25} setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
- at if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
-
 %PYTHON% %ROOT%/ostools.py copytodir %TARGET%/bzr*.exe %INSTALLERS%
 @if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
 

=== modified file 'tools/win32/buildout.cfg'
--- a/tools/win32/buildout.cfg	2009-07-04 02:16:06 +0000
+++ b/tools/win32/buildout.cfg	2009-08-03 20:38:39 +0000
@@ -15,7 +15,7 @@
     tbzr
     bzrtools
     bzr-svn
-    bzr-rebase
+    bzr-rewrite
     subvertpy
     templates
 
@@ -25,11 +25,12 @@
 zc.buildout = 1.2.1
 setuptools = 0.6c9
 z3c.recipe.filetemplate = 2.0.3
-gf.recipe.bzr = 1.0rc5
+gf.recipe.bzr = 1.0rc8
 
 [settings]
 python24=c:\Python24\python.exe
 python25=c:\Python25\python.exe
+python26=c:\Python26\python.exe
 download-ignore-existing = false
 svn-dev-url =
   http://subversion.tigris.org/files/documents/15/45228/svn-win32-1.5.6_dev.zip
@@ -42,17 +43,20 @@
 tortoise-overlays-win32-url = http://guest:password@tortoisesvn.tigris.org/svn/tortoisesvn/TortoiseOverlays/version-1.0.4/bin/TortoiseOverlays-1.0.4.11886-win32.msi
 tortoise-overlays-x64-url = http://guest:password@tortoisesvn.tigris.org/svn/tortoisesvn/TortoiseOverlays/version-1.0.4/bin/TortoiseOverlays-1.0.4.11886-x64.msi
 zlib-url =
-  http://www.zlatkovic.com/pub/libxml/zlib-1.2.3.win32.zip
+  http://www.zlib.net/zlib123-dll.zip
 
-bzr-release = 1.15
-bzr-release-url = http://bazaar-vcs.org/bzr/bzr.${settings:bzr-release}
+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
 
-bzrtools-release = 1.12.0
+bzrtools-release = 1.17.0
 bzrtools-release-tag = tag:release-${settings:bzrtools-release}
 bzrtools-trunk-url = lp:bzrtools
 
-qbzr-release = 0.9.8
+qbzr-release = 0.12
 qbzr-release-tag = tag:release-${settings:qbzr-release}
 qbzr-trunk-url = lp:qbzr
 
@@ -60,15 +64,17 @@
 tbzr-release-tag = tag:release-${settings:tbzr-release}
 tbzr-trunk-url = lp:tortoisebzr
 
-bzr-svn-release = 0.5.2
+bzr-svn-release = 0.6.3
 bzr-svn-release-tag = tag:bzr-svn-${settings:bzr-svn-release}
 bzr-svn-trunk-url = lp:bzr-svn
 
-bzr-rebase-release = 0.4.4
-bzr-rebase-release-tag = tag:bzr-rebase-${settings:bzr-rebase-release}
-bzr-rebase-trunk-url = lp:bzr-rebase
+# This isn't a typo, as of last release, the branch is lp:bzr-rewrite but the
+# tag is bzr-rebase-0.5.3
+bzr-rewrite-release = 0.5.3
+bzr-rewrite-release-tag = tag:bzr-rebase-${settings:bzr-rewrite-release}
+bzr-rewrite-trunk-url = lp:bzr-rewrite
 
-subvertpy-release = 0.6.4
+subvertpy-release = 0.6.8
 subvertpy-release-tag = tag:subvertpy-${settings:subvertpy-release}
 subvertpy-trunk-url = lp:subvertpy
 
@@ -110,7 +116,7 @@
 recipe = hexagonit.recipe.download
 url = ${settings:zlib-url}
 ignore-existing = ${settings:download-ignore-existing}
-strip-top-level-dir = true
+strip-top-level-dir = false
 destination = zlib
 
 [tortoise-overlays-win32]
@@ -128,7 +134,7 @@
 download-only = true
 
 [bzr]
-recipe = gf.recipe.bzr
+recipe = gf.recipe.bzr:strict
 shared-repo = false
 format = 1.9
 urls =
@@ -137,16 +143,16 @@
 develop = false
 
 [bzrtools]
-recipe = gf.recipe.bzr
+recipe = gf.recipe.bzr:strict
 shared-repo = true
-format = 1.9-rich-root
+format = 2a
 urls =
     ${settings:bzrtools-trunk-url} trunk
     ${buildout:directory}/bzrtools/trunk@${settings:bzrtools-release-tag} release
 develop = false
 
 [qbzr]
-recipe = gf.recipe.bzr
+recipe = gf.recipe.bzr:strict
 shared-repo = true
 format = 1.9
 urls =
@@ -155,7 +161,7 @@
 develop = false
 
 [tbzr]
-recipe = gf.recipe.bzr
+recipe = gf.recipe.bzr:strict
 shared-repo = true
 format = 1.9
 urls =
@@ -164,25 +170,25 @@
 develop = false
 
 [bzr-svn]
-recipe = gf.recipe.bzr
+recipe = gf.recipe.bzr:strict
 shared-repo = true
-format = 1.9-rich-root
+format = 2a
 urls =
     ${settings:bzr-svn-trunk-url} trunk
     ${buildout:directory}/bzr-svn/trunk@${settings:bzr-svn-release-tag} release
 develop = false
 
-[bzr-rebase]
-recipe = gf.recipe.bzr
+[bzr-rewrite]
+recipe = gf.recipe.bzr:strict
 shared-repo = true
 format = 1.9-rich-root
 urls =
-    ${settings:bzr-rebase-trunk-url} trunk
-    ${buildout:directory}/bzr-rebase/trunk@${settings:bzr-rebase-release-tag} release
+    ${settings:bzr-rewrite-trunk-url} trunk
+    ${buildout:directory}/bzr-rewrite/trunk@${settings:bzr-rewrite-release-tag} release
 develop = false
 
 [subvertpy]
-recipe = gf.recipe.bzr
+recipe = gf.recipe.bzr:strict
 shared-repo = true
 format = 1.9-rich-root
 urls =

=== modified file 'tools/win32/bzr.iss.cog'
--- a/tools/win32/bzr.iss.cog	2009-08-04 10:06:30 +0000
+++ b/tools/win32/bzr.iss.cog	2009-08-05 18:56:37 +0000
@@ -16,10 +16,10 @@
 ; #/Python 2.5 compatibility code
 ;
 ; import bzrlib
-; try: 
+; try:
 ;     VERSION = bzrlib.__version__
 ;     AppVerName = 'Bazaar %s' % VERSION
-;     OutputBaseFilename = 'bzr-setup-%s' % VERSION
+;     OutputBaseFilename = 'bzr-%s-setup' % VERSION
 ; except:
 ;     VERSION = ''
 ;     AppVerName = 'Bazaar'
@@ -223,7 +223,7 @@
 
 
 [UninstallRun]
-Filename: "{app}\bzr_postinstall.exe"; Parameters: "--delete-path --delete-shell-menu --silent"; Flags: skipifdoesntexist runhidden; 
+Filename: "{app}\bzr_postinstall.exe"; Parameters: "--delete-path --delete-shell-menu --silent"; Flags: skipifdoesntexist runhidden;
 ; [[[cog
 ; if "TBZR" in os.environ:
 ;     cog.outl('Filename: "regsvr32.exe"; Parameters: "/u /s /i: tbzrshellext_x86.dll"; WorkingDir: "{app}"; Components: tortoise; StatusMsg: "Unregistering Tortoise"; Flags: skipifdoesntexist')
@@ -328,7 +328,7 @@
 end;
 
 
-function InitializeUninstall(): Boolean; 
+function InitializeUninstall(): Boolean;
 begin
     ShutdownTBZR;
     result := True;




More information about the bazaar-commits mailing list