Rev 2582: teach windows installers to build pyrex/C extensions in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 2582
revision-id: pqm at pqm.ubuntu.com-20070704083613-v2o3pj6chp4hiqky
parent: pqm at pqm.ubuntu.com-20070704080808-0ptk5p5yiwxjgnt7
parent: bialix at ukr.net-20070703171653-y3kif40lk0hqfi7m
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-07-04 09:36:13 +0100
message:
  teach windows installers to build pyrex/C extensions
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
  tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
    ------------------------------------------------------------
    revno: 2571.3.4
    merged: bialix at ukr.net-20070703171653-y3kif40lk0hqfi7m
    parent: bialix at ukr.net-20070703171310-r7bd4007xyjlzxv5
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: installer
    timestamp: Tue 2007-07-03 20:16:53 +0300
    message:
      teach windows installers to build pyrex/C extensions
    ------------------------------------------------------------
    revno: 2571.3.3
    merged: bialix at ukr.net-20070703171310-r7bd4007xyjlzxv5
    parent: bialix at ukr.net-20070703171217-8vypfjd2uso3air0
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: installer
    timestamp: Tue 2007-07-03 20:13:10 +0300
    message:
      branding
    ------------------------------------------------------------
    revno: 2571.3.2
    merged: bialix at ukr.net-20070703171217-8vypfjd2uso3air0
    parent: bialix at ukr.net-20070703170729-kwz1skah3o0yp7nx
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: installer
    timestamp: Tue 2007-07-03 20:12:17 +0300
    message:
      Build pyrex/C extensions for bzr.exe
    ------------------------------------------------------------
    revno: 2571.3.1
    merged: bialix at ukr.net-20070703170729-kwz1skah3o0yp7nx
    parent: pqm at pqm.ubuntu.com-20070702183615-qkiquhju4t2grtf9
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: installer
    timestamp: Tue 2007-07-03 20:07:29 +0300
    message:
      Building Python-based installer for bot Python 2.4 and 2.5
      (important for pyrex/C extensions)
=== modified file 'Makefile'
--- a/Makefile	2007-06-28 23:18:09 +0000
+++ b/Makefile	2007-07-03 17:12:17 +0000
@@ -139,6 +139,7 @@
 # make bzr.exe for win32 with py2exe
 exe:
 	@echo *** Make bzr.exe
+	python setup.py build_ext -i -f
 	python setup.py py2exe > py2exe.log
 	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
@@ -152,7 +153,8 @@
 # win32 python's distutils-based installer
 # require to have python interpreter installed on win32
 python-installer: docs
-	python setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
+	python24 setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
+	python25 setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
 
 
 # clean on win32 all installer-related files and directories

=== modified file 'setup.py'
--- a/setup.py	2007-06-06 07:57:00 +0000
+++ b/setup.py	2007-07-03 17:12:17 +0000
@@ -148,7 +148,7 @@
 ########################
 
 command_classes = {'install_scripts': my_install_scripts,
-                  'build': bzr_build}
+                   'build': bzr_build}
 ext_modules = []
 try:
     from Pyrex.Distutils import build_ext
@@ -173,10 +173,13 @@
     dev_docs = glob.glob('doc/developers/*.htm')
     # python's distutils-based win32 installer
     ARGS = {'scripts': ['bzr', 'tools/win32/bzr-win32-bdist-postinstall.py'],
+            'ext_modules': ext_modules,
             # help pages
             'data_files': [('Doc/Bazaar', docs),
                            ('Doc/Bazaar/developers', dev_docs),
                           ],
+            # for building pyrex extensions
+            'cmdclass': {'build_ext': build_ext},
            }
 
     ARGS.update(META_INFO)
@@ -223,6 +226,9 @@
         import warnings
         warnings.warn('Unknown Python version.\n'
                       'Please check setup.py script for compatibility.')
+    # email package from std python library use lazy import,
+    # so we need to explicitly add all package
+    additional_packages.append('email')
 
     options_list = {"py2exe": {"packages": BZRLIB['packages'] +
                                            additional_packages,

=== modified file 'tools/win32/bzr.iss.cog'
--- a/tools/win32/bzr.iss.cog	2007-03-12 22:33:26 +0000
+++ b/tools/win32/bzr.iss.cog	2007-07-03 17:13:10 +0000
@@ -123,7 +123,7 @@
 Name: "{group}\Documentation index"; Filename: "{app}\doc\index.htm"; WorkingDir: "{app}\doc";
 Name: "{group}\Bazaar Home Page"; Filename: "{app}\bazaar.url"; Comment: "http://www.bazaar-vcs.org";
 Name: "{group}\Start Bzr in cmd shell"; Filename: "{cmd}"; Parameters: "/K start_bzr.bat"; WorkingDir: "{app}"; IconFilename: "{app}\bzr.exe"; Comment: "Open new Bzr session";
-Name: "{group}\Uninstall Bzr"; Filename: "{uninstallexe}"; IconFileName: "{sys}\shell32.dll"; IconIndex: 101; Comment: "Remove Bzr completely";
+Name: "{group}\Uninstall Bazaar"; Filename: "{uninstallexe}"; IconFileName: "{sys}\shell32.dll"; IconIndex: 101; Comment: "Remove Bzr completely";
 
 
 [Tasks]