Changes in / [3689302:05fb3d6b] in sasview

File:

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

docs/sphinx-docs/build_sphinx.py

@@ -35 +35 @@
 #/sasview-local-trunk/docs/sphinx-docs/build_sphinx.py
 
-SASMODELS_SOURCE_MODELS = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "sasmodels", "models")
-SASMODELS_SOURCE_IMG = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "sasmodels", "models", "img")
-SASMODELS_DEST_MODELS = os.path.join(SASVIEW_SRC, "sas", "models", "media")
+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_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")
 
@@ -79 +79 @@
     _remove_dir(SPHINX_SOURCE_TEST)
 
+
 def retrieve_user_docs():
     """
@@ -114 +115 @@
 #    print os.path.abspath(SASVIEW_TEST)
 #    print os.path.abspath(SPHINX_SOURCE_TEST)
+    print "=== Including Test Data Docs ==="
     if os.path.exists(SASVIEW_TEST):
        print "Found docs folder at ", SASVIEW_TEST
        shutil.copytree(SASVIEW_TEST, SPHINX_SOURCE_TEST)       
-       
+
+    print "=== And the Sasmodels Docs ===" 
     # Make sure we have the relevant images for the new sasmodels documentation
     if os.path.exists(SASMODELS_SOURCE_IMG):
@@ -128 +131 @@
                 shutil.copy(fromhere,tohere)
 
-    # And the relevant .py files with the rst descriptions for the new sasmodels documentation
+    # And the relevant rst descriptions for the new sasmodels documentation
     if os.path.exists(SASMODELS_SOURCE_MODELS):
         print "Found docs folder SASMODELS_SOURCE_MODELS at ", SASMODELS_SOURCE_MODELS
@@ -134 +137 @@
             print "Found docs folder SASMODELS_DEST_MODELS   at ", SASMODELS_DEST_MODELS
             for files in os.listdir(SASMODELS_SOURCE_MODELS):
-                if files.endswith(".py"):
+                if files.endswith(".rst"):
                     fromhere=os.path.join(SASMODELS_SOURCE_MODELS,files)
                     tohere=os.path.join(SASMODELS_DEST_MODELS,files)