Changeset 5420ef6 in sasview

Timestamp:

Mar 21, 2016 2:03:30 PM (9 years ago)

Author:

smk78

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:

5a71761

Parents:

9274711

Message:

Fix to docs build errors resulting from reorganisation of image file
locations

File:

• docs/sphinx-docs/build_sphinx.py (modified) (4 diffs)

docs/sphinx-docs/build_sphinx.py

@@ -38 +38 @@
 SASMODELS_SOURCE_MODELS = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "doc", "model")
 SASMODELS_SOURCE_IMG = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "doc", "model", "img")
+SASMODELS_SOURCE_AUTOIMG = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "doc", "_build", "html","_images")
 SASMODELS_DEST_PROLOG = os.path.join(CURRENT_SCRIPT_DIR, "source")
 SASMODELS_DEST_REF_MODELS = os.path.join(CURRENT_SCRIPT_DIR, "source", "user")
 SASMODELS_DEST_MODELS = os.path.join(CURRENT_SCRIPT_DIR, "source", "user", "models")
 SASMODELS_DEST_IMG = os.path.join(CURRENT_SCRIPT_DIR,  "source", "user", "model-imgs", "new-models")
+SASMODELS_DEST_BUILDIMG = os.path.join(CURRENT_SCRIPT_DIR,  "source", "user", "models", "img")
 
 #if os.path.exists(SASMODELS_SOURCE_PROLOG):
@@ -145 +147 @@
     print "=== And the Sasmodels Docs ===" 
     # Make sure we have the relevant images for the new sasmodels documentation
+    # First(!) we'll make a local reference copy for SasView (/new-models will be cleaned each build)
     if os.path.exists(SASMODELS_SOURCE_IMG):
         print "Found img  folder SASMODELS_SOURCE_IMG    at ", SASMODELS_SOURCE_IMG
@@ -155 +158 @@
                 shutil.copy(fromhere,tohere)
 
+    if os.path.exists(SASMODELS_SOURCE_AUTOIMG):
+        print "Found img  folder SASMODELS_SOURCE_AUTOIMG    at ", SASMODELS_SOURCE_AUTOIMG
+        if os.path.exists(SASMODELS_DEST_IMG):
+            print "Copying sasmodels model auto-generated image files..."
+            for files in os.listdir(SASMODELS_SOURCE_AUTOIMG):
+                fromhere=os.path.join(SASMODELS_SOURCE_AUTOIMG,files)
+                tohere=os.path.join(SASMODELS_DEST_IMG,files)
+                shutil.copy(fromhere,tohere)
+    
     # And the rst prolog with the unit substitutions
     if os.path.exists(SASMODELS_SOURCE_PROLOG):
@@ -203 +215 @@
                     tohere=os.path.join(SASMODELS_DEST_MODELS,files)
                     shutil.copy(fromhere,tohere)
+        else:
+            print "Missing docs folder SASMODELS_DEST_MODELS at ", SASMODELS_DEST_MODELS
+            os.makedirs(SASMODELS_DEST_MODELS)
+            if not os.path.exists(SASMODELS_DEST_BUILDIMG):
+                os.makedirs(SASMODELS_DEST_BUILDIMG)
+            print "Created docs folder SASMODELS_DEST_MODELS at ", SASMODELS_DEST_MODELS
+            print "Copying model files for build..."
+            for files in os.listdir(SASMODELS_SOURCE_MODELS):
+                if files.endswith(".rst"):
+                    fromhere=os.path.join(SASMODELS_SOURCE_MODELS,files)
+                    tohere=os.path.join(SASMODELS_DEST_MODELS,files)
+                    shutil.copy(fromhere,tohere)
+            # No choice but to do this because model files are all coded for images in /models/img
+            print "Copying image files for build..."
+            for files in os.listdir(SASMODELS_DEST_IMG):
+                fromhere=os.path.join(SASMODELS_DEST_IMG,files)
+                tohere=os.path.join(SASMODELS_DEST_BUILDIMG,files)
+                shutil.copy(fromhere,tohere)