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

[Martin Packman]

Swap the funny manifest path hack around so the C and C++ runtime libraries get installed to the lib dir rather than the root install dir which may be added to %PATH% and break things.

I can't test that this actually works for machines that need the runtime bundled right now, and am not keen on landing this without knowing it works the same as the previous hack.

[Martin Pool (mbp)]

> I can't test that this actually works for machines that need the runtime bundled right now, and am not keen on landing this without knowing it works the same as the previous hack.

Does testing that require people build a new installer, or just run
the installer?

Either way you are probably better off asking on the list.

I don't think there is much point asking specifically for code review
if you know the results work; this kind of stuff is pretty empirical.

[Martin Packman (gz)]

It doesn't require the installer built, but does need some rather specific testing which is hard to get someone else to do correctly. Basically, either a virgin windows copy without the runtimes is needed, or fiddling with internal SxS directories to emulate that state. Then it's possible to examine what handles the bzr process has open and confirm it's finding the libraries we ship so won't fail if they are not already installed. Hopefully I'll be able to do that testing later this week, when I fix my windows box.

[Martin Pool (mbp)]

On 30 November 2011 22:50, Martin Packman <email address hidden> wrote:
> It doesn't require the installer built, but does need some rather specific testing which is hard to get someone else to do correctly. Basically, either a virgin windows copy without the runtimes is needed, or fiddling with internal SxS directories to emulate that state. Then it's possible to examine what handles the bzr process has open and confirm it's finding the libraries we ship so won't fail if they are not already installed. Hopefully I'll be able to do that testing later this week, when I fix my windows box.

So to be just a bit cavalier, you could just publish a new beta and
hope enough people will test it that one of them will hit the problem,
if there is a problem.

--
Martin

[Vincent Ladeuil (vila)]

> So to be just a bit cavalier, you could just publish a new beta and hope enough people will test it that one of them will hit the problem, if there is a problem.

With my RM hat: I think this is the way to go (and I don't feel it's that much cavalier), it's windows specific issue for which we need feedback, that's what beta testers are good at.

[Martin Packman (gz)]

This doesn't work. Fiddling with the name attribute is only tolerated because it's mostly ignored, not because it's treated as a path anywhere.

review: Disapprove

Unmerged revisions

193. By Martin Packman on 2011-11-29

Place the runtime libraries in under lib rather than next to the executables

=== modified file 'build.py'
--- build.py	2011-07-05 10:12:36 +0000
+++ build.py	2011-11-29 21:01:24 +0000
@@ -409,23 +409,24 @@
         # 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, [
+            lib_dir = os.path.join(exe_dir, "lib")
+            copy_files(self.msvc_redist_dir, lib_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>
+            # <https://bugs.launchpad.net/bzr-windows-installers/+bug/881203>
             m_name = "%s.manifest" % os.path.basename(self.msvc_redist_dir)
             # 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
+            # Write the manifest to the root dir so the python dll finds it,
+            # modifying the name to include in the 'lib' directory
             file(os.path.join(exe_dir, m_name), "w").write(
-                m_contents)
+                m_contents.replace('<file name="', '<file name="lib\\'))
             # 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(lib_dir, m_name), "w").write(m_contents)
 
         # Generate the Installer spec file and compile it
         iss_file = issgen.generate_iss(self.distro,