Merge branch '335-disable-js_of_ocaml-by-default' into 'master'

Resolve "Disable js_of_ocaml by default"

Closes #335

See merge request !161

.gitlab-ci.yml

@@ -95,7 +95,7 @@ full-4.07.1:
     DEBIAN_PACKAGES: hevea rubber texlive-latex-extra lmodern texlive-fonts-recommended
     OPAM_PACKAGES: coq-flocq.3.1.0 js_of_ocaml-ppx alt-ergo.2.0.0
   script:
-    - misc/ci-docker.sh misc/ci-local.sh bench ide doc
+    - misc/ci-docker.sh misc/ci-local.sh bench ide doc web_ide
 
 nightly-bench:
   stage: nightly

Makefile.in

@@ -1701,8 +1701,10 @@ src/ide/why3_js.byte: lib/why3/why3.cma src/ide/why3_js.cmo
 src/ide/why3_js.js: src/ide/why3_js.byte
 	js_of_ocaml +nat.js +dynlink.js +toplevel.js $<
 
-opt: bin/why3webserver.opt src/ide/why3_js.js
-byte: bin/why3webserver.byte src/ide/why3_js.js
+web_ide: src/ide/why3_js.js
+
+opt: bin/why3webserver.opt
+byte: bin/why3webserver.byte src/ide/why3_js.cmo
 
 endif
 

misc/ci-local.sh

@@ -19,6 +19,9 @@ do
             bin/why3config --detect
             bench/ide-bench
             ;;
+        web_ide)
+            make web_ide
+            ;;
         doc)
             make doc
             make stdlibdoc