Rev 4430: (mbp) merge zdll setup.py fix from 1.15 in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4430
revision-id: pqm at pqm.ubuntu.com-20090611022914-p9nxmjfongc8w3va
parent: pqm at pqm.ubuntu.com-20090611013426-n3uh3vqg32h1dhhb
parent: mbp at sourcefrog.net-20090611004741-wiiizagsbzhix234
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-06-11 03:29:14 +0100
message:
  (mbp) merge zdll setup.py fix from 1.15
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 4428.1.1
    revision-id: mbp at sourcefrog.net-20090611004741-wiiizagsbzhix234
    parent: pqm at pqm.ubuntu.com-20090611003722-a15ofjj3n248m646
    parent: pqm at pqm.ubuntu.com-20090610020149-2n517mbypmb8q7jx
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: integration
    timestamp: Thu 2009-06-11 10:47:41 +1000
    message:
      Merge zdll fix from 1.15 branch
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 4360.9.1
    revision-id: pqm at pqm.ubuntu.com-20090610020149-2n517mbypmb8q7jx
    parent: pqm at pqm.ubuntu.com-20090609200447-snk22oqtfdoxpjqa
    parent: mbp at sourcefrog.net-20090610000025-7k0a4kynxsha86p2
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: 1.15
    timestamp: Wed 2009-06-10 03:01:49 +0100
    message:
      (mbp) use zdll in win32 builds
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 4360.8.1
    revision-id: mbp at sourcefrog.net-20090610000025-7k0a4kynxsha86p2
    parent: pqm at pqm.ubuntu.com-20090605054317-47l9tdxxpuucvuvd
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: prepare-1.15
    timestamp: Wed 2009-06-10 10:00:25 +1000
    message:
      using zdll on Windows to build _chk_map_pyx extension
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
=== modified file 'NEWS'
--- a/NEWS	2009-06-10 23:29:48 +0000
+++ b/NEWS	2009-06-11 00:47:41 +0000
@@ -158,6 +158,12 @@
 dpush``. Plugins can now define their own annotation tie-breaker when two
 revisions introduce the exact same line.
 
+Changes from 1.15.1 to 1.15.2
+*****************************
+
+* Use zdll on Windows to build ``_chk_map_pyx`` extension.
+  (Alexander Belchenko)
+
 Changes from 1.15final to 1.15.1
 *********************************
 

=== modified file 'setup.py'
--- a/setup.py	2009-06-10 03:56:49 +0000
+++ b/setup.py	2009-06-11 00:47:41 +0000
@@ -261,7 +261,6 @@
 
 add_pyrex_extension('bzrlib._bencode_pyx')
 add_pyrex_extension('bzrlib._btree_serializer_c')
-add_pyrex_extension('bzrlib._chk_map_pyx', libraries=['z'])
 add_pyrex_extension('bzrlib._chunks_to_lines_pyx')
 add_pyrex_extension('bzrlib._groupcompress_pyx',
                     extra_source=['bzrlib/diff-delta.c'])
@@ -271,6 +270,7 @@
     add_pyrex_extension('bzrlib._dirstate_helpers_c',
                         libraries=['Ws2_32'])
     add_pyrex_extension('bzrlib._walkdirs_win32')
+    z_lib = 'zdll'
 else:
     if have_pyrex and pyrex_version == '0.9.4.1':
         # Pyrex 0.9.4.1 fails to compile this extension correctly
@@ -285,6 +285,8 @@
     else:
         add_pyrex_extension('bzrlib._dirstate_helpers_c')
     add_pyrex_extension('bzrlib._readdir_pyx')
+    z_lib = 'z'
+add_pyrex_extension('bzrlib._chk_map_pyx', libraries=[z_lib])
 ext_modules.append(Extension('bzrlib._patiencediff_c', ['bzrlib/_patiencediff_c.c']))