From d8f48cbd42c50a33b1610345a861e4f10651db4d Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Sat, 17 Aug 2013 14:48:36 -0400 Subject: [PATCH] Fixed 32bit Windows packaging for Python 3.3 Python 3.3 is compiled with VS2010, and the old VS2008 pre-requisite scheme doesn't work anymore. We now do like with 64bit, include the DLLs directly in the package. --- package.py | 8 ++-- qt/me/installer.aip | 97 ++++++++------------------------------- qt/pe/installer.aip | 109 ++++++++------------------------------------ qt/se/installer.aip | 44 ++---------------- 4 files changed, 43 insertions(+), 215 deletions(-) diff --git a/package.py b/package.py index 71b5977f..39d26c10 100644 --- a/package.py +++ b/package.py @@ -69,11 +69,9 @@ def package_windows(edition, dev): locale_path = op.join('build', 'locale') print("Copying {} to dist\\locale".format(locale_path)) shutil.copytree(locale_path, op.join(distdir, 'locale')) - if is64bit: - # In 64bit mode, we don't install the VC redist as a prerequisite. We just bundle the - # appropriate dlls. - shutil.copy(find_in_path('msvcr100.dll'), distdir) - shutil.copy(find_in_path('msvcp100.dll'), distdir) + # We don't install the VC redist as a prerequisite. We just bundle the appropriate dlls. + shutil.copy(find_in_path('msvcr100.dll'), distdir) + shutil.copy(find_in_path('msvcp100.dll'), distdir) # AdvancedInstaller.com has to be in your PATH # this is so we don'a have to re-commit installer.aip at every version change diff --git a/qt/me/installer.aip b/qt/me/installer.aip index 76715f8c..67a2bb9d 100644 --- a/qt/me/installer.aip +++ b/qt/me/installer.aip @@ -1,7 +1,6 @@ - + - @@ -18,67 +17,35 @@ - + - - + + + + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -98,23 +65,14 @@ - - - - - - - - - @@ -135,18 +93,18 @@ + + + + + + + + - - - - - - - - @@ -176,34 +134,22 @@ - - - - - - - - - - - + + - - - @@ -219,13 +165,6 @@ - - - - - - - diff --git a/qt/pe/installer.aip b/qt/pe/installer.aip index 76a1aab2..f6c2f2cc 100644 --- a/qt/pe/installer.aip +++ b/qt/pe/installer.aip @@ -1,7 +1,6 @@ - + - @@ -18,78 +17,36 @@ - + - - + + + + - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -106,23 +63,14 @@ - - - - - - - - - @@ -144,21 +92,21 @@ + + + + + + + + - - - - - - - - @@ -188,34 +136,22 @@ - - - - - - - - - - - + + - - - @@ -231,13 +167,6 @@ - - - - - - - diff --git a/qt/se/installer.aip b/qt/se/installer.aip index bea5d28b..33ee41fe 100644 --- a/qt/se/installer.aip +++ b/qt/se/installer.aip @@ -1,7 +1,6 @@ - @@ -18,7 +17,7 @@ - + @@ -33,13 +32,12 @@ - - + @@ -47,7 +45,7 @@ - + @@ -64,23 +62,14 @@ - - - - - - - - - @@ -112,16 +101,8 @@ - - - - - - - - @@ -151,19 +132,10 @@ - - - - - - - - - @@ -171,14 +143,11 @@ - - - @@ -194,13 +163,6 @@ - - - - - - -