Skip to content

Commit c1844a3

Browse files
committed
[build] Update submodules to latest upstream
1 parent 7d6adcf commit c1844a3

File tree

5 files changed

+20
-6
lines changed

5 files changed

+20
-6
lines changed

Makefile

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ rocq/config/coq_config.ml: rocq
1515
-libdir "$$EPATH/_build/install/default/lib/coq" \
1616
-bytecode-compiler yes \
1717
-native-compiler no \
18-
&& cp theories/dune.disabled theories/dune \
19-
&& cp user-contrib/Ltac2/dune.disabled user-contrib/Ltac2/dune
18+
&& cp theories/Corelib/dune.disabled theories/Corelib/dune \
19+
&& cp theories/Ltac2/dune.disabled theories/Ltac2/dune
2020

2121
# We set windows parameters a bit better, note the need to use forward
2222
# slashed (cygpath -m) due to escaping :( , a conversion to `-w` is
@@ -50,3 +50,17 @@ launch: build
5050
opam-deps:
5151
opam install ./rocq/rocq-runtime.opam -y --deps-only --with-test
5252
opam install ./coq-lsp/coq-lsp.opam -y --deps-only --with-test
53+
54+
# Initialise submodules
55+
.PHONY: submodules-init
56+
submodules-init:
57+
git submodule update --init
58+
59+
# Update submodules from upstream
60+
.PHONY: submodules-update
61+
submodules-update:
62+
(cd rocq && git checkout master && git pull origin master)
63+
(cd stdlib && git checkout master && git pull origin master)
64+
(cd coq-lsp && git checkout main && git pull origin main)
65+
(cd coq-waterproof && git checkout coq-master && git pull origin coq-master)
66+
(cd waterproof-exercises && git checkout main && git pull origin main)

coq-lsp

rocq

Submodule rocq updated 671 files

stdlib

Submodule stdlib updated 104 files

0 commit comments

Comments
 (0)