Changeset 7476d30 in sasview

Timestamp:

Dec 2, 2011 11:18:48 AM (12 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

09b3505

Parents:

202c1ef

Message:

Re #5 make sure we don't break 32-bit version on Windows

File:

• sansview/setup_exe.py (modified) (3 diffs)

sansview/setup_exe.py

@@ -15 +15 @@
 
 import os, sys
+import platform
 
 if len(sys.argv) == 1:
@@ -176 +177 @@
     )
 
-
+bundle_option = 2
+if platform.architecture()[0] == '64bit':
+    bundle_option = 3
 
 setup(
@@ -190 +193 @@
             "compressed": 1,
             "optimize": 0,
-            #"bundle_files":2,
-            "bundle_files":3,
+            "bundle_files":bundle_option,
             },
     },