Changeset 7983000f in sasview
- Timestamp:
- Dec 21, 2011 8:23:41 AM (13 years ago)
- 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
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sansview/setup_exe.py
rf9505c30 r7983000f 153 153 154 154 # Select the appropriate manifest to use. 155 py26MSdll_x86 = None 155 156 if sys.version_info >= (3, 0) or sys.version_info < (2, 5): 156 157 print "*** This script only works with Python 2.5, 2.6, or 2.7." … … 160 161 from glob import glob 161 162 py26MSdll = glob(r"C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*") 163 try: 164 py26MSdll_x86 = glob(r"C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*") 165 except: 166 pass 162 167 elif sys.version_info >= (2, 5): 163 168 manifest = manifest_for_python25 … … 239 244 # install the MSVC 9 runtime dll's into the application folder 240 245 data_files.append(("Microsoft.VC90.CRT", py26MSdll)) 246 if py26MSdll_x86 != None: 247 # install the MSVC 9 runtime dll's into the application folder 248 data_files.append(("Microsoft.VC90.CRT", py26MSdll_x86)) 249 241 250 242 251 # packages
Note: See TracChangeset
for help on using the changeset viewer.