Changeset f620870 in sasview

Timestamp:

Feb 13, 2015 11:50:50 AM (10 years ago)

Author:

Peter Parker

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:

ad8872e, d06ae30, 6a72e1b, 66f21cd

Parents:

f479ac3

Message:

Allow deeply nested media directories to have their paths properly preserved on copy.

File:

• docs/sphinx-docs/build_sphinx.py (modified) (1 diff)

docs/sphinx-docs/build_sphinx.py

@@ -65 +65 @@
             print "Found docs folder at \"%s\"." % docs
 
-            dest_dir_name = os.path.basename(os.path.dirname(docs))
-            dest_dir = os.path.join(SPHINX_SOURCE, "user", dest_dir_name)
+            dest_dir_part = os.path.dirname(os.path.relpath(docs, SASVIEW_SRC))
+            if os.sep in dest_dir_part:
+                dest_dir_part = dest_dir_part[dest_dir_part.index(os.sep) + 1:]
+            dest_dir = os.path.join(SPHINX_SOURCE, "user", dest_dir_part)
 
             copy_tree(docs, dest_dir)