Changes in / [259aaa0:aff7904] in sasview


Ignore:
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • build_tools/jenkins_osx_build.sh

    r259aaa0 r5881b17  
    11export PATH=$PATH:/usr/local/bin/ 
    2  
    32 
    43PYTHON=${PYTHON:-`which python`} 
     
    6766 
    6867# TEST 
    69 cd $WORKSPACE 
    70 cd sasview 
    71 cd test 
    72 $PYTHON utest_sasview.py 
    73  
     68#cd $WORKSPACE 
     69#cd sasview 
     70#cd test 
     71#$PYTHON utest_sasview.py 
    7472 
    7573# PYLINT 
     
    7876$PYLINT --rcfile "build_tools/pylint.rc" -f parseable sasview-install/sasview*.egg/sas sasview | tee  test/sasview.txt 
    7977 
    80  
    8178# BUILD APP 
    8279cd $WORKSPACE 
    8380cd sasview/sasview 
    84 python setup_mac.py py2app 
     81$PYTHON setup_mac.py py2app 
    8582 
  • sasview/setup_mac.py

    r628acad r5881b17  
    2020import sys 
    2121import platform 
     22#Extending recursion limit 
     23sys.setrecursionlimit(10000) 
    2224 
    2325from distutils.util import get_platform 
     
    2628build_path = os.path.join(root, 'build','lib.'+platform) 
    2729sys.path.insert(0, build_path) 
    28  
     30print "BUILDING PATH INSIDE", build_path 
    2931ICON = local_config.SetupIconFile_mac 
    3032EXTENSIONS_LIST = [] 
     
    6769# See if the documentation has been built, and if so include it. 
    6870doc_path = os.path.join(build_path, "doc") 
     71print doc_path 
    6972if os.path.exists(doc_path): 
    7073    for dirpath, dirnames, filenames in os.walk(doc_path): 
  • setup.py

    ra7c4ad2 r5881b17  
    3838# except when there is no such file 
    3939# Todo : make this list generic 
    40 # plugin_model_list = ['polynominal5.py', 'sph_bessel_jn.py', 
     40#plugin_model_list = ['polynominal5.py', 'sph_bessel_jn.py', 
    4141#                      'sum_Ap1_1_Ap2.py', 'sum_p1_p2.py', 
    4242#                      'testmodel_2.py', 'testmodel.py', 
     
    5959    if os.path.isfile(f_path): 
    6060        os.remove(f_path) 
    61     # f_path = os.path.join(sas_dir, 'plugin_models') 
    62     # if os.path.isdir(f_path): 
     61    #f_path = os.path.join(sas_dir, 'plugin_models') 
     62    #if os.path.isdir(f_path): 
    6363    #     for f in os.listdir(f_path): 
    6464    #         if f in plugin_model_list: 
     
    297297append_file(file_sources, gen_dir) 
    298298 
     299#Wojtek's hacky way to add doc files while bundling egg 
     300#def add_doc_files(directory): 
     301#    paths = [] 
     302#    for (path, directories, filenames) in os.walk(directory): 
     303#        for filename in filenames: 
     304#            paths.append(os.path.join(path, filename)) 
     305#    return paths 
     306 
     307#doc_files = add_doc_files('doc') 
     308 
    299309# SasView 
    300310package_dir["sas.sasview"] = "sasview" 
    301 package_data['sas.sasview'] = ['images/*',  
     311package_data['sas.sasview'] = ['images/*', 
    302312                               'media/*', 
    303313                               'test/*.txt', 
     
    325335else: 
    326336    required.extend(['pil']) 
    327     
     337 
    328338# Set up SasView     
    329339setup( 
Note: See TracChangeset for help on using the changeset viewer.