Doc: tune doc deployment

.github/workflows/build.yml

@@ -86,14 +86,7 @@ jobs:
         if: ${{ !matrix.skip-doc && github.event_name == 'push' && github.ref == 'refs/heads/master'}}
         run: |
            opam install odoc
-           opam exec -- dune clean
-           opam exec -- dune build @ocsigen-doc
-           rm -rf doc-dev
-           mkdir doc-dev
-           rsync -av _build/default/_doc/_html/ doc-dev/api
-           rsync -av --exclude=".*" _build/default/manual/ doc-dev/manual
-           find doc-dev/ -name dune -delete
-           find doc-dev/ -name "*.exe" -delete
+           opam exec -- make doc
 
       - name: synchronize doc
         if: ${{ !matrix.skip-doc && github.event_name == 'push' && github.ref == 'refs/heads/master' }}

.gitignore

@@ -45,18 +45,8 @@ benchmarks/build
 benchmarks/results
 benchmarks/config
 
-api/wiki/
-api/html
-manual/files/boulderdash/
-manual/files/cubes/
-manual/files/graph_viewer/
-manual/files/hyperbolic/
-manual/files/minesweeper/
-manual/files/planet/
-manual/files/toplevel/
-manual/files/webgl/
-manual/files/wiki/
-manual/files/wysiwyg/
+doc-dev
+_wikidoc
 
 toplevel/examples/lwt_toplevel_bin/*.cmis.js
 toplevel/examples/lwt_toplevel_bin/test_dynlink.js

HACKING.md

@@ -11,10 +11,8 @@
 
 # Documentation generation
 * make doc
-* git checkout wikidoc && git reset --hard origin/wikidoc && git checkout master
 * make installdoc
 * cd _wikidoc
 * git diff # review diff
-* git commit -am "sync doc" && git push origin wikidoc
-* cd ..
+* git commit -am "sync doc"
 * git push origin wikidoc

Makefile

@@ -7,7 +7,15 @@ tests:
 test runtest runtests: tests
 
 doc:
-	dune build @ocsigen-doc
+	rm -rf doc-dev
+	mkdir doc-dev
+	dune clean
+	dune build @doc --cache=disabled --force
+	rsync -av _build/default/_doc/_html/ doc-dev/api
+	dune build @doc-manual --cache=disabled --force
+	rsync -av --exclude=".*" _build/default/manual/ doc-dev/manual
+	find doc-dev/ -name dune -delete
+	find doc-dev/ -name "*.exe" -delete
 
 promote:
 	dune promote
@@ -20,12 +28,7 @@ clean:
 	dune clean
 
 installdoc:
-	rm -rf _wikidoc
-	git clone ./ _wikidoc
-	(cd _wikidoc && git checkout wikidoc)
-	rm -rf _wikidoc/doc/dev/*
-	cp -r _build/default/_doc/_html _wikidoc/doc/dev/api
-	cp -r _build/default/manual _wikidoc/doc/dev/manual
-	find _wikidoc/doc/dev/ -name dune -delete
+	git worktree add _wikidoc origin/wikidoc
+	rsync -av doc-dev/ _wikidoc/doc/dev/
 
 .PHONY: all tests test runtest runtests doc clean installdoc

api/dune

@@ -1,4 +0,0 @@
-(alias
- (name ocsigen-doc)
- (deps
-  (alias ../doc)))

dune

@@ -12,3 +12,5 @@
     %{dep:tools/version/gen/gen.exe}
     %{dep:VERSION}
     %{dep:tools/version/GIT-VERSION}))))
+
+(data_only_dirs _wikidoc doc-dev)

manual/dune.inc

@@ -1,6 +1,6 @@
 
 (rule
- (alias ocsigen-doc)
+ (alias doc-manual)
  (deps
   ../toplevel/examples/lwt_toplevel/index.html
   ../toplevel/examples/lwt_toplevel/toplevel.js

manual/gen_dune_inc.ml

@@ -48,7 +48,7 @@ let _ =
     Format.std_formatter
     {|
 (rule
- (alias ocsigen-doc)
+ (alias doc-manual)
  (deps@;<0 2>@[<v 0>%a@])
  (action (progn@;<0 2>@[<v 0>%a%a@])))
 |}