Changeset 80c2c85 in sasview for sasview/setup_mac.py

Timestamp:

Jun 28, 2016 5:10:33 PM (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:

3aa2f3c

Parents:

899e084 (diff), 5552396 (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:

Merge branch 'master' into sasview-cleanup

File:

• sasview/setup_mac.py (modified) (3 diffs)

sasview/setup_mac.py

@@ -12 +12 @@
 """
 from setuptools import setup
-import periodictable.xsf
-import sas.sascalc.dataloader.readers
 import os
 import string
-import local_config
 import pytz
 import sys
@@ -29 +26 @@
 sys.path.insert(0, build_path)
 print "BUILDING PATH INSIDE", build_path
+
+from sas.sasview import local_config
+
 ICON = local_config.SetupIconFile_mac
 EXTENSIONS_LIST = []
+RESOURCES_FILES = []
 DATA_FILES = []
-RESOURCES_FILES = []
 
 #Periodictable data file
-DATA_FILES = periodictable.data_files()
+import periodictable
+DATA_FILES += periodictable.data_files()
 #invariant and calculator help doc
-import sas.sasgui.perspectives.fitting as fitting
+from sas.sasgui.perspectives import fitting
 DATA_FILES += fitting.data_files()
-import sas.sasgui.perspectives.calculator as calculator
+from sas.sasgui.perspectives import calculator
 DATA_FILES += calculator.data_files()
-import sas.sasgui.perspectives.invariant as invariant
+from sas.sasgui.perspectives import invariant
 DATA_FILES += invariant.data_files()
-import sasmodels as models
-DATA_FILES += models.data_files()
-import sas.sasgui.guiframe as guiframe
+import sasmodels
+DATA_FILES += sasmodels.data_files()
+from sas.sasgui import guiframe
 DATA_FILES += guiframe.data_files()
 
 #CANSAxml reader data files
-RESOURCES_FILES.append(os.path.join(sas.sascalc.dataloader.readers.get_data_path(),'defaults.json'))
-
-# Locate libxml2 library
-lib_locs = ['/usr/local/lib', '/usr/lib']
-libxml_path = None
-for item in lib_locs:
-    libxml_path_test = '%s/libxml2.2.dylib' % item
-    if os.path.isfile(libxml_path_test):
-        libxml_path = libxml_path_test
-if libxml_path == None:
-    raise RuntimeError, "Could not find libxml2 on the system"
-
-APP = ['sasview.py']
-DATA_FILES += ['images','test','media', 'custom_config.py', 'local_config.py',
-               'default_categories.json']
+from sas.sascalc.dataloader import readers
+RESOURCES_FILES.append(os.path.join(readers.get_data_path(),'defaults.json'))
+
+# Copy the config files
+sasview_path = os.path.join('..','src','sas','sasview')
+custom_config_file = os.path.join(sasview_path, 'custom_config.py')
+local_config_file = os.path.join(sasview_path, 'local_config.py')
+DATA_FILES.append(('.', [custom_config_file]))
+DATA_FILES.append(('config', [custom_config_file]))
+DATA_FILES.append(('.', [local_config_file]))
+
+# default_categories.json is beside the config files
+category_config = os.path.join(sasview_path, 'default_categories.json')
+if os.path.isfile(category_config):
+    DATA_FILES.append(('.', [category_config]))
+
 if os.path.isfile("BUILD_NUMBER"):
-    DATA_FILES.append("BUILD_NUMBER")
+    DATA_FILES.append(('.', ["BUILD_NUMBER"]))
+
+images_dir = local_config.icon_path
+media_dir = local_config.media_path
+images_dir = local_config.icon_path
+test_dir = local_config.test_path
+test_1d_dir = os.path.join(test_dir, "1d_data")
+test_2d_dir = os.path.join(test_dir, "2d_data")
+test_save_dir = os.path.join(test_dir, "save_states")
+test_upcoming_dir = os.path.join(test_dir, "upcoming_formats")
+
+# Copying the images directory to the distribution directory.
+for f in findall(images_dir):
+    DATA_FILES.append(("images", [f]))
+
+# Copying the HTML help docs
+for f in findall(media_dir):
+    DATA_FILES.append(("media", [f]))
+
+# Copying the sample data user data
+for f in findall(test_1d_dir):
+    DATA_FILES.append(("test\\1d_data", [f]))
+
+# Copying the sample data user data
+for f in findall(test_2d_dir):
+    DATA_FILES.append(("test\\2d_data", [f]))
+
+# Copying the sample data user data
+for f in findall(test_save_dir):
+    DATA_FILES.append(("test\\save_states", [f]))
+
+# Copying the sample data user data
+for f in findall(test_upcoming_dir):
+    DATA_FILES.append(("test\\upcoming_formats", [f]))
+
+# Copying opencl include files
+for f in findall(opencl_include_dir):
+    DATA_FILES.append(("includes\\pyopencl", [f]))
 
 # See if the documentation has been built, and if so include it.
@@ -119 +158 @@
                                    CFBundleTypeRole="Shell" )],)
 
+# Locate libxml2 library
+lib_locs = ['/usr/local/lib', '/usr/lib']
+libxml_path = None
+for item in lib_locs:
+    libxml_path_test = '%s/libxml2.2.dylib' % item
+    if os.path.isfile(libxml_path_test):
+        libxml_path = libxml_path_test
+if libxml_path == None:
+    raise RuntimeError, "Could not find libxml2 on the system"
+
 #Get version - NB nasty hack. Need to find correct way to give path to installed sasview (AJJ)
 #h5py has been added to packages. It requires hdf5 to be installed separetly
 #
-import __init__ as sasviewver
-
-VERSION = sasviewver.__version__
+
+from sas.sasview import __version__ as VERSION
 APPNAME = "SasView "+VERSION
 DMGNAME = "SasView-"+VERSION+"-MacOSX"
-
-APP = ['sasview.py']
-DATA_FILES += ['images','test','media']
+APP = ['sasview_gui.py']
 
 EXCLUDES = ['PyQt4', 'sip', 'QtGui']