Changeset a5da1f2 in sasmodels for sasmodels/generate.py

Timestamp:

May 10, 2016 4:36:09 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

bd4ed1b

Parents:

848193e

Message:

fix path to models in frozen version of application

File:

• sasmodels/generate.py (modified) (1 diff)

sasmodels/generate.py

@@ -224 +224 @@
 Parameter = namedtuple('Parameter', PARAMETER_FIELDS)
 
-SIBLING_DIR = 'sasmodels-data'
-PACKAGE_PATH = abspath(dirname(__file__))
-SIBLING_PATH = abspath(joinpath(PACKAGE_PATH, '..', 'sasmodels-data'))
-DATA_PATH = SIBLING_PATH if isdir(SIBLING_PATH) else PACKAGE_PATH
+def get_data_path(external_dir, target_file):
+    path = abspath(dirname(__file__))
+    if exists(joinpath(path, target_file)):
+        return path
+
+    # check next to exe/zip file
+    exepath = dirname(sys.executable)
+    path = joinpath(exepath, external_dir)
+    if exists(joinpath(path, target_file)):
+        return path
+
+    # check in py2app Contents/Resources
+    path = joinpath(exepath, '..', 'Resources', external_dir)
+    if exists(joinpath(path, target_file)):
+        return abspath(path)
+
+    raise RuntimeError('Could not find '+joinpath(external_dir, target_file))
+
+EXTERNAL_DIR = 'sasmodels-data'
+DATA_PATH = get_data_path(EXTERNAL_DIR, 'kernel_template.c')
 MODEL_PATH = joinpath(DATA_PATH, 'models')
 C_KERNEL_TEMPLATE_FILE = joinpath(DATA_PATH, 'kernel_template.c')