Changeset 697d798 in sasview

Timestamp:

Jun 28, 2010 5:40:39 PM (15 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

38eee13

Parents:

480ddb4

Message:

prview: fixed problem with build script

Location:

prview

Files:

• images/ball.icns (added)
• setup_exe.py (modified) (1 diff)
• setup_mac.py (modified) (2 diffs)

prview/setup_exe.py

@@ -15 +15 @@
 
 import os, sys
+
+# When using the SansView build script, we need to be able to pass
+# an extra path to be added to the python path. The extra arguments
+# should be removed from the list so that the setup processing doesn't
+# fail.
+try:
+    if sys.argv.count('--extrapath'):
+        path_flag_idx = sys.argv.index('--extrapath')
+        extra_path = sys.argv[path_flag_idx+1]
+        sys.path.insert(0, extra_path)
+        del sys.argv[path_flag_idx+1]
+        sys.argv.remove('--extrapath')
+except:
+    print "Error processing extra python path needed to build SansView\n  %s" % sys.exc_value
+
 from distutils.core import setup
 from distutils.filelist import findall

prview/setup_mac.py

@@ -3 +3 @@
 """
 from setuptools import setup
+import DataLoader.readers 
+import os
+
+#Data reader data files
+
+RESOURCES_FILES = os.path.join(DataLoader.readers.get_data_path(),'defaults.xml')
+
+# Locate libxml2 library
+lib_locs = ['/usr/local/lib', '/usr/lib']
+libxml_path = None
+for item in lib_locs:
+    libxml_path_test = '%s/libxml2.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 = ['PrView.py']
-DATA_FILES = ['images', 'test']
+DATA_FILES = ['images', 'test', 'plugins']
 OPTIONS = {'argv_emulation': True,
-           #'plist': dict(LSPrefersPPC=True)
+           'packages': ['lxml'],
+           'iconfile': 'images/ball.icns',
+           'frameworks':[libxml_path],
+           'resources': RESOURCES_FILES
            }
 
@@ -13 +32 @@
     app=APP,
     data_files=DATA_FILES,
+    include_package_data= True,
     options={'py2app': OPTIONS},
     setup_requires=['py2app'],