Changeset ed0427a in sasview for docs

Timestamp:

Mar 19, 2016 1:14:40 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

756e8ce

Parents:

8cb0692 (diff), a728658 (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 github.com:sasview/sasview

File:

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

docs/sphinx-docs/build_sphinx.py

@@ -34 +34 @@
 # We are currently here:
 #/sasview-local-trunk/docs/sphinx-docs/build_sphinx.py
-
+SASMODELS_SOURCE_PROLOG = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "doc")
+#SASMODELS_SOURCE_REF_MODELS = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "doc", "ref", "models")
 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_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, "..", "..", "src", "sas", "models", "media")
 SASMODELS_DEST_IMG = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "src", "sas", "models", "media", "img")
 
+#if os.path.exists(SASMODELS_SOURCE_PROLOG):
+#    print "Found models prolog folder at ", SASMODELS_SOURCE_PROLOG
+#if os.path.exists(SASMODELS_SOURCE_REF_MODELS):
+#    print "Found models ref folder at ", SASMODELS_SOURCE_REF_MODELS
 #if os.path.exists(SASMODELS_SOURCE_MODELS):
 #    print "Found models folder at ", SASMODELS_SOURCE_MODELS
 #if os.path.exists(SASMODELS_SOURCE_IMG):
 #    print "Found img folder at ", SASMODELS_SOURCE_IMG
+#if os.path.exists(SASMODELS_DEST_REF_MODELS):
+#    print "Found models ref folder at ", SASMODELS_DEST_REF_MODELS
 #if os.path.exists(SASMODELS_DEST_MODELS):
 #    print "Found models folder at ", SASMODELS_DEST_MODELS
 #if os.path.exists(SASMODELS_DEST_IMG):
 #    print "Found img folder at ", SASMODELS_DEST_IMG
+#sys.exit()
 
 SPHINX_BUILD = os.path.join(CURRENT_SCRIPT_DIR, "build")
@@ -126 +136 @@
         if os.path.exists(SASMODELS_DEST_IMG):
             print "Found img  folder SASMODELS_DEST_IMG      at ", SASMODELS_DEST_IMG
+            print "Copying sasmodels model image files..."
             for files in os.listdir(SASMODELS_SOURCE_IMG):
                 fromhere=os.path.join(SASMODELS_SOURCE_IMG,files)
@@ -131 +142 @@
                 shutil.copy(fromhere,tohere)
 
+    # And the rst prolog with the unit substitutions
+    if os.path.exists(SASMODELS_SOURCE_PROLOG):
+        print "Found prolog folder SASMODELS_SOURCE_PROLOG at ", SASMODELS_SOURCE_PROLOG
+        if os.path.exists(SASMODELS_DEST_PROLOG):
+            print "Found docs folder SASMODELS_DEST_PROLOG   at ", SASMODELS_DEST_PROLOG
+            print "Copying sasmodels rst_prolog file..."
+            for files in os.listdir(SASMODELS_SOURCE_PROLOG):
+                if files.startswith("rst"):
+                    fromhere=os.path.join(SASMODELS_SOURCE_PROLOG,files)
+                    tohere=os.path.join(SASMODELS_DEST_PROLOG,files)
+                    shutil.copy(fromhere,tohere)
+
+    # ACTUALLY IT TURNED OUT WE NEED TO EDIT THE TOCTREES SO THIS COPY WASN'T USEFUL IN THE END!
     # And the relevant rst descriptions for the new sasmodels documentation
+#    if os.path.exists(SASMODELS_SOURCE_REF_MODELS):
+#        print "Found docs folder SASMODELS_SOURCE_REF_MODELS at ", SASMODELS_SOURCE_REF_MODELS
+#        if os.path.exists(SASMODELS_DEST_REF_MODELS):
+#            print "Found docs folder SASMODELS_DEST_REF_MODELS   at ", SASMODELS_DEST_REF_MODELS
+#            print "Copying sasmodels model toctree files..."
+#            for files in os.listdir(SASMODELS_SOURCE_REF_MODELS):
+#                if files.endswith(".rst"):
+#                    fromhere=os.path.join(SASMODELS_SOURCE_REF_MODELS,files)
+#                    tohere=os.path.join(SASMODELS_DEST_REF_MODELS,files)
+#                    shutil.copy(fromhere,tohere)
+
     if os.path.exists(SASMODELS_SOURCE_MODELS):
         print "Found docs folder SASMODELS_SOURCE_MODELS at ", SASMODELS_SOURCE_MODELS
         if os.path.exists(SASMODELS_DEST_MODELS):
             print "Found docs folder SASMODELS_DEST_MODELS   at ", SASMODELS_DEST_MODELS
+            print "Copying sasmodels model files..."
             for files in os.listdir(SASMODELS_SOURCE_MODELS):
                 if files.endswith(".rst"):