Skip to content

Alternative interface for JsooTop. #435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Alternative interface for JsooTop. #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
779f16b
Alternative interface for JsooTop.
hnrgrgr Mar 10, 2016
b20ba29
Use conditional compilation in JsooTop
hnrgrgr Mar 10, 2016
54d7d92
Import asynchronous toplevel in library
hnrgrgr Mar 21, 2016
0d839cb
Import asynchronous-toplevel minimal example
hnrgrgr Mar 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,15 @@
*.map
lib/stubs.c
lib/lib_version.ml
lib/toplevel/jsooTop.ml
lib/toplevel/jsooTopError.ml
lib/META
runtime/runtime.js
toplevel/toplevel.js
toplevel/eval.js
toplevel/toplevel-fs.js
toplevel/toplevel_async.js
toplevel/toplevel_worker.js
toplevel/*.cmis.js
toplevel/server
toplevel/toplevel.ml
Expand Down
4 changes: 3 additions & 1 deletion Makefile.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,7 @@ METAOCAML ?= 0

VERSION_GIT := $(shell git log -n1 --pretty=format:%h 2> /dev/null)

CPPO_OPT=

%.ml: %.cppo.ml
cppo $< -o $@ -V OCAML:`ocamlc -version`
cppo $< -o $@ -V OCAML:`ocamlc -version` ${CPPO_OPT}
4 changes: 2 additions & 2 deletions Makefile.filelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ IMPL += lib/ppx/ppx_deriving_json.cmxs
endif

ifeq "${WITH_TOPLEVEL}" "YES"
IMPL += lib/toplevel/jsooTop.cmo lib/toplevel/jsooTopError.cmo
INTF += lib/toplevel/jsooTop.cmi lib/toplevel/jsooTopError.cmi
IMPL += lib/toplevel/jsooTopPpx.cmo lib/toplevel/jsooTop.cmo lib/toplevel/jsooTopError.cmo lib/toplevel/jsooTopWorker.cmo lib/toplevel/jsooTopAsynchronous.cmo
INTF += lib/toplevel/jsooTopPpx.cmi lib/toplevel/jsooTop.cmi lib/toplevel/jsooTopError.cmi lib/toplevel/jsooTopIntf.cmi lib/toplevel/jsooTopWorkerIntf.cmi lib/toplevel/jsooTopWorker.cmi lib/toplevel/jsooTopAsynchronous.cmi
ifeq ($(shell ocamlc -version | grep -q -E "4.0[^01]"; echo $$?),0)
IMPL += lib/toplevel/jsooTopCamlp4.cmo
endif
Expand Down
30 changes: 25 additions & 5 deletions lib/.depend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,19 +93,39 @@ async/async_js.cmi :
log/lwt_log_js.cmo : js.cmi firebug.cmi log/lwt_log_js.cmi
log/lwt_log_js.cmx : js.cmx firebug.cmx log/lwt_log_js.cmi
log/lwt_log_js.cmi :
toplevel/jsooTop.cmo : sys_js.cmi toplevel/jsooTopError.cmi js.cmi \
toplevel/jsooTop.cmi
toplevel/jsooTop.cmx : sys_js.cmx toplevel/jsooTopError.cmx js.cmx \
toplevel/jsooTop.cmi
toplevel/jsooTop.cmo : sys_js.cmi toplevel/jsooTopPpx.cmi \
toplevel/jsooTopError.cmi js.cmi toplevel/jsooTop.cmi
toplevel/jsooTop.cmx : sys_js.cmx toplevel/jsooTopPpx.cmx \
toplevel/jsooTopError.cmx js.cmx toplevel/jsooTop.cmi
toplevel/jsooTopCamlp4.cmo : toplevel/jsooTopError.cmi \
toplevel/jsooTopCamlp4.cmi
toplevel/jsooTopCamlp4.cmx : toplevel/jsooTopError.cmx \
toplevel/jsooTopCamlp4.cmi
toplevel/jsooTopAsynchronous.cmo : worker.cmi toplevel/jsooTopWorkerIntf.cmi \
toplevel/jsooTop.cmi json.cmi js.cmi firebug.cmi \
toplevel/jsooTopAsynchronous.cmi
toplevel/jsooTopAsynchronous.cmx : worker.cmx toplevel/jsooTopWorkerIntf.cmi \
toplevel/jsooTop.cmx json.cmx js.cmx firebug.cmx \
toplevel/jsooTopAsynchronous.cmi
toplevel/jsooTop.cmi : toplevel/jsooTopIntf.cmi
toplevel/jsooTopAsynchronous.cmi : toplevel/jsooTopIntf.cmi \
toplevel/jsooTop.cmi
toplevel/jsooTopCamlp4.cmi :
toplevel/jsooTopError.cmi :
toplevel/jsooTop.cmi :
toplevel/jsooTopIntf.cmi :
toplevel/jsooTopPpx.cmi :
toplevel/jsooTopWorker.cmi :
toplevel/jsooTopWorkerIntf.cmi : toplevel/jsooTop.cmi js.cmi
toplevel/jsooTopError.cmo : toplevel/jsooTopError.cmi
toplevel/jsooTopError.cmx : toplevel/jsooTopError.cmi
toplevel/jsooTopPpx.cmo : toplevel/jsooTopPpx.cmi
toplevel/jsooTopPpx.cmx : toplevel/jsooTopPpx.cmi
toplevel/jsooTopWorker.cmo : worker.cmi sys_js.cmi \
toplevel/jsooTopWorkerIntf.cmi toplevel/jsooTop.cmi json.cmi \
toplevel/jsooTopWorker.cmi
toplevel/jsooTopWorker.cmx : worker.cmx sys_js.cmx \
toplevel/jsooTopWorkerIntf.cmi toplevel/jsooTop.cmx json.cmx \
toplevel/jsooTopWorker.cmi
graphics/graphics_js.cmo : lwt_js_events.cmi js.cmi dom_html.cmi \
graphics/graphics_js.cmi
graphics/graphics_js.cmx : lwt_js_events.cmx js.cmx dom_html.cmx \
Expand Down
11 changes: 10 additions & 1 deletion lib/META
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,16 @@ package "toplevel" (
exists_if = "jsooTop.cmo"
description = "Js_of_ocaml toplevel library"
version = "[distributed with js_of_ocaml]"
archive(byte) = "jsooTopError.cmo jsooTop.cmo"
archive(byte) = "jsooTopError.cmo jsooTopPpx.cmo jsooTop.cmo"
requires = "bytes,compiler-libs.bytecomp,compiler-libs.common,compiler-libs.toplevel,js_of_ocaml,js_of_ocaml.compiler"
linkopts(javascript) = "+js_of_ocaml/toplevel.js"

package "asynchronous" (
exists_if = "jsooTopAsynchronous.cmo"
description = "Js_of_ocaml asynchronous toplevel library"
version = "[distributed with js_of_ocaml]"
archive(byte) = "jsooTopAsynchronous.cmo"
requires = "lwt,js_of_ocaml"
)

)
21 changes: 16 additions & 5 deletions lib/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,13 @@ ASYNC_CMA=async/async_js.cma
endif

ifeq "${WITH_TOPLEVEL}" "YES"
TOPLEVELLIB= toplevel/jsooTop.cmo toplevel/jsooTopError.cmo
TOPLEVELLIB= toplevel/jsooTopPpx.cmo toplevel/jsooTop.cmo toplevel/jsooTopError.cmo toplevel/jsooTopWorker.cmo toplevel/jsooTopAsynchronous.cmo
ifeq ($(shell ocamlc -version | grep -q -E "4.0[^01]"; echo $$?),0)
TOPLEVELLIB+= toplevel/jsooTopCamlp4.cmo
endif
ifneq ($(shell ocamlc -version | grep -q -E "^(4.00|4.01|4.02.[01])"; echo $$?),0)
CPPO_OPT+= -D WITH_WARNINGS
endif
endif

PA_JS= syntax/pa_js.cmo
Expand Down Expand Up @@ -166,6 +169,14 @@ toplevel/jsooTop.cmo: toplevel/jsooTop.ml syntax/pa_js.cmo ../compiler/lib/compi
-ppopt syntax/pa_js.cmo \
-I toplevel -I ../compiler/lib -I +compiler-libs \
-c $< -o $@
toplevel/jsooTopAsynchronous.cmo: toplevel/jsooTopAsynchronous.ml
$(OCAMLC) -syntax camlp4o \
$(SAFESTRING) -package lwt,lwt.syntax \
-ppopt syntax/pa_js.cmo \
-I toplevel -I ../compiler/lib -I +compiler-libs \
-c $< -o $@
toplevel/jsooTopAsynchronous.cmi: toplevel/jsooTopAsynchronous.mli
$(OCAMLC) $(SAFESTRING) -I toplevel -package lwt -c $< -o $@

toplevel/%.cmo: toplevel/%.ml
$(OCAMLC) $(SAFESTRING) \
Expand Down Expand Up @@ -261,14 +272,14 @@ clean:
rm -f deriving_json/deriving_Json_lexer.ml
rm -f stubs.c
rm -f lib_version.ml
rm -f toplevel/jsooTopError.ml
rm -f $(patsubst %.cppo.ml,%.ml,$(wildcard toplevel/*.cppo.ml))

depend: syntax/pa_js.cmo ${PA_DERIVING} sys_js.ml toplevel/jsooTopError.ml ppx/ppx_js.ml
depend: syntax/pa_js.cmo ${PA_DERIVING} sys_js.ml toplevel/jsooTopPpx.ml toplevel/jsooTop.ml toplevel/jsooTopError.ml ppx/ppx_js.ml
ocamldep -pp "camlp4o syntax/pa_js.cmo" *.ml *.mli > .depend
ocamldep -pp "camlp4o syntax/pa_js.cmo" -I async async/*.ml async/*.mli >> .depend
ocamldep -pp "camlp4o syntax/pa_js.cmo" -I log log/*.ml log/*.mli >> .depend
ocamldep -pp "camlp4o syntax/pa_js.cmo" -I toplevel toplevel/jsooTop.ml toplevel/jsooTopCamlp4.ml toplevel/*.mli >> .depend
ocamldep toplevel/jsooTopError.ml -I toplevel >> .depend
ocamldep -pp "camlp4o syntax/pa_js.cmo" -I toplevel toplevel/jsooTop.ml toplevel/jsooTopCamlp4.ml toplevel/jsooTopAsynchronous.ml toplevel/*.mli >> .depend
ocamldep -I toplevel toplevel/jsooTopError.ml toplevel/jsooTopPpx.ml toplevel/jsooTopWorker.ml >> .depend
ifeq "${WITH_GRAPHICS}" "YES"
ocamldep -pp "camlp4o syntax/pa_js.cmo" graphics/*.ml >> .depend
@# camlp4 3.12.0 fails on (module type of ...)
Expand Down
Loading