Changeset 6c7e4cc1 in sasview

Timestamp:

Apr 10, 2017 9:21:16 AM (7 years ago)

Author:

ajj

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

f4d571b

Parents:

115eb7e

Message:

Updating setup.py to call sasmodels doc build

File:

• setup.py (modified) (2 diffs)

setup.py

@@ -5 +5 @@
 import sys
 import os
+import subprocess
 import shutil
 from setuptools import setup, Extension
@@ -157 +158 @@
         ### AJJ - Add code for building sasmodels docs here:
         # check for doc path
-        SASMODELS_PATH = '../sasmodels'
-        if os.path.exists(SASMODELS_PATH):
-            if os.path.isdir(SASMODELS_PATH):
+        SASMODELS_DOCPATH = os.path.abspath(os.path.join(os.getcwd(),'..','sasmodels','doc'))
+        print "========= check for sasmodels at "+SASMODELS_DOCPATH+"============"
+        if os.path.exists(SASMODELS_DOCPATH):
+            if os.path.isdir(SASMODELS_DOCPATH):
                 # if available, build sasmodels docs
-            else:
-                # if not available warning message
-                print "WARNING!! sasmodels directory not found. Cannot build model docs."
+                print "============= Building sasmodels model documentation ==============="
+                smdocbuild = subprocess.call(["make","-C",SASMODELS_DOCPATH,"html"])
+        else:
+            # if not available warning message
+            print " == !!WARNING!! sasmodels directory not found. Cannot build model docs. =="
 
         #Now build sasview (+sasmodels) docs