Changeset 3371d81 in sasview for sasview

Timestamp:

May 9, 2016 4:59:33 AM (8 years ago)

Author:

wojciech

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:

aa4a549

Parents:

aff7904 (diff), 1d5f5c2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

setup.py fixed. Merged with Master

Location:

sasview

Files:

• installer_generator.py (modified) (1 diff)
• setup_exe.py (modified) (3 diffs)
• setup_mac.py (modified) (3 diffs)

sasview/installer_generator.py

@@ -197 +197 @@
     msg += """Source: "dist\*";\tDestDir: "{app}";\t"""
     msg += """Flags: ignoreversion recursesubdirs createallsubdirs\n"""
-    msg += """Source: "dist\plugin_models\*";\tDestDir: "{userdesktop}\..\.sasview\plugin_models";\t""" 
+    msg += """Source: "dist\plugin_models\*";\tDestDir: "{userdesktop}\..\.sasview\plugin_models";\t"""
+    msg += """Flags: recursesubdirs createallsubdirs\n""" 
+    msg += """Source: "dist\compiled_models\*";\tDestDir: "{userdesktop}\..\.sasmodels\compiled_models";\t"""
     msg += """Flags: recursesubdirs createallsubdirs\n"""
     msg += """Source: "dist\config\custom_config.py";\tDestDir: "{userdesktop}\..\.sasview\config";\t""" 

sasview/setup_exe.py

@@ -197 +197 @@
 # Select the appropriate manifest to use.
 py26MSdll_x86 = None
-if sys.version_info >= (3, 0) or sys.version_info < (2, 5):
-    print "*** This script only works with Python 2.5, 2.6, or 2.7."
+if sys.version_info >= (3, 0) or sys.version_info < (2, 6):
+    print "*** This script only works with Python 2.6 or 2.7."
     sys.exit()
 elif sys.version_info >= (2, 6):
@@ -208 +208 @@
     except:
         pass
-elif sys.version_info >= (2, 5):
-    manifest = manifest_for_python25
-    py26MSdll = None
 
 
@@ -256 +253 @@
 data_files += guiframe.data_files()
 
-#import sas.models as models
-import sasmodels.models as models
-data_files += models.data_files()
+# precompile sas models into the sasview build path; doesn't matter too much
+# where it is so long as it is a place that will get cleaned up afterwards.
+import sasmodels.core
+dll_path = os.path.join(build_path, 'compiled_models')
+compiled_dlls += sasmodels.core.precompile_dlls(dll_path, dtype='double')
+
+# include the compiled models as data; coordinate the target path for the
+# data with installer_generator.py
+datafiles.append('compiled_models', compiled_dlls)
+
+import sasmodels
+data_files += sasmodels.data_files()
 
 for f in matplotlibdata:

sasview/setup_mac.py

@@ -20 +20 @@
 import sys
 import platform
+#Extending recursion limit
+sys.setrecursionlimit(10000)
 
 from distutils.util import get_platform
@@ -26 +28 @@
 build_path = os.path.join(root, 'build','lib.'+platform)
 sys.path.insert(0, build_path)
-
+print "BUILDING PATH INSIDE", build_path
 ICON = local_config.SetupIconFile_mac
 EXTENSIONS_LIST = []
@@ -67 +69 @@
 # See if the documentation has been built, and if so include it.
 doc_path = os.path.join(build_path, "doc")
+print doc_path
 if os.path.exists(doc_path):
     for dirpath, dirnames, filenames in os.walk(doc_path):