Changeset 202a4ce9 in sasview for installers


Ignore:
Timestamp:
Oct 18, 2017 8:40:42 AM (2 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
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:
0056a05e
Parents:
75fff69
Message:

Fixed embarrassing stash apply error

File:
1 edited

Legend:

Unmodified
Added
Removed
  • installers/setup_exe.py

    • Property mode changed from 100644 to 100755
    r75fff69 r202a4ce9  
    206206data_files += calculator.data_files() 
    207207 
    208 <<<<<<< Updated upstream:installers/setup_exe.py 
    209208from sas.sasgui.perspectives import invariant 
    210209data_files += invariant.data_files() 
    211 ======= 
    212 python_root = os.path.dirname(os.path.abspath(sys.executable)) 
    213  
    214 # Check for ATLAS 
    215 dll_path = os.path.join(python_root, 'lib', 'site-packages', 'numpy', 'core') 
    216 dlls = ['numpy-atlas'] 
    217 atlas_dlls = dll_check(dll_path, dlls) 
    218 >>>>>>> Stashed changes:sasview/setup_exe.py 
    219210 
    220211from sas.sasgui import guiframe 
    221212data_files += guiframe.data_files() 
    222213 
    223 <<<<<<< Updated upstream:installers/setup_exe.py 
    224214# Copy the config files 
    225215sasview_path = os.path.join('..', 'src', 'sas', 'sasview') 
     
    231221sas_path = os.path.join('..', 'src', 'sas') 
    232222data_files.append(('.', [os.path.join(sas_path, 'logging.ini')])) 
    233 ======= 
    234 if mkl_dlls: 
    235     data_files.append(('.', atlas_dlls)) 
    236 elif atlas_dlls: 
    237     data_files.append(('.', mkl_dlls)) 
    238 >>>>>>> Stashed changes:sasview/setup_exe.py 
    239223 
    240224if os.path.isfile("BUILD_NUMBER"): 
Note: See TracChangeset for help on using the changeset viewer.