Skip to content

Commit

Permalink
Merge pull request #362 from ejgallego/jsrem
Browse files Browse the repository at this point in the history
[general] Cleanup old unused code.
  • Loading branch information
ejgallego authored Sep 29, 2023
2 parents 48e6e3c + 233e800 commit 5069eb5
Show file tree
Hide file tree
Showing 33 changed files with 24 additions and 1,314 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ jobs:
test-target: [test]
extra-opam: [coq.dev coq-mathcomp-ssreflect.1.dev]
include:
- ocaml-compiler: ocaml-variants.4.12.1+options,ocaml-option-32bit
test-target: js-dune
extra-opam: coq.dev js_of_ocaml js_of_ocaml-lwt zarith_stubs_js
- ocaml-compiler: 4.13.1
test-target: test
extra-opam:
Expand Down Expand Up @@ -105,7 +102,7 @@ jobs:
git clone --depth=3 -b mathcomp-1 https://github.com/math-comp/math-comp.git
make -C math-comp/mathcomp/ssreflect
make -C math-comp/mathcomp/ssreflect install
- name: Extra OPAM Setup (Coq, js_of_ocaml)
- name: Extra OPAM Setup (Coq.dev, misc extra tools)
if: ${{ matrix.extra-opam != '' }}
run: |
eval $(opam env)
Expand All @@ -115,4 +112,3 @@ jobs:
eval $(opam env)
make -j "$NJOBS" SERAPI_COQ_HOME="$SERAPI_COQ_HOME" "${{ matrix.test-target }}"
ls -lR _build/install/default/ || true
ls -lR _build/default/sertop/*.js || true
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## unreleased

- [general] Cleanup old / unused code (@ejgallego, #)

## Version 0.18.1:

- [serlib] Fix a few 8.18 piercings (!) (@ejgallego, #357)
Expand Down
36 changes: 0 additions & 36 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,42 +40,6 @@ browser:
sertop: build
dune exec -- rlwrap sertop

#####################################################
# Javascript support

#####################################################
# JS

JSDIR=jscoq/coq-libjs
JSFILES=$(addprefix $(JSDIR)/,mutex.js unix.js str.js coq_vm.js)

JSCOQ_DEBUG=no
JSOO_OPTS=
ifeq "${JSCOQ_DEBUG}" "yes"
JSOO_OPTS+= --pretty --noinline --disable shortvar --debug-info
endif

js:
mkdir -p js

force:

_build/default/sertop/sertop_js.bc: force
dune build --profile=release sertop/sertop_js.bc

js/sertop_js.js: js _build/default/sertop/sertop_js.bc
js_of_ocaml --dynlink +nat.js +dynlink.js +toplevel.js $(JSOO_OPTS) $(JSFILES) _build/default/sertop/sertop_js.bc -o js/sertop_js.js

# We cannot use the separate compilation mode due to Coq's VM: libcoqrun.a
js-dune:
dune build --profile=release sertop/sertop_js.bc.js

js-dist:
rsync -avp --exclude=.git --delete ~/research/jscoq/coq-pkgs/ js/coq-pkgs

js-release:
rsync -avp --exclude=*~ --exclude=.git --exclude=README.md --exclude=get-hashes.sh --delete js/ ~/research/jscoq-builds

#####################################################
# Misc

Expand Down
5 changes: 0 additions & 5 deletions extcoq/dune

This file was deleted.

23 changes: 0 additions & 23 deletions extcoq/extcoq.ml

This file was deleted.

17 changes: 0 additions & 17 deletions extcoq/extcoq.mli

This file was deleted.

5 changes: 0 additions & 5 deletions js/bootstrap.min.css

This file was deleted.

7 changes: 0 additions & 7 deletions js/bootstrap.min.js

This file was deleted.

1 change: 0 additions & 1 deletion js/index.html

This file was deleted.

4 changes: 0 additions & 4 deletions js/term-js/jquery-1.7.1.min.js

This file was deleted.

2 changes: 0 additions & 2 deletions js/term-js/jquery.mousewheel-min.js

This file was deleted.

16 changes: 0 additions & 16 deletions js/term-js/jquery.terminal-0.10.12.min.css

This file was deleted.

37 changes: 0 additions & 37 deletions js/term-js/jquery.terminal-0.10.12.min.js

This file was deleted.

55 changes: 0 additions & 55 deletions js/term.html

This file was deleted.

7 changes: 0 additions & 7 deletions jscoq/coq-js/dune

This file was deleted.

45 changes: 0 additions & 45 deletions jscoq/coq-js/jslib.ml

This file was deleted.

41 changes: 0 additions & 41 deletions jscoq/coq-js/jslib.mli

This file was deleted.

Loading

0 comments on commit 5069eb5

Please sign in to comment.