Changeset 460d3a1 in sasview for installers


Ignore:
Timestamp:
Aug 31, 2017 4:19:08 PM (2 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:
2 edited

Legend:

Unmodified
Added
Removed
  • installers/installer_generator.py

    r5f51c86 r460d3a1  
    3030 
    3131OutputBaseFilename = local_config.OutputBaseFilename 
    32 SetupIconFile = os.path.join(root, 'src', 'sas', 'sasview', 'images', 'ball.ico') 
     32SetupIconFile = local_config.SetupIconFile_win 
    3333LicenseFile = 'license.txt' 
    3434DisableProgramGroupPage = 'yes' 
  • installers/setup_exe.py

    ra2a1c20 r460d3a1  
    150150    """%{'arch': arch} 
    151151 
    152 if is_64bits: 
    153     msvcrtdll = glob(r"C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*") 
    154 else: 
    155     msvcrtdll = glob(r"C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*") 
    156 msvcrtdll_data_files = ("Microsoft.VC90.CRT", msvcrtdll) if msvcrtdll else None 
    157  
    158152class Target: 
    159153    def __init__(self, **kw): 
     
    279273    data_files.append(('.', mkl_dlls)) 
    280274 
    281 if msvcrtdll_data_files is not None: 
     275if is_64bits: 
     276    msvcrtdll = glob(r"C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*") 
     277else: 
     278    msvcrtdll = glob(r"C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*") 
     279if msvcrtdll: 
    282280    # install the MSVC 9 runtime dll's into the application folder 
    283     data_files.append(msvcrtdll_data_files) 
     281    data_files.append(("Microsoft.VC90.CRT", msvcrtdll)) 
    284282 
    285283# NOTE: 
     
    352350) 
    353351 
    354 bundle_option = 3 if is_64bits else 2 
     352#bundle_option = 3 if is_64bits else 2 
     353bundle_option = 3 
    355354generate_installer() 
    356355#initialize category stuff 
Note: See TracChangeset for help on using the changeset viewer.