Rev 158: Merge Alexander's bzr-2.4 updates in http://bazaar.launchpad.net/~jameinel/other/bzr-windows-installers

[John Arbash Meinel]

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

------------------------------------------------------------
revno: 158 [merge]
revision-id: john at arbash-meinel.com-20110524105243-bqkp077aeemkeoyh
parent: bialix at ukr.net-20110523092007-fp916evds7zzn2i8
parent: bialix at ukr.net-20110523092359-1ka5ul5v9yc2twiw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-windows-installers
timestamp: Tue 2011-05-24 12:52:43 +0200
message:
  Merge Alexander's bzr-2.4 updates
added:
  dependencies.txt               dependencies.txt-20100410141858-x2iv3ffbc9vv1t8a-1
modified:
  bazaar_releases.py             bazaar_releases.py-20100303171629-75uvlxv877gacr2j-1
  filesets/bootstrap/buildout.cfg buildout.cfg-20100305044536-yx1dfp6bgu9wbfde-5
-------------- next part --------------
=== modified file 'bazaar_releases.py'
--- a/bazaar_releases.py	2011-05-23 09:20:07 +0000
+++ b/bazaar_releases.py	2011-05-23 09:23:59 +0000
@@ -233,6 +233,49 @@
     tortoise_overlays = BAZAAR_2_2['tortoise_overlays'],
     )
 
+# The components in Bazaar 2.4
+BAZAAR_2_4 = dict(
+    name = 'bzr-2.4',
+
+    # The projects to bundle
+    projects = [
+        Project('bzr', 'lp:bzr', revision='tag:bzr-2.4b2'),
+        subvertpy.copy_write(revision='tag:subvertpy-0.8.0'),
+        python_fastimport.copy_write(revision='tag:fastimport-0.9.0'),
+        Project('tortoisebzr', revision='tag:release-0.6.3'),
+        ],
+
+    # The plugins to bundle
+    plugins = [
+        launchpad,
+        netrc_credential_store,
+        news_merge,
+        bzrtools,
+        colo,
+        explorer.copy_write(revision='tag:release-1.1.3'),
+        bzr_fastimport,
+        loom,
+        pipeline,
+        rewrite,
+        svn,
+        upload,
+        xmloutput.copy_write(revision='tag:0.8.7'),
+        qbzr.copy_write(branch='lp:qbzr', revision='tag:release-0.21beta1'),
+        ],
+
+    # These are the documentation sets shown in the installer
+    docsets = BAZAAR_2_2['docsets'],
+
+    # These are the applications shown in the installer
+    applications = BAZAAR_2_2['applications'],
+
+    # These are the additional dependencies we need to install.
+    # (In the future, it would be nice to explicitly associate these with
+    # the projects requiring them.)
+    downloads = BAZAAR_2_2['downloads'],
+    tortoise_overlays = BAZAAR_2_2['tortoise_overlays'],
+    )
+
 # The components in Bazaar trunk
 BAZAAR_TRUNK = dict(
     name = 'bzr-dev',
@@ -280,6 +323,7 @@
 DISTRIBUTIONS = [
     BAZAAR_2_2,
     BAZAAR_2_3,
+    BAZAAR_2_4,
     BAZAAR_TRUNK,
     ]
 

=== added file 'dependencies.txt'
--- a/dependencies.txt	1970-01-01 00:00:00 +0000
+++ b/dependencies.txt	2011-05-23 07:44:53 +0000
@@ -0,0 +1,67 @@
+Dependencies to build windows installer
+---------------------------------------
+
+:Author: Alexander Belchenko
+:Date: 2011-05-14
+
+I'm trying to build an installer on the fresh Windows XP after several years
+being off this process. So I'll document all dependencies I found and
+roadblocks I'll stumble upon.
+
+Install software
+----------------
+* Python 2.6.6 (installer from python.org)
+
+     http://www.python.org/download/releases/2.6.6/
+
+* Pywin32 extension build 216 for Python 2.6 (installer from pywin32.sf.net)
+
+* py2exe 0.6.9 (installer from py2exe.sf.net)
+
+* Paramiko 1.7.6 from the branch lp:~vcs-imports/paramiko/trunk .
+  Afer branching I've created installer with the following command::
+  
+     C:\Python26\python setup.py bdist_wininst -d.
+
+* PyCrypto 2.0.1 (installer from voidspace.org.uk)::
+
+     http://www.voidspace.org.uk/python/modules.shtml#pycrypto
+
+* PyQt 4.8.4-1 (installer from riverbankcomputing.co.uk)
+
+* HTML Help Workshop and Documentation (installer from
+  http://www.microsoft.com/downloads/details.aspx?familyid=00535334-c8a6-452f-9aa0-d597d16580cc&displaylang=en)
+
+     Download htmlhelp.exe from there and install it. 
+     Make sure application folder added to PATH.
+
+* setuptools 0.6c11 (installer from http://pypi.python.org/pypi/setuptools)
+
+* Sphinx 1.0.7 with easy_install::
+
+       easy_install-2.6.exe sphinx
+
+  The command above have installed Jinja 2.5.5, Pygments 1.4 and docutils 0.6.0? as well.
+
+  IMPORTANT!!! 
+  
+  Make sure you have C:\Python26\Scripts in the PATH so sphinx-build.exe is
+  in your path. You must NOT use batch wrappers to launch sphinx-build, 
+  because in this case you'll get https://bugs.launchpad.net/bzr/+bug/785661
+
+
+C-compiler and SDK
+------------------
+
+* You need Microsoft Visual C++ 2008 installed to build Python C-extensions. 
+  It should be OK to use MSVS 2008 Express. Download it from microsoft.com 
+  and install.
+
+* To build TortoiseBzr you also need Windows SDK. (version?)
+
+
+Command
+-------
+::
+
+    py26 build.py --standalone-only installers

=== modified file 'filesets/bootstrap/buildout.cfg'
--- a/filesets/bootstrap/buildout.cfg	2010-06-30 19:19:26 +0000
+++ b/filesets/bootstrap/buildout.cfg	2011-05-13 12:12:41 +0000
@@ -4,8 +4,8 @@
 develop =
 
 [versions]
-zc.buildout = 1.5.0b2
+zc.buildout = 1.5.2
 setuptools = 0.6c11
-z3c.recipe.filetemplate = 2.0.3
+z3c.recipe.filetemplate = 2.1.0
 gf.recipe.bzr = 1.0rc8
-hexagonit.recipe.download = 1.4.1
+hexagonit.recipe.download = 1.5.0