Changeset 70be725 in sasview

Timestamp:

Apr 12, 2016 3:23:39 AM (9 years ago)

Author:

wojciech

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:

5881b17

Parents:

1780d8b

Message:

Build script fixes

Files:

• build_tools/jenkins_osx_build.sh (modified) (1 diff)
• sasview/setup_mac.py (modified) (3 diffs)

build_tools/jenkins_osx_build.sh

@@ -73 +73 @@
 $PYTHON utest_sasview.py
 
-# PYLINT
+## PYLINT
 cd $WORKSPACE
 cd sasview

sasview/setup_mac.py

@@ -20 +20 @@
 import sys
 import platform
+#Extending recursion limit
+sys.setrecursionlimit(10000)
 
 from distutils.util import get_platform
 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)
+#build_path = os.path.join(root, 'build','lib.'+platform)
+build_path = os.path.join(root)
 sys.path.insert(0, build_path)
 
@@ -41 +44 @@
 import sas.sasgui.perspectives.invariant as invariant
 DATA_FILES += invariant.data_files()
-import sas.models as models
+#import sas.models as models
+import sasmodels.models as models
 DATA_FILES += models.data_files()
 import sas.sasgui.guiframe as guiframe
@@ -66 +70 @@
 
 # See if the documentation has been built, and if so include it.
-doc_path = os.path.join(build_path, "doc")
+doc_path = os.path.join(build_path, "docs")
+print doc_path
 if os.path.exists(doc_path):
     for dirpath, dirnames, filenames in os.walk(doc_path):
         for filename in filenames:
-            sub_dir = os.path.join("doc", os.path.relpath(dirpath, doc_path))
+            sub_dir = os.path.join("docs", os.path.relpath(dirpath, doc_path))
             DATA_FILES.append((sub_dir, [os.path.join(dirpath, filename)]))
 else: