Merge lp:~gz/bzr-windows-installers/runtime_libraries_in_subdir_881203 into lp:bzr-windows-installers

[Martin Packman]

Attempt #2 at fixing the linked bug, this one at least shouldn't break on systems without the runtime libraries installed. Basically, it moves the dlls into a specially named subfolder that is also checked on exe startup.

I'm not certain it resolves the underlying issue, really we need the installer to handle the SxS stuff for us, which MSI tools will do. However, it is at least neater to have the dlls in a 'Microsoft.VC90.CRT' folder, and is what the py2exe tutorial suggests. Loading msvcp90 after the fact does still work, provided a manifest is provided in 'lib' which can just be a dumb copy of the one from the parent dir.

[Martin Packman (gz)]

As this has passed the basic testing, I'll include it in the 2.5b4 release so it can get wider feedback.

[Martin Packman (gz)]

So, this is back to the old problem of not being able to load Qt, so I backed it out of the installers. Will follow up in the bug.

review: Disapprove

Unmerged revisions

=== modified file 'build.py'
--- build.py	2011-07-05 10:12:36 +0000
+++ build.py	2011-12-05 00:53:23 +0000
@@ -409,23 +409,23 @@
         # This isn't required for Python 2.5 or earlier because
         # py2exe handles it then.
         if self.python.find("26") >= 0:
-            copy_files(self.msvc_redist_dir, exe_dir, [
+            redist_name = os.path.basename(self.msvc_redist_dir)
+            redist_dir = os.path.join(exe_dir, redist_name)
+            makedir(redist_dir)
+            copy_files(self.msvc_redist_dir, redist_dir, [
                 "msvcr90.dll",
                 "msvcp90.dll",
                 ])
             # Mess around with manifests, see bug and related mp for reasons:
             # <https://bugs.launchpad.net/bzr-windows-installers/+bug/632465>
-            m_name = "%s.manifest" % os.path.basename(self.msvc_redist_dir)
+            m_name = "%s.manifest" % redist_name
             # Remove the file element for the dll bzr doesn't need
             m_contents = file(os.path.join(self.msvc_redist_dir, m_name)
                 ).read().replace(' <file name="msvcm90.dll" />', "")
             # Write the manifest to the root dir so the python dll finds it
-            file(os.path.join(exe_dir, m_name), "w").write(
-                m_contents)
+            file(os.path.join(redist_dir, m_name), "w").write(m_contents)
             # Write another copy to the lib folder for the extension modules
-            # that need it, modifying the dll names to look in the parent dir
-            file(os.path.join(exe_dir, "lib", m_name), "w").write(
-                m_contents.replace('<file name="', '<file name="..\\'))
+            file(os.path.join(exe_dir, "lib", m_name), "w").write(m_contents)
 
         # Generate the Installer spec file and compile it
         iss_file = issgen.generate_iss(self.distro,