Rev 3519: (jam) Updates to installer to avoid system libs for Vista in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3519
revision-id:pqm at pqm.ubuntu.com-20080703180607-kxmp7ftyw7sqg5gj
parent: pqm at pqm.ubuntu.com-20080703113657-6twl1rf07wq3o42d
parent: john at arbash-meinel.com-20080702165212-e7nmk0ltr2jkpbs6
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-07-03 19:06:07 +0100
message:
  (jam) Updates to installer to avoid system libs for Vista
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 3514.1.1
    revision-id:john at arbash-meinel.com-20080702165212-e7nmk0ltr2jkpbs6
    parent: pqm at pqm.ubuntu.com-20080630055535-42tx43kb228k4p94
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: setup_vista
    timestamp: Wed 2008-07-02 11:52:12 -0500
    message:
      Updates to allow building with mingw, and to exclude Vista system dlls
    modified:
      Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
=== modified file 'Makefile'
--- a/Makefile	2008-05-20 09:48:09 +0000
+++ b/Makefile	2008-07-02 16:52:12 +0000
@@ -21,6 +21,7 @@
 ### Core Stuff ###
 
 PYTHON=python
+PYTHON_BUILDFLAGS=
 
 .PHONY: all clean extensions pyflakes api-docs
 
@@ -28,7 +29,7 @@
 
 extensions:
 	@echo "building extension modules."
-	$(PYTHON) setup.py build_ext -i
+	$(PYTHON) setup.py build_ext -i $(PYTHON_BUILDFLAGS)
 
 check: docs extensions
 	$(PYTHON) -Werror -O ./bzr selftest -1v $(tests)
@@ -170,7 +171,7 @@
 # make bzr.exe for win32 with py2exe
 exe:
 	@echo *** Make bzr.exe
-	$(PYTHON) setup.py build_ext -i -f
+	$(PYTHON) setup.py build_ext -i -f $(PYTHON_BUILDFLAGS)
 	$(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

=== modified file 'setup.py'
--- a/setup.py	2008-03-16 00:28:48 +0000
+++ b/setup.py	2008-07-02 16:52:12 +0000
@@ -346,9 +346,12 @@
     packs, mods = mf.get_result()
     additional_packages.update(packs)
 
+    # MSWSOCK.dll is a system-specific library, which py2exe accidentally pulls
+    # in on Vista.
     options_list = {"py2exe": {"packages": packages + list(additional_packages),
                                "includes": includes + mods,
                                "excludes": ["Tkinter", "medusa", "tools"],
+                               "dll_excludes": ["MSWSOCK.dll"],
                                "dist_dir": "win32_bzr.exe",
                               },
                    }