Changeset 3aa2f3c in sasview

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:

74d9780

Parents:

80c2c85

Message:

working mac build with revised tree

Files:

• sasview/setup_exe.py (modified) (4 diffs)
• sasview/setup_mac.py (modified) (3 diffs)
• src/sas/sasgui/__init__.py (modified) (1 diff)

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])
+doc_path = os.path.join(root, 'build', 'lib.'+platform, 'doc')
 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
@@ -177 +177 @@
 matplotlibdata = findall(matplotlibdatadir)
 
-site_loc = get_python_lib()
-opencl_include_dir = os.path.join(site_loc, "pyopencl", "cl")
-
 DATA_FILES = []
 
@@ -243 +240 @@
 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")
@@ -260 +256 @@
 # Copying the sample data user data
 for f in findall(test_1d_dir):
-    DATA_FILES.append(("test\\1d_data", [f]))
+    DATA_FILES.append((os.path.join("test","1d_data"), [f]))
 
 # Copying the sample data user data
 for f in findall(test_2d_dir):
-    DATA_FILES.append(("test\\2d_data", [f]))
+    DATA_FILES.append((os.path.join("test","2d_data"), [f]))
 
 # Copying the sample data user data
 for f in findall(test_save_dir):
-    DATA_FILES.append(("test\\save_states", [f]))
+    DATA_FILES.append((os.path.join("test","save_states"), [f]))
 
 # Copying the sample data user data
 for f in findall(test_upcoming_dir):
-    DATA_FILES.append(("test\\upcoming_formats", [f]))
+    DATA_FILES.append((os.path.join("test","upcoming_formats"), [f]))
 
 # Copying opencl include files
+site_loc = get_python_lib()
+opencl_include_dir = os.path.join(site_loc, "pyopencl", "cl")
 for f in findall(opencl_include_dir):
-    DATA_FILES.append(("includes\\pyopencl", [f]))
+    DATA_FILES.append((os.path.join("includes","pyopencl"), [f]))
 
 # See if the documentation has been built, and if so include it.

sasview/setup_mac.py

@@ -14 +14 @@
 import os
 import string
-import pytz
 import sys
-import platform
 #Extending recursion limit
 sys.setrecursionlimit(10000)
 
+import macholib_patch
+
 from distutils.util import get_platform
+from distutils.filelist import findall
+from distutils.sysconfig import get_python_lib
 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)
-sys.path.insert(0, build_path)
-print "BUILDING PATH INSIDE", build_path
+doc_path = os.path.join(root, 'build', 'lib.'+platform, 'doc')
+env = os.path.join(root, 'sasview-install', 'lib', 'python2.7', 'site-packages')
+#sys.path.insert(0, env)
+
+print "BUILDING PATH INSIDE", env
 
 from sas.sasview import local_config
 
 ICON = local_config.SetupIconFile_mac
-EXTENSIONS_LIST = []
 RESOURCES_FILES = []
 DATA_FILES = []
@@ -71 +74 @@
 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")
@@ -88 +90 @@
 # Copying the sample data user data
 for f in findall(test_1d_dir):
-    DATA_FILES.append(("test\\1d_data", [f]))
+    DATA_FILES.append((os.path.join("test","1d_data"), [f]))
 
 # Copying the sample data user data
 for f in findall(test_2d_dir):
-    DATA_FILES.append(("test\\2d_data", [f]))
+    DATA_FILES.append((os.path.join("test","2d_data"), [f]))
 
 # Copying the sample data user data
 for f in findall(test_save_dir):
-    DATA_FILES.append(("test\\save_states", [f]))
+    DATA_FILES.append((os.path.join("test","save_states"), [f]))
 
 # Copying the sample data user data
 for f in findall(test_upcoming_dir):
-    DATA_FILES.append(("test\\upcoming_formats", [f]))
+    DATA_FILES.append((os.path.join("test","upcoming_formats"), [f]))
 
 # Copying opencl include files
+site_loc = get_python_lib()
+opencl_include_dir = os.path.join(site_loc, "pyopencl", "cl")
 for f in findall(opencl_include_dir):
-    DATA_FILES.append(("includes\\pyopencl", [f]))
+    DATA_FILES.append((os.path.join("includes","pyopencl"), [f]))
 
 # 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):

src/sas/sasgui/__init__.py

@@ +1 @@
+import sys
 import os
+from os.path import exists, expanduser, dirname, realpath, join as joinpath
+
+def dirn(path, n):
+    path = realpath(path)
+    for _ in range(n):
+        path = dirname(path)
+    return path
 
 # Set up config directories
 def make_user_folder():
-    path = os.path.join(os.path.expanduser("~"),'.sasview')
-    if not os.path.exists(path):
+    path = joinpath(expanduser("~"),'.sasview')
+    if not exists(path):
         os.mkdir(path)
     return path
 
+
 def find_app_folder():
-    # If the directory containing sasview.py exists, then we are not running
-    # frozen and the current path is the app path.
-    root = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-    path = os.path.join(root, 'sasview')
-    if os.path.exists(path):
+    # We are starting out with the following info:
+    #     __file__ = .../sas/sasgui/__init__.pyc
+    # Check if the sister path .../sas/sasview exists, and use it as the
+    # app directory.  This will only be the case if the app is not frozen.
+    path = joinpath(dirn(__file__, 2), 'sasview')
+    if exists(path):
         return path
 
-    # If we are running frozen, then skip from:
-    #    library.zip/sas/sasview
-    path = os.path.dirname(os.path.dirname(root))
+    # If we are running frozen, then root is a parent directory
+    if sys.platform == 'darwin':
+        # Here is the path to the file on the mac:
+        #     .../Sasview.app/Contents/Resources/lib/python2.7/site-packages.zip/sas/sasgui/__init__.pyc
+        # We want the path to the Resources directory.
+        path = dirn(__file__, 6)
+    elif os.name == 'nt':
+        # Here is the path to the file on windows:
+        #     ../Sasview/library.zip/sas/sasgui/__init__.pyc
+        # We want the path to the Sasview directory.
+        path = dirn(__file__, 4)
+    else:
+        raise RuntimeError("Couldn't find the app directory")
     return path