Changeset 899e084 in sasview for sasview/setup_exe.py

Timestamp:

Jun 27, 2016 7:36:41 AM (8 years ago)

Author:

Paul Kienzle <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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

80c2c85

Parents:

efe730d

Message:

build console app as well as gui

File:

• sasview/setup_exe.py (modified) (6 diffs)

sasview/setup_exe.py

@@ -33 +33 @@
 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)
-#build_path = os.path.join(root, 'sasview-install', 'Lib', 'site-packages')
+build_path = os.path.join(root, 'sasview-install', 'Lib', 'site-packages')
 sys.path.insert(0, build_path)
+doc_path = os.path.join(root, 'build', 'lib.'+platform, 'doc')
 
 from sas.sasview import local_config
@@ -279 +279 @@
 
 # See if the documentation has been built, and if so include it.
-doc_path = os.path.join(build_path, "doc")
 if os.path.exists(doc_path):
     for dirpath, dirnames, filenames in os.walk(doc_path):
@@ -314 +313 @@
     ])
 packages.append('periodictable.core') # not found automatically
-#packages.append('IPython')
+# For an interactive interpreter, SasViewCom
+packages.extend(['IPython','pyreadline','pyreadline.unicode_helper'])
+
+# individual models
 includes = ['site', 'lxml._elementpath', 'lxml.etree']
 
@@ -329 +331 @@
     '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',
+    # ... but we seem to need them when building from anaconda, so don't exclude ...
+    #'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',
@@ -340 +343 @@
     ]
 
+# extra dlls not found automatically
+python_root = os.path.dirname(os.path.abspath(sys.executable))
+dll_path = os.path.join(python_root, 'Library', 'bin')
+# the following are found already: 'mkl_intel_thread', 'libmmd', 'libifcoremd'
+dll_includes = ['mkl_core', 'mkl_def', 'libiomp5md']
+dll_includes = [os.path.join(dll_path, dll+'.dll') for dll in dll_includes]
+dll_includes = [dll for dll in dll_includes if os.path.exists(dll)]
+if dll_includes:
+   DATA_FILES.append(('.', dll_includes))
+
 target_wx_client = Target(
     description = 'SasView',
-    script = 'startup.py',
+    script = 'sasview_gui.py',
     icon_resources = [(1, local_config.SetupIconFile_win)],
     other_resources = [(24, 1, manifest)],
     dest_base = "SasView"
     )
+
+target_console_client = Target(
+    description = 'SasView console',
+    script = 'sasview_console.py',
+    icon_resources = [(1, local_config.SetupIconFile_win)],
+    other_resources = [(24, 1, manifest)],
+    dest_base = "SasViewCom"
+)
 
 bundle_option = 2
@@ -358 +379 @@
 setup(
     windows=[target_wx_client],
-    console=[],
+    console=[target_console_client],
     options={
         'py2exe': {