Skip to content

Commit 917ec73

Browse files
authored
Merge pull request #1153 from MetaCoq/metarocq-renaming
Coq -> Rocq, MetaCoq -> MetaRocq, TemplateCoq -> TemplateRocq renaming
2 parents 2d0c891 + 9f30a3a commit 917ec73

File tree

718 files changed

+5366
-5281
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

718 files changed

+5366
-5281
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: MetaCoq CI
1+
name: MetaRocq CI
22

33
on:
44
push:
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
matrix:
2626
coq_version:
27-
- '9.0+rc1'
27+
- '9.0'
2828
ocaml_version:
2929
- '4.14-flambda'
3030
# - '4.09-flambda'
@@ -45,33 +45,26 @@ jobs:
4545
- name: Docker-Coq-Action
4646
uses: coq-community/docker-coq-action@v1
4747
with:
48-
coq_version: ${{ 'dev' }}
48+
coq_version: ${{ matrix.coq_version }}
4949
ocaml_version: ${{ matrix.ocaml_version }}
50-
before_script: |
51-
startGroup "Workaround permission issue"
52-
sudo chown -R coq:coq . # <--
53-
opam exec -- ocamlfind list
54-
endGroup
5550
before_install: |
5651
startGroup "Print opam config"
57-
sudo chown -R coq:coq .
5852
opam config list; opam repo list; opam list
59-
opam remove -y rocq-core rocq-runtime rocq-stdlib rocq-prover coq-core coq-stdlib coqide-server coq-stdlib coq
60-
opam pin remove -y rocq-core rocq-runtime rocq-stdlib rocq-prover coq-core coq-stdlib coqide-server coq-stdlib coq
61-
opam pin remove -n dune
62-
opam pin add -y coq 9.0+rc1
63-
opam install -y coq.9.0+rc1
53+
endGroup
54+
startGroup "Workaround permission issue"
55+
sudo chown -R 1000:1000 .
6456
endGroup
6557
script: |
6658
startGroup "Build project"
6759
opam exec -- ./configure.sh --enable-${{matrix.target}}
6860
opam exec -- make -j 2 ci-${{matrix.target}}
6961
endGroup
62+
# Already done by the ci-opam target
7063
uninstall: |
7164
startGroup "Clean project"
7265
endGroup
73-
7466
- name: Revert permissions
7567
# to avoid a warning at cleanup time
7668
if: ${{ always() }}
7769
run: sudo chown -R 1001:116 . # <--
70+

.gitignore

