Changeset 0c17d96 in sasview


Ignore:
Timestamp:
Jun 22, 2015 10:03:49 AM (9 years ago)
Author:
krzywon
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:
6a6d687
Parents:
28812b8
Message:

Modified the windows build script to keep folder structure of the test
data

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasview/setup_exe.py

    rc971c98 r0c17d96  
    231231images_dir = os.path.join(path, "images") 
    232232test_dir = os.path.join(path, "test") 
     233test_1d_dir = os.path.join(path, "test\\1d_data") 
     234test_2d_dir = os.path.join(path, "test\\2d_data") 
     235test_save_dir = os.path.join(path, "test\\save_states") 
     236test_upcoming_dir = os.path.join(path, "test\\upcoming_formats") 
    233237 
    234238matplotlibdatadir = matplotlib.get_data_path() 
     
    290294 
    291295# Copying the sample data user data 
    292 for f in findall(test_dir): 
    293     if not ".svn" in f: 
    294         data_files.append(("test", [f])) 
     296for f in findall(test_1d_dir): 
     297    if not ".svn" in f: 
     298        data_files.append(("test\\1d_data", [f])) 
     299 
     300# Copying the sample data user data 
     301for f in findall(test_2d_dir): 
     302    if not ".svn" in f: 
     303        data_files.append(("test\\2d_data", [f])) 
     304 
     305# Copying the sample data user data 
     306for f in findall(test_save_dir): 
     307    if not ".svn" in f: 
     308        data_files.append(("test\\save_states", [f])) 
     309 
     310# Copying the sample data user data 
     311for f in findall(test_upcoming_dir): 
     312    if not ".svn" in f: 
     313        data_files.append(("test\\upcoming_formats", [f])) 
     314 
    295315 
    296316# See if the documentation has been built, and if so include it. 
     
    310330    # install the MSVC 9 runtime dll's into the application folder 
    311331    data_files.append(("Microsoft.VC90.CRT", py26MSdll_x86)) 
    312  
    313332 
    314333# NOTE: 
     
    335354packages.append('periodictable.core') # not found automatically 
    336355#packages.append('IPython') 
    337 includes = ['site', 'lxml._elementpath', 'lxml.etree'] 
     356includes = ['site', 'lxml._elementpath', 'lxml.etree', 'zmq.backend.cython'] 
    338357 
    339358# Exclude packages that are not needed but are often found on build systems 
    340 excludes = ['Tkinter', 'PyQt4', '_ssl', '_tkagg', 'sip', 'pytz'] 
     359excludes = ['Tkinter', 'PyQt4', '_ssl', '_tkagg', 'sip', 'pytz', 'zmq.libzmq'] 
    341360 
    342361 
     
    353372    # accidental links to msys/cygwin binaries; shouldn't be needed 
    354373    'cygwin1.dll', 
     374    'libzmq.pyd' 
    355375    ] 
    356376 
     
    370390#initialize category stuff 
    371391#from sas.guiframe.CategoryInstaller import CategoryInstaller 
    372 #CategoryInstaller.check_install() 
     392#CategoryInstaller.check_install(s) 
     393 
     394sys.setrecursionlimit(10000) 
    373395 
    374396setup( 
Note: See TracChangeset for help on using the changeset viewer.