Merge pull request #99 from AestheticIntegration/ewen/updateDocMake

Ewen/update doc make
imandra-ai · Oct 18, 2018 · ffa9123 · ffa9123
2 parents 95d01e3 + 67b669d
commit ffa9123
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/INSTALL.md b/INSTALL.md
@@ -34,15 +34,15 @@ To update the documentation in the `gh-pages` branch, you can do the following:
 - stash the changes in the `doc` folder
 
 ```
-git add doc/*
+git add _pages/doc/*
 git stash
 ```
 
 - checkout gh-pages and apply the stash    
 
 ```
-git checkout gh-pages 
-git checkout stash -- doc
+git checkout gh-pages-src
+git checkout stash -- _pages
 git commit -m "Update documentation"
-git push origin gh-pages
+git push origin gh-pages-src
 ```
diff --git a/Makefile b/Makefile
@@ -24,6 +24,10 @@ doc:
 	@echo "src-protocol-exts-pp-vg" > dune-ignore 
 	@echo "src-protocol-exts-vg" >> dune-ignore 
 	dune build @doc
+	mkdir -p _pages/doc
+	cp -r _build/default/_doc/_html/* _pages/doc/
+	rm -rf _pages/doc/odoc.css
+	sed -i '' -e 's/<body>/<body><nav><\/nav>/g' _pages/doc/index.html
 	rm dune-ignore
 
 module_graph.svg: _build/doc/all_modules.docdir/all_modules.dot
@@ -58,7 +62,7 @@ _opam:
 	opam install -y ocaml-base-compiler.4.05.0
 
 clean:
-	duneer clean
+	dune clean
 
 .PHONY: build build_vgs run run_server clean doc
 
diff --git a/src-protocol-exts-pp-vg/dune b/src-protocol-exts-pp-vg/dune
@@ -2,5 +2,5 @@
   (name        protocol_exts_pp_vg)
   (public_name protocol_exts_pp_vg)
   (wrapped  false)
-  (libraries yojson core_pp core_time_defaults_pp protocol_exts_vg)
+  (libraries core_time_defaults yojson core_pp core_time_defaults_pp protocol_exts_vg)
 )
diff --git a/src-protocol-pp/dune b/src-protocol-pp/dune
@@ -2,5 +2,5 @@
   (name        protocol_pp)
   (public_name protocol_pp)
   (wrapped  false)
-  (libraries yojson protocol_exts_pp protocol fix_engine core_utils)
+  (libraries core_time_defaults_pp yojson protocol_exts_pp protocol fix_engine core_utils)
 )
diff --git a/src-protocol/dune b/src-protocol/dune
@@ -2,5 +2,5 @@
   (name        protocol)
   (public_name protocol)
   (wrapped  false)
-  (libraries protocol_exts)
+  (libraries core_time_defaults protocol_exts)
 )
diff --git a/src-simulation/dune b/src-simulation/dune
@@ -9,6 +9,7 @@
         fix_engine
         core_pp
         core_time_defaults
+        core_time_defaults_pp
         protocol_pp
         conversions    
   )