Changeset 3c505e6 in sasmodels

Timestamp:

May 3, 2016 3:38:29 AM (8 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

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:

82c37f5

Parents:

3ecf034 (diff), b1281d8 (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' of ​https://github.com/SasView/sasmodels

Files:

• doc/git_bash.sh (added)
• sasmodels/kerneldll.py (modified) (1 diff)

sasmodels/kerneldll.py

@@ -92 +92 @@
 # Windows-specific solution
 if os.name == 'nt':
-    # Assume the default location of module DLLs is in top level /models dir.
-    # Relying on the Windows installer placing target items in the right place
-    DLL_PATH = os.path.join(os.path.split(os.path.realpath(sys.argv[0]))[0], "models")
+    # Assume the default location of module DLLs is in .sasmodels/compiled_models.
+    DLL_PATH = os.path.join(os.path.expanduser("~"), ".sasmodels", "compiled_models")
+    if not os.path.exists(DLL_PATH):
+        os.makedirs(DLL_PATH)
 else:
     # Set up the default path for compiled modules.