Rev 4041: (jam) Some updates to win32 packaging. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4041
revision-id: pqm at pqm.ubuntu.com-20090224214044-953waog3od1tvlfr
parent: pqm at pqm.ubuntu.com-20090224203358-pxxf7n5ybvzm3mnh
parent: john at arbash-meinel.com-20090224204340-h210yh5ufnlej6yr
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-02-24 21:40:44 +0000
message:
  (jam) Some updates to win32 packaging.
modified:
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
  tools/win32/build_release.py   build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
    ------------------------------------------------------------
    revno: 3995.3.12
    revision-id: john at arbash-meinel.com-20090224204340-h210yh5ufnlej6yr
    parent: john at arbash-meinel.com-20090224191959-9ds39e79cxi3rfz4
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: 1.12_packaging
    timestamp: Tue 2009-02-24 14:43:40 -0600
    message:
      it seems subvertpy 0.6.4 has some bugfixes we want.
    modified:
      tools/win32/build_release.py   build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
    ------------------------------------------------------------
    revno: 3995.3.11
    revision-id: john at arbash-meinel.com-20090224191959-9ds39e79cxi3rfz4
    parent: john at arbash-meinel.com-20090224190807-ie0q6uhz8z0gzseq
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr.1.12
    timestamp: Wed 2009-02-25 06:19:59 +1100
    message:
      Use bzr-svn 0.5.2 as well
    modified:
      tools/win32/build_release.py   build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
    ------------------------------------------------------------
    revno: 3995.3.10
    revision-id: john at arbash-meinel.com-20090224190807-ie0q6uhz8z0gzseq
    parent: john at arbash-meinel.com-20090224190729-pvb2vrgwajvw65jz
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr.1.12
    timestamp: Wed 2009-02-25 06:08:07 +1100
    message:
      Use qbzr 0.9.8 for final build of 1.12
    modified:
      tools/win32/build_release.py   build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
    ------------------------------------------------------------
    revno: 3995.3.9
    revision-id: john at arbash-meinel.com-20090224190729-pvb2vrgwajvw65jz
    parent: pqm at pqm.ubuntu.com-20090213054838-lkk3nsn89bp3b0yt
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr.1.12
    timestamp: Wed 2009-02-25 06:07:29 +1100
    message:
      Local modification to exclude certain system DLLs
    modified:
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
=== modified file 'setup.py'
--- a/setup.py	2009-02-11 15:33:31 +0000
+++ b/setup.py	2009-02-24 19:07:29 +0000
@@ -616,7 +616,7 @@
 
     # MSWSOCK.dll is a system-specific library, which py2exe accidentally pulls
     # in on Vista.
-    dll_excludes.append("MSWSOCK.dll")
+    dll_excludes.extend(["MSWSOCK.dll", "MSVCP60.dll", "powrprof.dll"])
     options_list = {"py2exe": {"packages": packages + list(additional_packages),
                                "includes": includes,
                                "excludes": excludes,

=== modified file 'tools/win32/build_release.py'
--- a/tools/win32/build_release.py	2009-02-11 15:45:01 +0000
+++ b/tools/win32/build_release.py	2009-02-24 20:43:40 +0000
@@ -5,10 +5,10 @@
 # values.
 VERSIONS = {
     'bzr': '1.12',
-    'qbzr': '0.9.7',
+    'qbzr': '0.9.8',
     'bzrtools': '1.12.0',
-    'bzr-svn': '0.5.0',
-    'subvertpy': '0.6.2',
+    'bzr-svn': '0.5.2',
+    'subvertpy': '0.6.4',
 }
 
 # This will be passed to 'make' to ensure we build with the right python