Changeset 7983000f in sasview

Timestamp:

Dec 21, 2011 10:23:41 AM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

8ab3302

Parents:

86be650

Message:

added x86 program folder for MSdll

File:

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

sansview/setup_exe.py

@@ -153 +153 @@
 
 # Select the appropriate manifest to use.
+py26MSdll_x86 = None
 if sys.version_info >= (3, 0) or sys.version_info < (2, 5):
     print "*** This script only works with Python 2.5, 2.6, or 2.7."
@@ -160 +161 @@
     from glob import glob
     py26MSdll = glob(r"C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*")
+    try:
+        py26MSdll_x86 = glob(r"C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*")
+    except:
+        pass
 elif sys.version_info >= (2, 5):
     manifest = manifest_for_python25
@@ -239 +244 @@
     # install the MSVC 9 runtime dll's into the application folder
     data_files.append(("Microsoft.VC90.CRT", py26MSdll))
+if py26MSdll_x86 != None:
+    # install the MSVC 9 runtime dll's into the application folder
+    data_files.append(("Microsoft.VC90.CRT", py26MSdll_x86))
+
 
 # packages