diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9675904e6c55ca06b84ca4ae3f1152d19afca813..e58feaa02f6d14d4b67389aea047a395c6b66feb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. +variables: + GIT_SUBMODULE_STRATEGY: recursive + GIT_SUBMODULE_FORCE_HTTPS: "true" + stages: - build diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000000000000000000000000000000000..849a6b35e0d0739ca24f5105e74416c58c95e10e --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "coqdocjs"] + path = coqdocjs + url = https://github.com/coq-community/coqdocjs.git diff --git a/Makefile b/Makefile index 6c5a8111e44cfe5f85c0e0026a8dce3eb5a0b36a..5b62100af8bed4a24c5e8255113b87476a5d4fb2 100644 --- a/Makefile +++ b/Makefile @@ -16,15 +16,11 @@ # Configuration -PROJNAME = CoMoEx COMPONENTS := prop:PropLogic fol:FOL ind:Induction COQDOC_FLAGS = --utf8 -all: coq html - -coq: Makefile.coq - $(MAKE) -f Makefile.coq all +all: coqdoc define GENCoqDoc BEGIN { RS="[[:space:]]"; FS=":" } \ @@ -45,7 +41,7 @@ html: Makefile.coq VFILES="$(shell echo $(COMPONENTS) | awk '$(GENCoqDoc)')" $(MAKE) -e -f Makefile.coq html Makefile.coq: _CoqProject - coq_makefile -f $< -o $@ COQDOCEXTRAFLAGS = "--lib-name $(PROJNAME)" -arg "-async-proofs-cache force" + coq_makefile -f $< -o $@ -arg "-async-proofs-cache force" clean: Makefile.coq $(MAKE) -f $< cleanall @@ -73,4 +69,7 @@ endef _CoqProject: Makefile $(shell echo $(COMPONENTS) | awk '$(GENDirList)') echo $(COMPONENTS) | awk '$(GENCoqPr)' > $@ -.PHONY: all coq html clean +.PHONY: all html clean + +COQMAKEFILE := Makefile # Do not change! +include coqdocjs/Makefile.doc diff --git a/coqdocjs b/coqdocjs new file mode 160000 index 0000000000000000000000000000000000000000..57401849fffb24500c078973a8382dd3086fd2bf --- /dev/null +++ b/coqdocjs @@ -0,0 +1 @@ +Subproject commit 57401849fffb24500c078973a8382dd3086fd2bf