Changeset 460d3a1 in sasview

Timestamp:

Aug 31, 2017 4:19:08 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

706bb4e

Parents:

b39d32d5

Message:

try fixing OMP problem in reorg by matching bundle option to master

Location:

installers

Files:

• installer_generator.py (modified) (1 diff)
• setup_exe.py (modified) (3 diffs)

installers/installer_generator.py

@@ -30 +30 @@
 
 OutputBaseFilename = local_config.OutputBaseFilename
-SetupIconFile = os.path.join(root, 'src', 'sas', 'sasview', 'images', 'ball.ico')
+SetupIconFile = local_config.SetupIconFile_win
 LicenseFile = 'license.txt'
 DisableProgramGroupPage = 'yes'

installers/setup_exe.py

@@ -150 +150 @@
     """%{'arch': arch}
 
-if is_64bits:
-    msvcrtdll = glob(r"C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*")
-else:
-    msvcrtdll = glob(r"C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*")
-msvcrtdll_data_files = ("Microsoft.VC90.CRT", msvcrtdll) if msvcrtdll else None
-
 class Target:
     def __init__(self, **kw):
@@ -279 +273 @@
     data_files.append(('.', mkl_dlls))
 
-if msvcrtdll_data_files is not None:
+if is_64bits:
+    msvcrtdll = glob(r"C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*")
+else:
+    msvcrtdll = glob(r"C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*")
+if msvcrtdll:
     # install the MSVC 9 runtime dll's into the application folder
-    data_files.append(msvcrtdll_data_files)
+    data_files.append(("Microsoft.VC90.CRT", msvcrtdll))
 
 # NOTE:
@@ -352 +350 @@
 )
 
-bundle_option = 3 if is_64bits else 2
+#bundle_option = 3 if is_64bits else 2
+bundle_option = 3
 generate_installer()
 #initialize category stuff