Removed rst components from merged doc

iden3 · Apr 26, 2019 · c9989f8 · c9989f8
1 parent c7cade1
commit c9989f8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 507 deletions.
diff --git a/config/build_doc.py b/config/build_doc.py
@@ -285,15 +285,16 @@ def read_document(fname):
 
 def merge_documents():
   for doc_idx, doc in enumerate(merged_docs['main']):
-       f = open(iden3_doc_source_folder+"/"+doc,"w")
+       f = open(iden3_doc_tmp_folder+"/"+doc,"w")
        add_heading(merged_docs['title'][doc_idx],1,f)
        if merged_docs['prepend'][doc_idx] is not '':
           f.write("\n")
           f.write(merged_docs['prepend'][doc_idx])
           f.write("\n")
 
        for parts in merged_docs['docs'][doc_idx]:
-          content = read_document(iden3_doc_source_folder+"/"+parts+".rst")
+          content = read_document(iden3_doc_tmp_folder+"/"+parts+".rst")
+          os.remove(iden3_doc_tmp_folder+"/"+parts+".rst")
           f.write("\n")
           f.write(content)
 
@@ -311,6 +312,8 @@ def build_iden3_doc():
 
   build_latex_doc()
 
+  merge_documents()
+
   # Generate .rst list
   rst_files = find_files_bytype("rst", iden3_doc_tmp_folder)
   rst_files = filter_files_blacklist(rst_files)
@@ -319,8 +322,6 @@ def build_iden3_doc():
 
   rst_files = filter_files_docs(rst_files)
 
-  merge_documents()
-
   # Build documentation folder
   build_documentation()
 

diff --git a/config/iden3_docmap.py b/config/iden3_docmap.py
@@ -377,16 +377,16 @@
 
 merged_docs = {
                 'main'  : [
-                            'iden3_repos/iden3js/src/protocols/login_merge.rst',
+                            'iden3js/src/protocols/login_merge.rst',
                           ],
                 'title' : [
                             'Login Protocol'
                           ],
                 'docs' : [
                           [
-                           'iden3_repos/iden3js/src/protocols/login_spec', 
-                           'iden3_repos/iden3js/src/protocols/README',
-                           'iden3_repos/iden3js/src/protocols/login_spec_rationale',
+                           'iden3js/src/protocols/login_spec', 
+                           'iden3js/src/protocols/README',
+                           'iden3js/src/protocols/login_spec_rationale',
                           ],
                          ],
                  'prepend' : [

diff --git a/source/iden3_repos/iden3js.rst b/source/iden3_repos/iden3js.rst
@@ -7,30 +7,3 @@ Iden3js
    :maxdepth: 1
 
    iden3js/README
-
-Other
-#####
-
-.. toctree::
-   :maxdepth: 1
-   :hidden:
-
-   iden3js/src/protocols/login_spec_rationale
-
-Other
-#####
-
-.. toctree::
-   :maxdepth: 1
-   :hidden:
-
-   iden3js/src/protocols/login_spec
-
-Other
-#####
-
-.. toctree::
-   :maxdepth: 1
-   :hidden:
-
-   iden3js/src/protocols/README
diff --git a/source/iden3_repos/iden3js/src/protocols/README.rst b/source/iden3_repos/iden3js/src/protocols/README.rst