Changeset 2f2d9d0 in sasview

Timestamp:

Apr 3, 2014 11:43:09 AM (11 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:

• run.py (modified) (1 diff)
• sansview/setup_exe.py (modified) (3 diffs)

run.py

@@ -15 +15 @@
 import imp
 from glob import glob
-from distutils.util import get_platform
 
 # find the directories for the source and build
+from distutils.util import get_platform
 root = os.path.abspath(os.path.dirname(__file__))
 platform = '%s-%s'%(get_platform(),sys.version[:3])

sansview/setup_exe.py

@@ -16 +16 @@
 import os, sys
 import platform
+
+# put the build directory at the front of the path
+if os.path.abspath(os.path.dirname(__file__)) != os.path.abspath(os.getcwd()):
+    raise RuntimeError("Must run setup_exe from the sansview directory")
+from distutils.util import get_platform
+root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+platform = '%s-%s'%(get_platform(),sys.version[:3])
+build_path = os.path.join(root, 'build','lib.'+platform)
+sys.path.insert(0, build_path)
+
 import local_config
 
@@ -291 +301 @@
 
 
+# NOTE:
+#  need an empty __init__.py in site-packages/numpy/distutils/tests and site-packages/mpl_toolkits
+
 # packages
 #
@@ -311 +324 @@
 excludes = ['Tkinter', 'PyQt4', '_ssl', '_tkagg', 'sip']
 
-dll_excludes = ['libgdk_pixbuf-2.0-0.dll',
-                'libgobject-2.0-0.dll',
-                'libgdk-win32-2.0-0.dll',
-                'tcl84.dll',
-                'tk84.dll',
-                'QtGui4.dll',
-                'QtCore4.dll',
-                'msvcp90.dll',
-                'w9xpopen.exe',
-                'cygwin1.dll']
+
+dll_excludes = [
+    # Various matplotlib backends we are not using
+    'libgdk_pixbuf-2.0-0.dll', 'libgobject-2.0-0.dll', 'libgdk-win32-2.0-0.dll',
+    'tcl84.dll', 'tk84.dll', 'QtGui4.dll', 'QtCore4.dll',
+    # numpy 1.8 openmp bindings (still seems to use all the cores without them)
+    'libiomp5md.dll', 'libifcoremd.dll', 'libmmd.dll', 'svml_dispmd.dll','libifportMD.dll',
+    # microsoft C runtime (not allowed to ship with the app; need to ship vcredist
+    'msvcp90.dll',
+    # 32-bit windows console piping
+    'w9xpopen.exe',
+    # accidental links to msys/cygwin binaries; shouldn't be needed
+    'cygwin1.dll',
+    ]
 
 target_wx_client = Target(