From e590579d7080128a86e092cdac48c6b43b6998b2 Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Sun, 15 Feb 2015 13:01:32 -0800
Subject: Always build 32 and 64 bit versions of the windows installer. No
 reason to only build the native version since python can build both
 regardless of currrent platform

---
 SConstruct | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'SConstruct')

diff --git a/SConstruct b/SConstruct
index c95c0a9b..63670019 100644
--- a/SConstruct
+++ b/SConstruct
@@ -730,10 +730,9 @@ for p in [ scons ]:
     platform_zip = os.path.join(build,
                                 'dist',
                                 "%s.%s.zip" % (pkg_version, platform))
-    if platform == "win-amd64":
-        win32_exe = os.path.join(build, 'dist', "%s.win-amd64.exe" % pkg_version)
-    else:
-        win32_exe = os.path.join(build, 'dist', "%s.win32.exe" % pkg_version)
+    
+    win64_exe = os.path.join(build, 'dist', "%s.win-amd64.exe" % pkg_version)
+    win32_exe = os.path.join(build, 'dist', "%s.win32.exe" % pkg_version)
 
     #
     # Update the environment with the relevant information
@@ -845,11 +844,13 @@ for p in [ scons ]:
 
     distutils_formats = []
 
-    distutils_targets = [ win32_exe ]
+    distutils_targets = [  win32_exe , win64_exe ]
+    dist_distutils_targets = []
 
-    dist_distutils_targets = env.Install('$DISTDIR', distutils_targets)
-    Local(dist_distutils_targets)
-    AddPostAction(dist_distutils_targets, Chmod(dist_distutils_targets, 0644))
+    for target in distutils_targets:
+        dist_target = env.Install('$DISTDIR', target)
+        AddPostAction(dist_target, Chmod(dist_target, 0644))
+        dist_distutils_targets += dist_target
 
     if not gzip:
         print "gzip not found in %s; skipping .tar.gz package for %s." % (os.environ['PATH'], pkg)
@@ -1081,7 +1082,9 @@ for p in [ scons ]:
         commands.append("$PYTHON $PYTHONFLAGS $SETUP_PY sdist --formats=%s" %  \
                             ','.join(distutils_formats))
 
-    commands.append("$PYTHON $PYTHONFLAGS $SETUP_PY bdist_wininst --plat-name win32 --user-access-control auto")
+    commands.append("$PYTHON $PYTHONFLAGS $SETUP_PY bdist_wininst --plat-name=win32 --user-access-control auto")
+
+    commands.append("$PYTHON $PYTHONFLAGS $SETUP_PY bdist_wininst --plat-name=win-amd64 --user-access-control auto")
 
     env.Command(distutils_targets, build_src_files, commands)
 
-- 
cgit v1.2.1