Lines changed: 122 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
metacoq-config
1+
metarocq-config
22
.history
33
docs/_site
44
*.annot
5-
.coq_config
5+
.rocq_config
66
*.cm*
77
*.vo
88
*.vok
99
*.vos
1010
*.v.d
1111
*.glob
12-
Makefile.coq
13-
Makefile.coq.conf
12+
Makefile.rocq
13+
Makefile.rocq.conf
1414
\#*#
1515
*~
1616
.*.aux
@@ -30,75 +30,75 @@ _opam/
3030
erasure/src/*.ml
3131
erasure/src/*.mli
3232

33-
template-coq/Ascii.ml
34-
template-coq/Ascii.mli
35-
template-coq/Ast0.ml
36-
template-coq/Ast0.mli
37-
template-coq/AstUtils.ml
38-
template-coq/AstUtils.mli
39-
template-coq/Basics.ml
40-
template-coq/Basics.mli
41-
template-coq/BinInt.ml
42-
template-coq/BinInt.mli
43-
template-coq/BinNat.ml
44-
template-coq/BinNat.mli
45-
template-coq/BinNums.ml
46-
template-coq/BinNums.mli
47-
template-coq/BinPos.ml
48-
template-coq/BinPos.mli
49-
template-coq/BinPosDef.ml
50-
template-coq/BinPosDef.mli
51-
template-coq/Bool.ml
52-
template-coq/Bool.mli
53-
template-coq/Checker0.ml
54-
template-coq/Checker0.mli
55-
template-coq/config0.ml
56-
template-coq/config0.mli
57-
template-coq/Datatypes.ml
58-
template-coq/Datatypes.mli
59-
template-coq/DecidableType.ml
60-
template-coq/DecidableType.mli
61-
template-coq/Decimal.ml
62-
template-coq/Decimal.mli
63-
template-coq/Equalities.ml
64-
template-coq/Equalities.mli
65-
template-coq/FMapWeakList.ml
66-
template-coq/FMapWeakList.mli
67-
template-coq/FSetWeakList.ml
68-
template-coq/FSetWeakList.mli
69-
template-coq/Induction.ml
70-
template-coq/Induction.mli
71-
template-coq/LiftSubst.ml
72-
template-coq/LiftSubst.mli
73-
template-coq/List0.ml
74-
template-coq/List0.mli
75-
template-coq/Logic.ml
76-
template-coq/Logic.mli
77-
template-coq/MSetWeakList.ml
78-
template-coq/MSetWeakList.mli
79-
template-coq/Makefile.conf
80-
template-coq/Nat0.ml
81-
template-coq/Nat0.mli
82-
template-coq/PeanoNat.ml
83-
template-coq/PeanoNat.mli
84-
template-coq/Specif.ml
85-
template-coq/Specif.mli
86-
template-coq/String0.ml
87-
template-coq/String0.mli
88-
template-coq/Typing0.ml
89-
template-coq/Typing0.mli
90-
template-coq/UnivSubst0.ml
91-
template-coq/UnivSubst0.mli
92-
template-coq/Wf.ml
93-
template-coq/Wf.mli
94-
template-coq/monad_utils.ml
95-
template-coq/monad_utils.mli
96-
template-coq/uGraph0.ml
97-
template-coq/uGraph0.mli
98-
template-coq/universes0.ml
99-
template-coq/universes0.mli
100-
template-coq/utils.ml
101-
template-coq/utils.mli
33+
template-rocq/Ascii.ml
34+
template-rocq/Ascii.mli
35+
template-rocq/Ast0.ml
36+
template-rocq/Ast0.mli
37+
template-rocq/AstUtils.ml
38+
template-rocq/AstUtils.mli
39+
template-rocq/Basics.ml
40+
template-rocq/Basics.mli
41+
template-rocq/BinInt.ml
42+
template-rocq/BinInt.mli
43+
template-rocq/BinNat.ml
44+
template-rocq/BinNat.mli
45+
template-rocq/BinNums.ml
46+
template-rocq/BinNums.mli
47+
template-rocq/BinPos.ml
48+
template-rocq/BinPos.mli
49+
template-rocq/BinPosDef.ml
50+
template-rocq/BinPosDef.mli
51+
template-rocq/Bool.ml
52+
template-rocq/Bool.mli
53+
template-rocq/Checker0.ml
54+
template-rocq/Checker0.mli
55+
template-rocq/config0.ml
56+
template-rocq/config0.mli
57+
template-rocq/Datatypes.ml
58+
template-rocq/Datatypes.mli
59+
template-rocq/DecidableType.ml
60+
template-rocq/DecidableType.mli
61+
template-rocq/Decimal.ml
62+
template-rocq/Decimal.mli
63+
template-rocq/Equalities.ml
64+
template-rocq/Equalities.mli
65+
template-rocq/FMapWeakList.ml
66+
template-rocq/FMapWeakList.mli
67+
template-rocq/FSetWeakList.ml
68+
template-rocq/FSetWeakList.mli
69+
template-rocq/Induction.ml
70+
template-rocq/Induction.mli
71+
template-rocq/LiftSubst.ml
72+
template-rocq/LiftSubst.mli
73+
template-rocq/List0.ml
74+
template-rocq/List0.mli
75+
template-rocq/Logic.ml
76+
template-rocq/Logic.mli
77+
template-rocq/MSetWeakList.ml
78+
template-rocq/MSetWeakList.mli
79+
template-rocq/Makefile.conf
80+
template-rocq/Nat0.ml
81+
template-rocq/Nat0.mli
82+
template-rocq/PeanoNat.ml
83+
template-rocq/PeanoNat.mli
84+
template-rocq/Specif.ml
85+
template-rocq/Specif.mli
86+
template-rocq/String0.ml
87+
template-rocq/String0.mli
88+
template-rocq/Typing0.ml
89+
template-rocq/Typing0.mli
90+
template-rocq/UnivSubst0.ml
91+
template-rocq/UnivSubst0.mli
92+
template-rocq/Wf.ml
93+
template-rocq/Wf.mli
94+
template-rocq/monad_utils.ml
95+
template-rocq/monad_utils.mli
96+
template-rocq/uGraph0.ml
97+
template-rocq/uGraph0.mli
98+
template-rocq/universes0.ml
99+
template-rocq/universes0.mli
100+
template-rocq/utils.ml
101+
template-rocq/utils.mli
102102

103103
checker/src/ascii.ml
104104
checker/src/ascii.mli
@@ -223,9 +223,9 @@ checker/src/wf.mli
223223
/pcuic/src/pCUICNormal.mli
224224
/pcuic/src/pCUICPosition.ml
225225
/pcuic/src/pCUICPosition.mli
226-
/template-coq/theories/*.vio
227-
/template-coq/theories/kernel/*.vio
228-
/template-coq/theories/TemplateMonad/*.vio
226+
/template-rocq/theories/*.vio
227+
/template-rocq/theories/kernel/*.vio
228+
/template-rocq/theories/TemplateMonad/*.vio
229229
/pcuic/src/logic0.mli
230230
/pcuic/src/logic0.ml
231231
/pcuic/src/logic.mli
@@ -234,32 +234,32 @@ checker/src/wf.mli
234234
/pcuic/src/init.ml
235235
/pcuic/src/classes0.mli
236236
/pcuic/src/classes0.ml
237-
/checker/metacoq-config
238-
/template-coq/metacoq-config
239-
/common/metacoq-config
240-
/translations/metacoq-config
241-
/erasure/_CoqProject
237+
/checker/metarocq-config
238+
/template-rocq/metarocq-config
239+
/common/metarocq-config
240+
/translations/metarocq-config
241+
/erasure/_RocqProject
242242
/erasure/_PluginProject
243-
/erasure/metacoq-config
244-
/pcuic/_CoqProject
243+
/erasure/metarocq-config
244+
/pcuic/_RocqProject
245245
/pcuic/_PluginProject
246-
/pcuic/metacoq-config
247-
/checker/_CoqProject
248-
/safechecker/metacoq-config
246+
/pcuic/metarocq-config
247+
/checker/_RocqProject
248+
/safechecker/metarocq-config
249249
/safechecker/_PluginProject
250-
/safechecker/_CoqProject
251-
/template-coq/_CoqProject
252-
/template-coq/_PluginProject
253-
/template-coq/_TemplateCoqProject
254-
/common/_CoqProject
250+
/safechecker/_RocqProject
251+
/template-rocq/_RocqProject
252+
/template-rocq/_PluginProject
253+
/template-rocq/_TemplateRocqProject
254+
/common/_RocqProject
255255
/safechecker/Makefile.safechecker.conf
256256
/safechecker/Makefile.safechecker
257257
/safechecker/Makefile.plugin.conf
258258
/safechecker/Makefile.plugin
259259
/pcuic/src/signature.ml
260260
/pcuic/src/signature.mli
261-
/template-coq/Makefile.template
262-
/template-coq/Makefile.template.conf
261+
/template-rocq/Makefile.template
262+
/template-rocq/Makefile.template.conf
263263
/checker/_PluginProject
264264
/checker/Makefile.plugin.conf
265265
/checker/Makefile.plugin
@@ -287,20 +287,20 @@ pcuic/src/pCUICUtils.mli
287287
/_opam
288288

289289

290-
template-coq/gen-src/cRelationClasses.mli.rej
290+
template-rocq/gen-src/cRelationClasses.mli.rej
291291
.DS_Store
292292

293-
/translations/_CoqProject
293+
/translations/_RocqProject
294294
test-suite/vs.mli
295295
test-suite/vs.ml
296296
test-suite/myMain.mli
297297
test-suite/myMain.ml
298298
test-suite/plugin-demo/Makefile.plugin
299299

300300

301-
template-coq/Makefile.plugin-e
302-
template-coq/Makefile.template-e
303-
template-coq/src/g_template_coq.ml
301+
template-rocq/Makefile.plugin-e
302+
template-rocq/Makefile.template-e
303+
template-rocq/src/g_template_coq.ml
304304
pcuic/Makefile.plugin-e
305305
erasure/Makefile.plugin-e
306306
safechecker/Makefile.plugin-e
@@ -315,12 +315,12 @@ _build/**
315315
extraction/src/*.ml
316316
extraction/src/*.mli
317317
test-suite/plugin-demo/Makefile.plugin
318-
template-coq/gen-src/cRelationClasses.mli.bak
319-
template-coq/gen-src/specFloat.ml.rej
318+
template-rocq/gen-src/cRelationClasses.mli.bak
319+
template-rocq/gen-src/specFloat.ml.rej
320320

321-
bidirectional/CoqMakefile
321+
bidirectional/RocqMakefile
322322

323-
bidirectional/CoqMakefile.conf
323+
bidirectional/RocqMakefile.conf
324324

325325
bidirectional/.vscode/
326326
erasure/src/decidableType.ml
@@ -362,50 +362,54 @@ erasure/src/eEnvMap.mli
362362
erasure/src/eGlobalEnv.mli
363363
erasure/src/eGlobalEnv.ml
364364
Makefile.conf
365-
test-suite/plugin-demo/src/META.coq-metacoq-demo-plugin
366-
pcuic/src/META.coq-metacoq-pcuic
367-
examples/_CoqProject
368-
test-suite/_CoqProject
369-
quotation/metacoq-config
370-
examples/metacoq-config
371-
test-suite/metacoq-config
372-
test-suite/plugin-demo/_CoqProject
365+
test-suite/plugin-demo/src/META.rocq-metarocq-demo-plugin
366+
pcuic/src/META.rocq-metarocq-pcuic
367+
examples/_RocqProject
368+
test-suite/_RocqProject
369+
quotation/metarocq-config
370+
examples/metarocq-config
371+
test-suite/metarocq-config
372+
test-suite/plugin-demo/_RocqProject
373373
test-suite/plugin-demo/_PluginProject
374-
test-suite/plugin-demo/metacoq-config
374+
test-suite/plugin-demo/metarocq-config
375375
erasure/META
376376
safechecker/META
377-
template-coq/META
377+
template-rocq/META
378378

379379

380380
template-pcuic/demo.v
381381
template-pcuic/Makefile.local
382-
template-pcuic/_CoqProject
382+
template-pcuic/_RocqProject
383383
template-pcuic/Makefile.templatepcuic
384384
template-pcuic/Makefile.templatepcuic.conf
385385

386386
quotation/Makefile.local
387-
quotation/_CoqProject
387+
quotation/_RocqProject
388388
quotation/Makefile.quotation
389389
quotation/Makefile.quotation.conf
390390

391-
safechecker-plugin/metacoq-config
391+
safechecker-plugin/metarocq-config
392392
safechecker-plugin/demo.v
393393
safechecker-plugin/Makefile.local
394-
safechecker-plugin/_CoqProject
394+
safechecker-plugin/_RocqProject
395395
safechecker-plugin/_PluginProject
396396
safechecker-plugin/Makefile.safecheckerplugin
397397
safechecker-plugin/Makefile.safecheckerplugin.conf
398398
safechecker-plugin/Makefile.plugin
399399
safechecker-plugin/Makefile.plugin.conf
400400

401-
erasure-plugin/metacoq-config
401+
erasure-plugin/metarocq-config
402402
erasure-plugin/demo.v
403403
erasure-plugin/Makefile.local
404-
erasure-plugin/_CoqProject
404+
erasure-plugin/_RocqProject
405405
erasure-plugin/_PluginProject
406406
erasure-plugin/Makefile.erasureplugin
407407
erasure-plugin/Makefile.erasureplugin.conf
408408
erasure-plugin/Makefile.plugin
409409
erasure-plugin/Makefile.plugin.conf
410410
erasure-plugin/META
411411
safechecker-plugin/META
412+
template-rocq/_TemplateRocqProject
413+
.gitignore
414+
template-rocq/_PluginProject
415+
template-rocq/_RocqProject

0 commit comments

Comments
 (0)