Changeset 0f2c15d in sasview

Timestamp:

Dec 5, 2011 11:06:07 AM (13 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:

68dc52c6

Parents:

f9303b6

Message:

Re #5 fixing mac build

File:

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

sansview/setup_mac.py

@@ -9 +9 @@
    12/01/2011: When seeing an error related to pytz.zoneinfo not being found, change the following line in py2app/recipes/matplotlib.py
                mf.import_hook('pytz.tzinfo', m, ['UTC'])
+   12/05/2011: Generally needs a recent version of macholib, modulegraph, and altgraph (through easy_install) on OSX >= 10.6
 """
 from setuptools import setup
@@ -19 +20 @@
 import pytz
 import sys
+import platform
 
 ICON = local_config.SetupIconFile_mac
@@ -102 +104 @@
 EXCLUDES = ['PyQt4', 'sip', 'QtGui']
 
-OPTIONS = {'argv_emulation': True,
+# Cross-platform applications generally expect sys.argv to
+# be used for opening files. This requires argv_emulation = True
+argv_emulation = True
+# argv_emulation is not supported for 64-bit apps
+if platform.architecture()[0] == '64bit':
+    argv_emulation = False
+
+OPTIONS = {'argv_emulation': False,
            'packages': ['lxml','numpy', 'scipy', 'pytz', 'encodings'],
            'iconfile': ICON,