Changeset 2f2d9d0 in sasview


Ignore:
Timestamp:
Apr 3, 2014 9:43:09 AM (10 years ago)
Author:
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, 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:
2498b9c
Parents:
51f14603
Message:

build exe from sasview/build rather than the installed directory
prepare for move to numpy 1.8

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • run.py

    rd7b46e71 r2f2d9d0  
    1515import imp 
    1616from glob import glob 
    17 from distutils.util import get_platform 
    1817 
    1918# find the directories for the source and build 
     19from distutils.util import get_platform 
    2020root = os.path.abspath(os.path.dirname(__file__)) 
    2121platform = '%s-%s'%(get_platform(),sys.version[:3]) 
  • sansview/setup_exe.py

    r80b93da r2f2d9d0  
    1616import os, sys 
    1717import platform 
     18 
     19# put the build directory at the front of the path 
     20if os.path.abspath(os.path.dirname(__file__)) != os.path.abspath(os.getcwd()): 
     21    raise RuntimeError("Must run setup_exe from the sansview directory") 
     22from distutils.util import get_platform 
     23root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) 
     24platform = '%s-%s'%(get_platform(),sys.version[:3]) 
     25build_path = os.path.join(root, 'build','lib.'+platform) 
     26sys.path.insert(0, build_path) 
     27 
    1828import local_config 
    1929 
     
    291301 
    292302 
     303# NOTE: 
     304#  need an empty __init__.py in site-packages/numpy/distutils/tests and site-packages/mpl_toolkits 
     305 
    293306# packages 
    294307# 
     
    311324excludes = ['Tkinter', 'PyQt4', '_ssl', '_tkagg', 'sip'] 
    312325 
    313 dll_excludes = ['libgdk_pixbuf-2.0-0.dll', 
    314                 'libgobject-2.0-0.dll', 
    315                 'libgdk-win32-2.0-0.dll', 
    316                 'tcl84.dll', 
    317                 'tk84.dll', 
    318                 'QtGui4.dll', 
    319                 'QtCore4.dll', 
    320                 'msvcp90.dll', 
    321                 'w9xpopen.exe', 
    322                 'cygwin1.dll'] 
     326 
     327dll_excludes = [ 
     328    # Various matplotlib backends we are not using 
     329    'libgdk_pixbuf-2.0-0.dll', 'libgobject-2.0-0.dll', 'libgdk-win32-2.0-0.dll', 
     330    'tcl84.dll', 'tk84.dll', 'QtGui4.dll', 'QtCore4.dll', 
     331    # numpy 1.8 openmp bindings (still seems to use all the cores without them) 
     332    'libiomp5md.dll', 'libifcoremd.dll', 'libmmd.dll', 'svml_dispmd.dll','libifportMD.dll', 
     333    # microsoft C runtime (not allowed to ship with the app; need to ship vcredist 
     334    'msvcp90.dll', 
     335    # 32-bit windows console piping 
     336    'w9xpopen.exe', 
     337    # accidental links to msys/cygwin binaries; shouldn't be needed 
     338    'cygwin1.dll', 
     339    ] 
    323340 
    324341target_wx_client = Target( 
Note: See TracChangeset for help on using the changeset viewer.