Skip to content
Browse files

[enhance] all: wip compilation

  • Loading branch information...
1 parent 3041e7d commit d863cc77d68d45c7313fea811eb261b9a96c8f81 @Aqua-Ye Aqua-Ye committed Jul 2, 2012
Showing with 403 additions and 391 deletions.
  1. +19 −20 Makefile
  2. +24 −19 _tags
  3. +41 −39 build_libs
  4. +107 −110 build_rules.ml
  5. +70 −71 build_tools
  6. 0 { → compiler}/opa-compile-libs.itarget
  7. +4 −0 compiler/opa-run-js-libs.itarget
  8. 0 { → compiler}/opa-run-libs.itarget
  9. +2 −1 compiler/opalib/opaEnv.ml
  10. +0 −1 compiler/teerex/default.trx
  11. +2 −2 config.mli
  12. +2 −3 configure
  13. +0 −95 database.mllibp
  14. 0 { → doc}/copyright/01_ocaml
  15. 0 { → doc}/copyright/02_cryptokit
  16. 0 { → doc}/copyright/03_ocamlgraph
  17. 0 { → doc}/copyright/04_jsmin
  18. 0 { → doc}/copyright/05_jquery
  19. 0 { → doc}/copyright/06_ulex
  20. 0 { → doc}/copyright/07_xmlm
  21. 0 { → doc}/copyright/08_libnatpmp
  22. 0 { → doc}/copyright/09_miniupnpc
  23. 0 { → doc}/copyright/10_iconv-ocaml
  24. 0 { → doc}/copyright/11_node
  25. 0 { → doc}/copyright/copyright
  26. 0 {compiler → lib}/opabsl_for_compiler.mllib
  27. 0 {compiler → lib}/opabsl_for_interpreter.mllib
  28. 0 {compiler → lib}/opabsl_for_server.mllib
  29. +1 −1 lib/stdlib/all_plugins.sh
  30. 0 {compiler → ocamllib}/appruntime.mllib
  31. +95 −0 ocamllib/database.mllibp
  32. 0 {compiler → ocamllib}/libbase.mllib
  33. 0 {compiler → ocamllib}/libirc.mllib
  34. 0 {compiler → ocamllib}/libnet.mllib
  35. 0 {compiler → ocamllib}/libruntime.mllib
  36. 0 {compiler → ocamllib}/libsecurity.mllib
  37. 0 {compiler → ocamllib}/libsession.mllib
  38. 0 {compiler → ocamllib}/libtools.mllib
  39. 0 { → ocamllib}/ocamlbase.mltop
  40. 0 {compiler → ocamllib}/oparuntime.mllib
  41. +0 −4 opa-run-js-libs.itarget
  42. +5 −1 tools/_tags
  43. +5 −3 tools/build/Makefile.bld
  44. +6 −5 tools/build/README
  45. +1 −1 tools/build/bld.sh
  46. +2 −2 tools/build/gen_myocamlbuild.sh
  47. +3 −2 tools/build/myocamlbuild_prefix.ml
  48. +3 −3 tools/build/myocamlbuild_suffix.ml
  49. +1 −1 tools/install_release.sh
  50. +2 −1 tools/installer/Mac/Scripts/postinstall
  51. +2 −1 tools/installer/Mac/Scripts/postupgrade
  52. +5 −5 tools/manpages/Makefile
  53. 0 {compiler → tools}/teerex/_tags
  54. 0 {compiler/teerex/java → tools/teerex/certified}/_tags
  55. 0 {compiler → tools}/teerex/certified/trx2cert.ml
  56. +1 −0 tools/teerex/default.trx
  57. 0 {compiler/teerex/certified → tools/teerex/java}/_tags
  58. 0 {compiler → tools}/teerex/java/bench.sh
  59. 0 {compiler → tools}/teerex/java/java.mouse
  60. 0 {compiler → tools}/teerex/java/java.trx
  61. 0 {compiler → tools}/teerex/java/java_parser.ml
  62. 0 {compiler → tools}/teerex/mouse/_tags
  63. 0 {compiler → tools}/teerex/mouse/grammar.mouse
  64. 0 {compiler → tools}/teerex/mouse/mouse.trx
  65. 0 {compiler → tools}/teerex/mouse/mouse2trx.ml
  66. 0 {compiler → tools}/teerex/mouse/mouseAst.ml
  67. 0 {compiler → tools}/teerex/prx.ml
  68. 0 {compiler → tools}/teerex/prxparse.ml.cache
  69. 0 {compiler → tools}/teerex/prxparse.trx
  70. 0 {compiler → tools}/teerex/tokenizer.ml.cache
  71. 0 {compiler → tools}/teerex/tokenizer.mli.cache
  72. 0 {compiler → tools}/teerex/tokenizer.trx
  73. 0 {compiler → tools}/teerex/trx_benchmarking.ods
  74. 0 {compiler → tools}/teerex/trx_error_msg.txt
  75. 0 {compiler → tools}/teerex/trx_interpreter.ml
  76. 0 {compiler → tools}/teerex/trx_ocaml.ml
  77. 0 tools/{ → utils}/ocamldoc_plugin.ml
  78. 0 tools/{ → utils}/ppdebug-opa.pl
  79. 0 tools/{ → utils}/ppdebug.pl
View
39 Makefile
@@ -1,15 +1,18 @@
-#!/usr/bin/make
+#!/usr/bin/env make
# [ Warning ] don't use make to solve dependencies !!
#
# we rely on ocamlbuild which already handles them ; every rule should
# call it only once (no recursion)
#
-# More info in build/Makefile.bld
+# More info in tools/build/Makefile.bld
+
+.PHONY: default
+default: all
# Makefile inclusions
include config.make
-include build/Makefile.bld
+include tools/build/Makefile.bld
MAKE ?= $_
@@ -18,12 +21,9 @@ OPAOPT += "--rebuild"
endif
ifneq ($(HAS_CAMLIDL)$(HAS_LIBNATPMP)$(HAS_MINIUPNPC),111)
-export DISABLED_LIBS = libnattraversal
+DISABLED_LIBS = libnattraversal
endif
-.PHONY: default
-default: all
-
export
##
@@ -48,13 +48,12 @@ runtime-libs: $(MYOCAMLBUILD)
$(BUILD_DIR)/bin/opa: $(MYOCAMLBUILD)
$(OCAMLBUILD) opa-both-packages.stamp $(target-tool-opa-bin)
@$(copy-tool-opa-bin)
- @utils/install.sh --quiet --dir $(realpath $(BUILD_DIR)) --ocaml-prefix $(OCAMLLIB)/../..
+ @tools/install.sh --quiet --dir $(realpath $(BUILD_DIR)) --ocaml-prefix $(OCAMLLIB)/../..
.PHONY: opa
opa: $(BUILD_DIR)/bin/opa
-.PHONY: opa-flat-packages
-.PHONY: opa-node-packages
+.PHONY: opa-flat-packages opa-node-packages opa-both-packages
opa-flat-packages: $(MYOCAMLBUILD)
$(OCAMLBUILD) opa-packages.stamp
opa-node-packages: $(MYOCAMLBUILD)
@@ -80,7 +79,7 @@ distrib: $(MYOCAMLBUILD)
.PHONY: manpages
manpages: $(MYOCAMLBUILD)
ifndef NO_MANPAGES
- $(MAKE) -C manpages OCAMLBUILD="$(OCAMLBUILD)" BLDDIR=../$(BUILD_DIR)
+ $(MAKE) -C tools/manpages OCAMLBUILD="$(OCAMLBUILD)" BLDDIR=../../$(BUILD_DIR)
else
@echo "Not building manpages"
endif
@@ -137,9 +136,9 @@ define install-plugin
endef
-
-OPA_PACKAGES := $(shell cd stdlib && ./all_packages.sh)
-OPA_PLUGINS := $(shell cd stdlib && ./all_plugins.sh)
+# List all packages and plugins in stdlib
+OPA_PACKAGES := $(shell cd lib/stdlib && ./all_packages.sh)
+OPA_PLUGINS := $(shell cd lib/stdlib && ./all_plugins.sh)
# Rules installing everything that has been compiled
#
@@ -192,7 +191,7 @@ install-bin:
@printf "Installing into $(INSTALL_DIR)/bin\r"
@mkdir -p $(INSTALL_DIR)/bin
@$(if $(wildcard $(BUILD_DIR)/bin/*),$(INSTALL) -r $(BUILD_DIR)/bin/* $(INSTALL_DIR)/bin)
- @utils/install.sh --quiet --dir $(INSTALL_DIR) --ocamllib $(OCAMLLIB) --ocamlopt $(OCAMLOPT)
+ @tools/install.sh --quiet --dir $(INSTALL_DIR) --ocamllib $(OCAMLLIB) --ocamlopt $(OCAMLOPT)
@printf "Installation to $(INSTALL_DIR)/bin done.\n"
install-lib:
@@ -229,7 +228,7 @@ uninstall:
rm -rf $(INSTALL_DIR)/share/doc/opa
@[ ! -d $(INSTALL_DIR)/share ] || [ -n "`ls -A $(INSTALL_DIR)/share`" ] || rmdir $(INSTALL_DIR)/share
$(foreach file,$(wildcard $(BUILD_DIR)/bin/*),rm -f $(INSTALL_DIR)/bin/$(notdir $(file));)
- @utils/install.sh --uninstall --dir $(INSTALL_DIR)
+ @tools/install.sh --uninstall --dir $(INSTALL_DIR)
@[ ! -d $(INSTALL_DIR)/bin ] || [ -n "`ls -A $(INSTALL_DIR)/bin`" ] || rmdir $(INSTALL_DIR)/bin
@printf "Uninstall done.\n"
@@ -258,11 +257,11 @@ install-qmlflat: # depends on opabsl_for_compiler, but we don't want to run ocam
>> $(INSTALL_DIR)/bin/qmlflat
# installs some dev tools on top of the normal install; these should not change often
-install-all: install install-bld install-qmlflat utils/maxmem
+install-all: install install-bld install-qmlflat tools/maxmem
@$(INSTALL) platform_helper.sh $(INSTALL_DIR)/bin/
- @$(INSTALL) utils/maxmem $(INSTALL_DIR)/bin/
- @rm utils/maxmem
- @$(INSTALL) utils/plotmem $(INSTALL_DIR)/bin/
+ @$(INSTALL) tools/maxmem $(INSTALL_DIR)/bin/
+ @rm tools/maxmem
+ @$(INSTALL) tools/plotmem $(INSTALL_DIR)/bin/
##
## DOCUMENTATION
View
43 _tags
@@ -7,36 +7,41 @@
# this file should only contain restricted traverse directives, sorted by repos, and warning-error directives
# Default : do not include or traverse anything
-<**/*>: -include, -traverse
+# <**/*>: -include, -traverse
+
+<tools/dependencies>: -include, -traverse
+
+# Subdirectories to include
+<{ocamllib,compiler,lib,tools}>: include, traverse
# Warnings
<**/*.ml>: warn_L, warn_Z, warn_error_A
-# -- from opageneral --
+# # -- from opageneral --
-<{utils,buildinfos}>: traverse
+# <{utils,buildinfos}>: traverse
-# -- from libqml --
+# # -- from libqml --
-<{pplib,libbase,compilerlib,passlib,libtrx,jslang,ocamllang,libqmlcompil,libruntime,oparuntime,database,teerex,libbsl,qmlslicer,ulex,qmlpasses,libsession}>: traverse
+# <{pplib,libbase,compilerlib,passlib,libtrx,jslang,ocamllang,libqmlcompil,libruntime,oparuntime,database,teerex,libbsl,qmlslicer,ulex,qmlpasses,libsession}>: traverse
-<{libbase.{cma,cmxa},ocamlbase.top}>: use_stubs
-<ocamlbase.top>: thread, use_unix, use_str, use_zip, use_ulex, iconv
+# <{libbase.{cma,cmxa},ocamlbase.top}>: use_stubs
+# <ocamlbase.top>: thread, use_unix, use_str, use_zip, use_ulex, iconv
-# -- from qml2llvm --
+# # -- from qml2llvm --
-<{opatop,qmlflat,qmlcps,qml2ocaml,qml2js,qmljsimp,qmlcompilers,tools}>: traverse
+# <{opatop,qmlflat,qmlcps,qml2ocaml,qml2js,qmljsimp,qmlcompilers,tools}>: traverse
-# -- from opa --
+# # -- from opa --
-<{opacapi,opalib,shared,opa,plugins,opabsl,test,opalang,passes,stdlib,ml2opa}>: traverse
+# <{opacapi,opalib,shared,opa,plugins,opabsl,test,opalang,passes,stdlib,ml2opa}>: traverse
-# -- from appserver --
-<{appruntime,libnet,libsecurity,libtools,protocols,opasmanagers}>: traverse
-<libsecurity.*a>: use_ssl_ext
-<appruntime.*a>: use_io
-<libnattraversal.*a>: use_miniupnpc_idl, use_natpmp_idl
+# # -- from appserver --
+# <{appruntime,libnet,libsecurity,libtools,protocols,opasmanagers}>: traverse
+# <libsecurity.*a>: use_ssl_ext
+# <appruntime.*a>: use_io
+# <libnattraversal.*a>: use_miniupnpc_idl, use_natpmp_idl
-# --
-<{dissemination}>: traverse
-<{libirc}>: traverse
+# # --
+# <{dissemination}>: traverse
+# <{libirc}>: traverse
View
80 build_libs
@@ -10,42 +10,44 @@
# contains the shared interfaces.
# if omitted, [directory] is the same as lib_name.
-internal pplib
-internal buildinfos
-internal libbase
-internal compilerlib
-internal passlib
-internal libtrx
-internal ocamllang
-internal database
-internal libqmlcompil
-internal qmlpasses
-internal jslang
-internal libbsl
-internal qmlslicer
-internal opatoplib
-internal qml2ocaml
-internal qml2js
-internal qmlcpsrewriter qmlcps
-internal qmlflatserver qmlflat
-internal qmlflatcompiler qmlflat
-internal qmlcpsserver qmlcps
-internal qmljsimp
-internal opalib
-internal opabsl_for_compiler opabsl
-internal opabsl_for_server opabsl
-internal opabsl_for_interpreter opabsl
-internal libruntime
-internal oparuntime
-# internal libopa opa
-internal opalang
-internal opacapi
-internal opapasses passes
-internal appruntime
-internal libsecurity
-internal libnet
-internal libnattraversal libnet/nattraversal
-internal libirc
-internal libtools
-internal protocols
-internal libsession
+internal libbase ocamllib/libbase
+internal appruntime ocamllib/appruntime
+internal database ocamllib/database
+internal libirc ocamllib/libirc
+internal libnet ocamllib/libnet
+internal libnattraversal ocamllib/libnet/nattraversal
+internal libruntime ocamllib/libruntime
+internal libsecurity ocamllib/libsecurity
+internal libtools ocamllib/libtools
+internal libsession ocamllib/libsession
+internal oparuntime ocamllib/oparuntime
+
+internal pplib compiler/pplib
+internal buildinfos compiler/buildinfos
+internal compilerlib compiler/compilerlib
+internal passlib compiler/passlib
+internal libtrx compiler/libtrx
+internal ocamllang compiler/ocamllang
+internal libqmlcompil compiler/libqmlcompil
+internal qmlpasses compiler/qmlpasses
+internal jslang compiler/jslang
+internal libbsl compiler/libbsl
+internal qmlslicer compiler/qmlslicer
+internal opatoplib compiler/opatoplib
+internal qml2ocaml compiler/qml2ocaml
+internal qml2js compiler/qml2js
+internal qmlcpsrewriter compiler/qmlcps
+internal qmlflatserver compiler/qmlflat
+internal qmlflatcompiler compiler/qmlflat
+internal qmlcpsserver compiler/qmlcps
+internal qmljsimp compiler/qmljsimp
+internal opalib compiler/opalib
+internal protocols compiler/protocols
+internal opapasses compiler/passes
+internal opalang compiler/opalang
+internal opacapi compiler/opacapi
+internal libopa compiler/opa
+
+internal opabsl_for_compiler lib/opabsl
+internal opabsl_for_server lib/opabsl
+internal opabsl_for_interpreter lib/opabsl
View
217 build_rules.ml
@@ -15,30 +15,27 @@
You should have received a copy of the GNU Affero General Public License
along with OPA. If not, see <http://www.gnu.org/licenses/>.
*)
+
(* ------------------------------------------------------------ *)
(* Tags, flags, directory contexts and custom stuff *)
(* ------------------------------------------------------------ *)
(* -- Directory contexts -- *)
-shared_namespace_dir "libqmlcompil";
-shared_namespace_dir "database";
-shared_namespace_dir "opa";
-include_subdirs "opalib";
-shared_namespace_dir "opalang";
-shared_namespace_dir "appruntime";
-shared_namespace_dir "libnet";
-include_subdirs "qmlflat";
+shared_namespace_dir "compiler/libqmlcompil";
+include_subdirs "compiler/qmlflat";
+shared_namespace_dir "compiler/opa";
+include_subdirs "compiler/opalib";
+shared_namespace_dir "compiler/opalang";
+shared_namespace_dir "ocamllib/appruntime";
+shared_namespace_dir "ocamllib/libnet";
+shared_namespace_dir "ocamllib/database";
(* -- Stubs -- *)
-def_stubs ~dir:"libbase" "stubs";
-def_stubs ~dir:"libsecurity" "ssl_ext";
-def_stubs ~dir:"appruntime" "io";
-
-let root_ocamldir = Config.ocamllib in
-
-let is_release () = Config.is_release in
+def_stubs ~dir:"ocamllib/libbase" "stubs";
+def_stubs ~dir:"ocamllib/libsecurity" "ssl_ext";
+def_stubs ~dir:"ocamllib/appruntime" "io";
let link_cmd = if windows_mode then S[Sh"cp";A"-r"] else S[Sh"ln";A"-s";A"-f"] in
@@ -51,6 +48,7 @@ in
extralib_opt Config.libnatpmp;
extralib_opt Config.miniupnpc;
+(* Pre-installed system libs *)
let linux_system_libs = ["iconv"]
and mac_system_libs = []
and windows_system_libs = []
@@ -65,32 +63,31 @@ let filter_system_libs l =
in List.filter (fun x -> not (List.mem x system_libs)) l
in
-begin
- match Config.camlidl with
- | None -> ()
- | Some camlidl ->
- flag ["link"; "use_camlidl"] (S [A "-cclib"; P "-lcamlidl" ]);
-
- rule "camlidl processing: .idl -> .ml .mli _stubs.c lib_stubs.clib"
- ~deps:[ "%(dir)stubs%(name).idl" ]
- ~prods:[ "%(dir:<**/>)stubs%(name:<*> and not <*.*> and not <>).mli";
- "%(dir:<**/>)stubs%(name:<*> and not <*.*> and not <>).ml" ;
- "%(dir:<**/>)stubs%(name:<*> and not <*.*> and not <>)_stubs.c" ]
- ~insert:`top
- (fun env _build ->
- let dir = env "%(dir)" in
- let name = env "%(name)" in
-
- def_stubs ~dir (name ^ "_idl");
-
- Cmd(S[Sh"cd"; P dir; Sh"&&";
- P camlidl; A"-prepro"; P"/usr/bin/cpp"; A"-no-include"; P ("stubs" ^ name -.- "idl") ])
- )
+begin match Config.camlidl with
+| None -> ()
+| Some camlidl ->
+ flag ["link"; "use_camlidl"] (S [A "-cclib"; P "-lcamlidl" ]);
+
+ rule "camlidl processing: .idl -> .ml .mli _stubs.c lib_stubs.clib"
+ ~deps:[ "%(dir)stubs%(name).idl" ]
+ ~prods:[ "%(dir:<**/>)stubs%(name:<*> and not <*.*> and not <>).mli";
+ "%(dir:<**/>)stubs%(name:<*> and not <*.*> and not <>).ml" ;
+ "%(dir:<**/>)stubs%(name:<*> and not <*.*> and not <>)_stubs.c" ]
+ ~insert:`top
+ (fun env _build ->
+ let dir = env "%(dir)" in
+ let name = env "%(name)" in
+
+ def_stubs ~dir (name ^ "_idl");
+
+ Cmd(S[Sh"cd"; P dir; Sh"&&";
+ P camlidl; A"-prepro"; P"/usr/bin/cpp"; A"-no-include"; P ("stubs" ^ name -.- "idl") ])
+ )
end;
(* -- Ocamldoc plugin -- *)
-flag_and_dep ["ocaml"; "doc"] (S[A"-g";P"utils/ocamldoc_plugin.cmxs"]);
+flag_and_dep ["ocaml"; "doc"] (S[A"-g";P"tools/utils/ocamldoc_plugin.cmxs"]);
(* ------------------------------------------------------------ *)
(* Hacks *)
@@ -100,12 +97,12 @@ flag_and_dep ["ocaml"; "doc"] (S[A"-g";P"utils/ocamldoc_plugin.cmxs"]);
cheat by copying the opabsl generated files so that they can be seen as
local by opatop. *)
let magic_import_from_opabsl dest f =
- rule ("import from opabsl: "^f) ~deps:["opabsl/"^f] ~prod:(dest / f)
+ rule ("import from opabsl: "^f) ~deps:["lib/opabsl/"^f] ~prod:(dest / f)
(fun env build ->
Seq[Cmd(S[Sh"mkdir";A"-p";P dest]);
- if Pathname.exists "opabsl"
- then (build_list build ["opabsl" / f]; cp ("opabsl"/ f) dest)
- else cp (mlstatelibs/"opabsl"/ f) dest
+ if Pathname.exists "lib/opabsl"
+ then (build_list build ["lib/opabsl" / f]; cp ("lib/opabsl"/ f) dest)
+ else cp (mlstatelibs/"lib/opabsl"/ f) dest
])
in
List.iter
@@ -184,8 +181,8 @@ rule "mlstate_platform: () -> libbase/mlstate_platform.h"
*)
let stdlib_files =
(* keep in sync with s3passes@pass_AddStdlibFiles*)
- let core_dir = "stdlib/core" in
- let tests_dir = "stdlib/tests" in
+ let core_dir = "lib/stdlib/core" in
+ let tests_dir = "lib/stdlib/tests" in
let dirs = core_dir :: tests_dir :: rec_subdirs [ core_dir ] in
let files = List.fold_right (fun dir acc -> dir_ext_files "js" dir @ dir_ext_files "opa" dir @ acc) dirs [] in
files
@@ -196,7 +193,7 @@ rule "stdlib embedded: stdlib_files -> opalib/staticsInclude.of"
(fun env build -> Echo (List.map (fun f -> f^"\n") stdlib_files, "opalib/staticsInclude.of"));
let opa_opacapi_files =
- let dirs = rec_subdirs ["stdlib"] in
+ let dirs = rec_subdirs ["lib/stdlib"] in
let files = List.fold_right (fun dir acc -> dir_ext_files "opa" dir @ acc) dirs [] in
files
in
@@ -206,7 +203,7 @@ let opa_opacapi_plugins = ["badop"] in
(* used in mkinstall *)
let opacapi_validation = "opacapi.validation" in
rule "Opa Compiler Interface Validation (opacapi)"
- ~deps:("opa/checkopacapi.native" :: opa_opacapi_files
+ ~deps:("compiler/opa/checkopacapi.native" :: opa_opacapi_files
@ List.map (fun x -> Printf.sprintf "plugins/%s/%s.oppf" x x)
opa_opacapi_plugins)
~prod:opacapi_validation
@@ -223,14 +220,14 @@ rule "Opa Compiler Interface Validation (opacapi)"
(* -- Build infos and runtime version handling -- *)
(* TODO: probably same bugs than mlstate_platform *)
-let generate_buildinfos = "buildinfos/generate_buildinfos.sh" in
-let version_buildinfos = "buildinfos/version_major.txt" in
-let pre_buildinfos = "buildinfos/buildInfos.ml.pre" in
-let post_buildinfos = "buildinfos/buildInfos.ml.post" in
-let buildinfos = "buildinfos/buildInfos.ml" in
-rule "buildinfos: buildinfos/* -> buildinfos/buildInfos.ml"
+let generate_buildinfos = "compiler/buildinfos/generate_buildinfos.sh" in
+let version_buildinfos = "compiler/buildinfos/version_major.txt" in
+let pre_buildinfos = "compiler/buildinfos/buildInfos.ml.pre" in
+let post_buildinfos = "compiler/buildinfos/buildInfos.ml.post" in
+let buildinfos = "compiler/buildinfos/buildInfos.ml" in
+rule "buildinfos: compiler/buildinfos/* -> compiler/buildinfos/buildInfos.ml"
~deps:[version_buildinfos ; pre_buildinfos ; generate_buildinfos ; post_buildinfos]
- ~prods:(buildinfos :: (if is_release() then ["always_rebuild"] else []))
+ ~prods:(buildinfos :: (if Config.is_release then ["always_rebuild"] else []))
(fun env build ->
let version = env version_buildinfos in
let pre_prod = env pre_buildinfos in
@@ -239,15 +236,15 @@ rule "buildinfos: buildinfos/* -> buildinfos/buildInfos.ml"
Seq[
Cmd(S[Sh "cat" ; P pre_prod ; Sh ">" ; P prod]);
Cmd(S[P "bash"; A "-e"; P generate_buildinfos; P Pathname.pwd;
- if is_release () then A "--release" else N;
+ if Config.is_release then A "--release" else N;
A "--version" ; P version ;
Sh ">>" ; P prod]);
Cmd(S[Sh "cat" ; P post_prod ; Sh ">>" ; P prod]);
]
);
let parser_files =
- let dir = ["opalang/classic_syntax";"opalang/js_syntax"] in
+ let dir = ["compiler/opalang/classic_syntax";"compiler/opalang/js_syntax"] in
let files = List.fold_right (fun dir acc -> dir_ext_files "trx" dir @ dir_ext_files "ml" dir) dir ["general/surfaceAst.ml"] in
files
in
@@ -357,10 +354,10 @@ let js_checker =
A"--js_output_file" :: A output_file :: *)
google_closure_compiler_options (*@
A"--js" :: A clientlib ::
- A"--js" :: A "opabsl/jsbsl/jquery_ext_bslanchor.extern.js" ::
- A"--js" :: A "opabsl/jsbsl/jquery_ext_jQueryExtends.extern.js" ::
- A"--js" :: A "opabsl/jsbsl/selection_ext_bsldom.extern.js" ::
- A"--js" :: A "opabsl/jsbsl/jquery_extra.externs.js" ::
+ A"--js" :: A "lib/opabsl/jsbsl/jquery_ext_bslanchor.extern.js" ::
+ A"--js" :: A "lib/opabsl/jsbsl/jquery_ext_jQueryExtends.extern.js" ::
+ A"--js" :: A "lib/opabsl/jsbsl/selection_ext_bsldom.extern.js" ::
+ A"--js" :: A "lib/opabsl/jsbsl/jquery_extra.externs.js" ::
A"--js" :: A"qmlcps/qmlCpsClientLib.js" ::
[]*)
in
@@ -423,7 +420,7 @@ let opp_build opa_plugin opp oppf env build =
List.fold_left
(fun acc f -> if Pathname.check_extension f "ml" &&
Tags.mem "with_mlstate_debug" (tags_of_pathname f) then
- (A"--pp-file")::(P (Printf.sprintf "%s:%s" f (Pathname.pwd/"utils"/"ppdebug.pl")))::acc
+ (A"--pp-file")::(P (Printf.sprintf "%s:%s" f (Pathname.pwd/"tools"/"utils"/"ppdebug.pl")))::acc
else acc
) [] files in
let js_validation = if files_js=[]
@@ -453,15 +450,15 @@ rule "opa_plugin_dir: opa_plugin -> oppf"
(* -- BSL compilation (using bslregister) -- *)
-let ml_sources_bsl = dir_sources_bsl "opabsl/mlbsl" in
-let js_sources_bsl = dir_sources_bsl "opabsl/jsbsl" in
-let nodejs_sources_bsl = dir_sources_bsl "opabsl/nodejsbsl" in
-let mlstate_init_bsl = dir_sources_bsl "opabsl/mlstatebsl" in
+let ml_sources_bsl = dir_sources_bsl "lib/opabsl/mlbsl" in
+let js_sources_bsl = dir_sources_bsl "lib/opabsl/jsbsl" in
+let nodejs_sources_bsl = dir_sources_bsl "lib/opabsl/nodejsbsl" in
+let mlstate_init_bsl = dir_sources_bsl "lib/opabsl/mlstatebsl" in
let all_sources_bsl = ml_sources_bsl @ js_sources_bsl @ nodejs_sources_bsl @ mlstate_init_bsl in
-let js_dest_bsl = dir_sources_bsl ~prefix:"opabslgen_" "opabsl/jsbsl" in
-let nodejs_dest_bsl = dir_sources_bsl ~prefix:"opabslgen_" "opabsl/nodejsbsl" in
+let js_dest_bsl = dir_sources_bsl ~prefix:"opabslgen_" "lib/opabsl/jsbsl" in
+let nodejs_dest_bsl = dir_sources_bsl ~prefix:"opabslgen_" "lib/opabsl/nodejsbsl" in
let alljs_dest_bsl = js_dest_bsl @ nodejs_dest_bsl in
-let js_conf = "opabsl/jsbsl/bsl-sources.jsconf" in
+let js_conf = "lib/opabsl/jsbsl/bsl-sources.jsconf" in
(*
let rec ponctuate s f = function
@@ -475,20 +472,20 @@ let _ = Printf.eprintf "js_dest_bsl: %s\n" (ponctuate ", " (fun x -> x) (List.m
*)
(* TODO: this is not the way to LLVM, the C code is not usable as it is now *)
-(* let c_sources_bsl = dir_sources_bsl "opabsl/cbsl" in *)
+(* let c_sources_bsl = dir_sources_bsl "lib/opabsl/cbsl" in *)
(* used for js-validation-only *)
rule "opabsl_sources"
~deps: (js_conf :: all_sources_bsl
@ tool_deps "opa-plugin-builder-bin")
- ~prods: ((List.map (fun s -> "opabsl"/s)
+ ~prods: ((List.map (fun s -> "lib/opabsl"/s)
["opabslgenLoader.ml";"opabslgenPlugin.ml";
"opabslgen.bypass" ;
"opabslgenMLRuntime_x.ml";"opabslgenMLRuntime_x.mli";
"opabslgenJSkeys.js";
])@alljs_dest_bsl)
begin fun env build ->
- Seq[Cmd(S([Sh"cd opabsl && ";
+ Seq[Cmd(S([Sh"cd lib/opabsl && ";
get_tool "opa-plugin-builder-bin";
A"-o";P"opabslgen";
A"--no-opp";
@@ -500,25 +497,25 @@ rule "opabsl_sources"
List.map (fun s -> P (".."/s)) (
js_conf :: all_sources_bsl
)));
- mv "opabsl/opabslgenMLRuntime.ml" "opabsl/opabslgenMLRuntime_x.ml";
- mv "opabsl/opabslgenMLRuntime.mli" "opabsl/opabslgenMLRuntime_x.mli";
+ mv "lib/opabsl/opabslgenMLRuntime.ml" "lib/opabsl/opabslgenMLRuntime_x.ml";
+ mv "lib/opabsl/opabslgenMLRuntime.mli" "lib/opabsl/opabslgenMLRuntime_x.mli";
]
end;
rule "opa-bslgenMLRuntime interface validation"
~deps: [
- "opabsl/opabslgenMLRuntime_x.cmo";
- "opabsl/js_validation/imp_client_lib.js";
- "opabsl/js_validation/bsl.js";
+ "lib/opabsl/opabslgenMLRuntime_x.cmo";
+ "lib/opabsl/js_validation/imp_client_lib.js";
+ "lib/opabsl/js_validation/bsl.js";
]
- ~prod: "opabsl/opabslgenMLRuntime.ml"
+ ~prod: "lib/opabsl/opabslgenMLRuntime.ml"
(fun env build ->
Seq[
- cp "opabsl/opabslgenMLRuntime_x.ml" "opabsl/opabslgenMLRuntime.ml";
+ cp "lib/opabsl/opabslgenMLRuntime_x.ml" "lib/opabsl/opabslgenMLRuntime.ml";
]
);
-let js_pp_bsl = dir_sources_bsl ~prefix:"opabslgen_" ~suffix:".pp" "opabsl/jsbsl" in
+let js_pp_bsl = dir_sources_bsl ~prefix:"opabslgen_" ~suffix:".pp" "lib/opabsl/jsbsl" in
rule "preprocess JS files for validation"
~deps:((tool_deps "ppjs")@alljs_dest_bsl)
@@ -530,42 +527,42 @@ rule "preprocess JS files for validation"
rule "Client lib JS validation"
~deps: (
- "qmljsimp/qmlJsImpClientLib.js" ::
- "qmlcps/qmlCpsClientLib.js" ::
- "opabsl/jsbsl/jquery_ext_bslanchor.extern.js" ::
- "opabsl/jsbsl/jquery_ext_jQueryExtends.extern.js" ::
- "opabsl/jsbsl/selection_ext_bsldom.extern.js" ::
- "opabsl/jsbsl/jquery_extra.externs.js" ::
+ "compiler/qmljsimp/qmlJsImpClientLib.js" ::
+ "compiler/qmlcps/qmlCpsClientLib.js" ::
+ "lib/opabsl/jsbsl/jquery_ext_bslanchor.extern.js" ::
+ "lib/opabsl/jsbsl/jquery_ext_jQueryExtends.extern.js" ::
+ "lib/opabsl/jsbsl/selection_ext_bsldom.extern.js" ::
+ "lib/opabsl/jsbsl/jquery_extra.externs.js" ::
(tool_deps "jschecker.jar") @
(tool_deps "jschecker_externals.js") @
(tool_deps "jschecker_clientliblib.js") @
(tool_deps "jschecker_jquery.js") )
~prods:[
- "opabsl/js_validation/imp_client_lib.js";
+ "lib/opabsl/js_validation/imp_client_lib.js";
]
(fun env build ->
let run_check clientlib output_file =
let local = windows_mode in
[
- Cmd(S [Sh"mkdir"; A"-p";P "opabsl/js_validation"]);
+ Cmd(S [Sh"mkdir"; A"-p";P "lib/opabsl/js_validation"]);
Cmd(S(
js_checker @
A"--externs" :: (get_tool ~local "jschecker_externals.js") ::
A"--externs" :: (get_tool ~local "jschecker_jquery.js") ::
A"--externs" :: (get_tool ~local "jschecker_clientliblib.js") ::
A"--js_output_file" :: A output_file ::
A"--js" :: A clientlib ::
- A"--js" :: A "opabsl/jsbsl/jquery_ext_bslanchor.extern.js" ::
- A"--js" :: A "opabsl/jsbsl/jquery_ext_jQueryExtends.extern.js" ::
- A"--js" :: A "opabsl/jsbsl/selection_ext_bsldom.extern.js" ::
- A"--js" :: A "opabsl/jsbsl/jquery_extra.externs.js" ::
+ A"--js" :: A "lib/opabsl/jsbsl/jquery_ext_bslanchor.extern.js" ::
+ A"--js" :: A "lib/opabsl/jsbsl/jquery_ext_jQueryExtends.extern.js" ::
+ A"--js" :: A "lib/opabsl/jsbsl/selection_ext_bsldom.extern.js" ::
+ A"--js" :: A "lib/opabsl/jsbsl/jquery_extra.externs.js" ::
A"--js" :: A"qmlcps/qmlCpsClientLib.js" ::
[]
))
]
in
Seq (
- run_check "qmljsimp/qmlJsImpClientLib.js" "opabsl/js_validation/imp_client_lib.js"
+ run_check "qmljsimp/qmlJsImpClientLib.js" "lib/opabsl/js_validation/imp_client_lib.js"
)
);
@@ -578,37 +575,37 @@ rule "opa-bslgenMLRuntime JS validation"
@ (tool_deps "jschecker_clientliblib.js")
@ (tool_deps "jschecker_cpsclientlib.js")
@ js_pp_bsl
- @ [ "opabsl/jsbsl/jquery_ext_bslanchor.extern.js" ;
- "opabsl/jsbsl/jquery_ext_jQueryExtends.extern.js" ;
- "opabsl/jsbsl/selection_ext_bsldom.extern.js" ;
- "opabsl/jsbsl/jquery_extra.externs.js" ;
- "opabsl/opabslgenJSkeys.js" ]
+ @ [ "lib/opabsl/jsbsl/jquery_ext_bslanchor.extern.js" ;
+ "lib/opabsl/jsbsl/jquery_ext_jQueryExtends.extern.js" ;
+ "lib/opabsl/jsbsl/selection_ext_bsldom.extern.js" ;
+ "lib/opabsl/jsbsl/jquery_extra.externs.js" ;
+ "lib/opabsl/opabslgenJSkeys.js" ]
)
- ~prods: ["opabsl/js_validation/bsl.js"]
+ ~prods: ["lib/opabsl/js_validation/bsl.js"]
(fun env build ->
let arg_of_file file acc = match file with (*A very dumb filter to get rid of files that we just can't fix in the first place*)
- | "opabsl/jsbsl/opabslgen_jquery-1.7.2.min.js.pp" -> acc
- | "opabsl/jsbsl/opabslgen_json2.js.pp" -> acc
+ | "lib/opabsl/jsbsl/opabslgen_jquery-1.7.2.min.js.pp" -> acc
+ | "lib/opabsl/jsbsl/opabslgen_json2.js.pp" -> acc
| _ -> A "--js" :: A file :: acc
in
let get_tool = get_tool ~local:windows_mode in
Seq[
- Cmd(S [Sh"mkdir";A"-p";P "opabsl/js_validation"]);
+ Cmd(S [Sh"mkdir";A"-p";P "lib/opabsl/js_validation"]);
Cmd(S(
A"java" :: A"-jar" :: (get_tool "jschecker.jar") ::
A"--externs" :: (get_tool "jschecker_externals.js") ::
A"--externs" :: (get_tool "jschecker_clientliblib.js") ::
A"--externs" :: (get_tool "jschecker_clientlib.js") ::
A"--externs" :: (get_tool "jschecker_jquery.js") ::
A"--externs" :: (get_tool "jschecker_cpsclientlib.js") ::
- A"--externs" :: A "opabsl/jsbsl/jquery_ext_bslanchor.extern.js" ::
- A"--externs" :: A "opabsl/jsbsl/jquery_ext_jQueryExtends.extern.js" ::
- A"--externs" :: A "opabsl/jsbsl/selection_ext_bsldom.extern.js" ::
- A"--externs" :: A "opabsl/jsbsl/jquery_extra.externs.js" ::
- A"--js_output_file" :: A "opabsl/js_validation/bsl.js" ::
+ A"--externs" :: A "lib/opabsl/jsbsl/jquery_ext_bslanchor.extern.js" ::
+ A"--externs" :: A "lib/opabsl/jsbsl/jquery_ext_jQueryExtends.extern.js" ::
+ A"--externs" :: A "lib/opabsl/jsbsl/selection_ext_bsldom.extern.js" ::
+ A"--externs" :: A "lib/opabsl/jsbsl/jquery_extra.externs.js" ::
+ A"--js_output_file" :: A "lib/opabsl/js_validation/bsl.js" ::
google_closure_compiler_options @
(List.fold_right (fun s acc -> arg_of_file s acc) js_pp_bsl [])
- @ [ A"--js" ; A "opabsl/opabslgenJSkeys.js" ]
+ @ [ A"--js" ; A "lib/opabsl/opabslgenJSkeys.js" ]
))]
);
@@ -659,12 +656,12 @@ rule "opa-bslgenMLRuntime JS documentation"
(* -- OPA compiler rules -- *)
-let stdlib_packages_dir = "stdlib" in
+let stdlib_packages_dir = "lib/stdlib" in
let opaopt = try Sh(Sys.getenv "OPAOPT") with Not_found -> N in
-let opacomp_deps_js = string_list_of_file "opa-run-js-libs.itarget" in
-let opacomp_deps_native = string_list_of_file "opa-run-libs.itarget" in
+let opacomp_deps_js = string_list_of_file "compiler/opa-run-js-libs.itarget" in
+let opacomp_deps_native = string_list_of_file "compiler/opa-run-libs.itarget" in
let opacomp_deps_byte = List.map (fun l -> Pathname.update_extension "cma" l) opacomp_deps_native in
let opacomp_deps_native = opacomp_deps_native @ opacomp_deps_js in
@@ -694,7 +691,7 @@ let copy_lib_to_runtime lib =
in
rule "opa run-time libraries"
- ~deps:("libbase"/"mimetype_database.xml" :: opacomp_deps_native)
+ ~deps:("ocamllib"/"libbase"/"mimetype_database.xml" :: opacomp_deps_native)
~stamp:"runtime-libs.stamp"
(fun _env _build ->
let mllibs = List.filter (fun f -> Pathname.check_extension f "cmxa") opacomp_deps_native in
@@ -709,7 +706,7 @@ rule "opa run-time libraries"
@ [ P (opa_prefix / opa_libs_dir) ]));
Cmd(S(link_cmd :: List.map (fun f -> P (opa_prefix / f -.- !Options.ext_lib)) mllibs
@ [ P (opa_prefix / opa_libs_dir) ]));
- Cmd(S(link_cmd :: P (opa_prefix / "libbase" / "mimetype_database.xml") :: [ P (opa_prefix / opa_share_dir / "mimetype_database.xml") ]));
+ Cmd(S(link_cmd :: P (opa_prefix / "ocamllib" / "libbase" / "mimetype_database.xml") :: [ P (opa_prefix / opa_share_dir / "mimetype_database.xml") ]));
Seq copylibs
]
);
View
141 build_tools
@@ -10,87 +10,86 @@
# the build_target is the name of the exe as understood by ocamlbuild.
# install dir is relative to the installation prefix, default is "bin/"
-# from opageneral itself
-internal ppdebug pplib/ppml.native
-internal ppdebug-opa pplib/ppopa.native
-internal ppjs pplib/ppjs.native
+# # from opageneral itself
+internal ppdebug compiler/pplib/ppml.native
+# internal ppdebug-opa compiler/pplib/ppopa.native
+internal ppjs compiler/pplib/ppjs.native
-# from libqml
-internal mlstate_platform libbase/gen_platform
-internal trx teerex/trx_ocaml.native
-internal trx_interpreter teerex/trx_interpreter.native
-internal opa-plugin-builder-bin libbsl/bslregister.native lib/opa/bin
-internal opa-plugin-browser-bin libbsl/bslbrowser.native lib/opa/bin
-internal bslbrowser libbsl/bslbrowser
-internal passdesign passlib/passdesign.native
-internal ocamlbase.top ocamlbase.top
-internal ocamlbase libbase/ocamlbase
-internal opa-db-server database/database_server.native
-internal opa-db-tool database/database_tool.native
-internal opatrack passlib/opatrack.sh
-internal opadep compilerlib/opadep.sh
-internal filepos libbase/testfilepos.native
-internal genproto protocols/genproto.native
-internal mlidl protocols/mlidl.native
-internal wsdl2ml protocols/wsdl2ml.native
-internal jsstat jslang/jsstat.native
+# # from libqml
+internal mlstate_platform ocamllib/libbase/gen_platform
+internal trx tools/teerex/trx_ocaml.native
+# internal trx_interpreter compiler/teerex/trx_interpreter.native
+internal opa-plugin-builder-bin compiler/libbsl/bslregister.native lib/opa/bin
+# internal opa-plugin-browser-bin compiler/libbsl/bslbrowser.native lib/opa/bin
+# internal bslbrowser compiler/libbsl/bslbrowser
+# internal passdesign compiler/passlib/passdesign.native
+# internal ocamlbase.top ocamllib/ocamlbase.top
+# internal ocamlbase ocamllib/libbase/ocamlbase
+# internal opa-db-server ocamllib/database/database_server.native
+# internal opa-db-tool ocamllib/database/database_tool.native
+# internal opatrack compiler/passlib/opatrack.sh
+# internal opadep compiler/compilerlib/opadep.sh
+# internal filepos ocamllib/libbase/testfilepos.native
+internal genproto compiler/protocols/genproto.native
+internal mlidl compiler/protocols/mlidl.native
+internal wsdl2ml compiler/protocols/wsdl2ml.native
+# internal jsstat compiler/jslang/jsstat.native
-# from qml2llvm
-internal opatop opatop/opatop.native
-internal qmljs qmlcompilers/qmljs_exe.native
-internal qmlJsImpClientLib.js qmljsimp/qmlJsImpClientLib.js lib/opa/static
-internal clientLibLib.js qml2js/clientLibLib.js lib/opa/static
-internal qmlCpsClientLib.js qmlcps/qmlCpsClientLib.js lib/opa/static
-internal qmlNoCpsClientLib.js qmlcps/qmlNoCpsClientLib.js lib/opa/static
-internal odep tools/odep.native
-internal odeplink tools/odeplink.native
+# # from qml2llvm
+# internal opatop compiler/opatop/opatop.native
+# internal qmljs compiler/qmlcompilers/qmljs_exe.native
+# internal qmlJsImpClientLib.js compiler/qmljsimp/qmlJsImpClientLib.js lib/opa/static
+# internal clientLibLib.js compiler/qml2js/clientLibLib.js lib/opa/static
+# internal qmlCpsClientLib.js compiler/qmlcps/qmlCpsClientLib.js lib/opa/static
+# internal qmlNoCpsClientLib.js compiler/qmlcps/qmlNoCpsClientLib.js lib/opa/static
+# internal odep tools/odep.native
+# internal odeplink tools/odeplink.native
-# from opa
-internal opa2opa opalang/opa2opa.native
-internal ofile tools/ofile.native
-internal opa-translate opa/syntaxHelper.native
+# # from opa
+# internal opa2opa compiler/opalang/opa2opa.native
+internal ofile tools/ofile.native
+# internal opa-translate compiler/opa/syntaxHelper.native
-# The name of opa raw executable, following unix guidelines (e.g. firefox distrib)
-# when there is a wraper used to call a raw exe
-internal opa-bin opa/main.native lib/opa/bin
+# # The name of opa raw executable, following unix guidelines (e.g. firefox distrib)
+# # when there is a wraper used to call a raw exe
+internal opa-bin compiler/opa/main.native lib/opa/bin
-internal opa_bash_completion bash_completion share/opa
+# internal opa_bash_completion tools/bash/bash_completion share/opa
-# for now, these can't be built cleanly from opageneral
-internal opabslgen.bypass opabsl/opabslgen.bypass lib/opa/static
-internal serverLib.cmi opabsl/serverLib.cmi lib/opa/static
-# for helping developpers of plugins we can distribute the source of the interface
-internal bslServerLib.ml libbase/bslServerLib.ml lib/opa/static
+# # for now, these can't be built cleanly from opageneral
+# internal opabslgen.bypass lib/opabsl/opabslgen.bypass lib/opa/static
+# internal serverLib.cmi lib/opabsl/serverLib.cmi lib/opa/static
-# slicer plugin
-# internal testSlicerPlugin.cmxs plugins/testSlicerPlugin.cmxs plugins
-# internal testSlicerMLRuntime.cmx plugins/testSlicerMLRuntime.cmx plugins
-# internal testSlicerMLRuntime.cmi plugins/testSlicerMLRuntime.cmi plugins
-# internal testSlicerMLRuntime.o plugins/testSlicerMLRuntime.o plugins
-# internal testSlicerJSPlugin.js plugins/testSlicerJSRuntime.js plugins
+# # for helping developpers of plugins we can distribute the source of the interface
+# internal bslServerLib.ml ocamllib/libbase/bslServerLib.ml lib/opa/static
+# # slicer plugin
+# # internal testSlicerPlugin.cmxs plugins/testSlicerPlugin.cmxs plugins
+# # internal testSlicerMLRuntime.cmx plugins/testSlicerMLRuntime.cmx plugins
+# # internal testSlicerMLRuntime.cmi plugins/testSlicerMLRuntime.cmi plugins
+# # internal testSlicerMLRuntime.o plugins/testSlicerMLRuntime.o plugins
+# # internal testSlicerJSPlugin.js plugins/testSlicerJSRuntime.js plugins
-# javascript checker
-internal jschecker.jar tools/jschecker/compiler.jar share/opa/jschecker
-internal jschecker_cpsclientlib.js qmlcps/qmlCpsClientLib-external.js share/opa/jschecker
-internal jschecker_clientlib.js qml2js/clientLib-external.js share/opa/jschecker
-internal jschecker_clientliblib.js qml2js/clientLibLib-external.js share/opa/jschecker
-internal jschecker_externals.js tools/jschecker/externals.js share/opa/jschecker
-internal jschecker_jquery.js opabsl/jsbsl/jquery-1.6.externs.js share/opa/jschecker
+# # javascript checker
+internal jschecker.jar tools/jschecker/compiler.jar share/opa/jschecker
+internal jschecker_cpsclientlib.js compiler/qmlcps/qmlCpsClientLib-external.js share/opa/jschecker
+internal jschecker_clientlib.js compiler/qml2js/clientLib-external.js share/opa/jschecker
+internal jschecker_clientliblib.js compiler/qml2js/clientLibLib-external.js share/opa/jschecker
+internal jschecker_externals.js tools/jschecker/externals.js share/opa/jschecker
+internal jschecker_jquery.js compiler/opabsl/jsbsl/jquery-1.6.externs.js share/opa/jschecker
-# for the linking of servers
-internal runtimeMain.cmx libnet/runtimeMain.cmx lib/opa/static
-internal runtimeMain.cmo libnet/runtimeMain.cmo lib/opa/static
-internal runtimeMain.o libnet/runtimeMain.o lib/opa/static
+# # for the linking of servers
+# internal runtimeMain.cmx ocamllib/libnet/runtimeMain.cmx lib/opa/static
+# internal runtimeMain.cmo ocamllib/libnet/runtimeMain.cmo lib/opa/static
+# internal runtimeMain.o ocamllib/libnet/runtimeMain.o lib/opa/static
+# # mimetype database
+# internal mimetype_database.xml ocamllib/libbase/mimetype_database.xml share/opa
-# mimetype database
-internal mimetype_database.xml libbase/mimetype_database.xml share/opa
+# # dissemination
+# internal opa-cloud tools/dissemination/spawn.sh
-# dissemination
-internal opa-cloud dissemination/spawn.sh
-
-#manpages
-internal gen_opa_manpage opa/gen_opa_manpage.native
-internal gen_opatop_manpage opatop/gen_opatop_manpage.native
-internal genman.native manpages/genman.native
+# # manpages
+# internal gen_opa_manpage compiler/opa/gen_opa_manpage.native
+# internal gen_opatop_manpage compiler/opatop/gen_opatop_manpage.native
+# internal genman tools/manpages/genman.native
View
0 opa-compile-libs.itarget → compiler/opa-compile-libs.itarget
File renamed without changes.
View
4 compiler/opa-run-js-libs.itarget
@@ -0,0 +1,4 @@
+compiler/qmljsimp/qmlJsImpClientLib.js
+compiler/qmlcps/qmlCpsClientLib.js
+compiler/qmlcps/qmlNoCpsClientLib.js
+compiler/qml2js/clientLibLib.js
View
0 opa-run-libs.itarget → compiler/opa-run-libs.itarget
File renamed without changes.
View
3 compiler/opalib/opaEnv.ml
@@ -900,8 +900,9 @@ struct
~section:1
~centerheader:"Opa Manual"
~synopsis:ArgParser.synopsis
- ~description:"The Opa compiler allows you to compile Opa projects into execute files. Please refer to the online manual on http://opalang.org for a detailed description of the language and its tools.\n"
+ ~description:"The Opa compiler allows you to compile Opa projects into executable files. Please refer to the online manual on http://doc.opalang.org for a detailed description of the language and its tools.\n"
~options:ArgParser.speclist
~other:[("VERSION", ArgParser.str_version)]
file
+
end
View
1 compiler/teerex/default.trx
View
4 config.mli
@@ -15,9 +15,9 @@
You should have received a copy of the GNU Affero General Public License
along with OPA. If not, see <http://www.gnu.org/licenses/>.
*)
+
(** Configuration of the build system
- The .ml file is generated by the ./configure script
-*)
+ The .ml file is generated by the ./configure script *)
(** the installation prefix (also known as MLSTATELIBS from many places) *)
val prefix : string
View
5 configure
@@ -178,7 +178,7 @@ if [ -n "${IS_MAC:-}" ]; then
fi
exit 1
fi >&2
- . ./platform_helper.sh
+ . ./tools/platform_helper.sh
fi
if [ -n "${IS_FREEBSD:-}" ]; then
@@ -808,8 +808,7 @@ EOF
sed 's/=["(]\(.*\)[)"]$/ := \1/' config.sh > config.make
if [ -n "${IS_MAC:-}" ]; then
echo "INSTALL := gcp -u -L" >>config.make
-fi
-if [ -n "${IS_FREEBSD:-}" ]; then
+elif [ -n "${IS_FREEBSD:-}" ]; then
echo "INSTALL := cp" >>config.make
fi
View
95 database.mllibp
@@ -1,95 +0,0 @@
-# -*- conf -*-
-# low_level Io
-database/db3/io/FileIo
-database/db3/io/IoMmap
-database/db3/io/IoUnix
-database/db3/io/DbIoSig
-database/db3/io/DbIo
-database/db3/io/IoSig
-database/db3/io/DbTypes
-# Db3 low-level
-database/db3/IoManager
-database/db3/Keys
-database/db3/Path
-database/DataImpl
-database/db3/Datas
-database/db3/Common
-database/db3/Eid
-database/db3/EidMap
-database/db3/Uid
-database/db3/UidMap
-database/db3/Revision
-database/db3/RevisionMap
-database/db3/KeyMap
-database/db3/KeyRecMap
-database/db3/Node
-database/db3/Hldb
-database/db3/QueryMap
-database/db3/Unwind
-database/db3/Transaction
-database/db3/RevisionMachine
-database/db3/Dot
-database/db3/Session
-# Migration machinery (binary changes)
-database/db3/migration/Init
-database/db3/migration/Migration_18
-database/db3/migration/Migration_19
-database/db3/migration/Migration_20
-database/db3/migration/Migration_21
-database/db3/migration/Migration_22
-database/db3/migration/Migration_23
-database/db3/migration/Migration_24
-database/db3/migration/Migration_25
-database/db3/migration/Migration_26
-database/db3/migration/Migration
-# Badop interface generic
-database/badop/Badop_structure
-database/badop/Badop_lib
-database/Badop
-# Badop backends: database
-database/Badop_local
-database/Badop_sync
-database/Badop_trans
-# Badop backends: client-server
-database/Badop_protocol
-database/Badop_server
-database/Badop_client
-database/Badop_locator
-database/Badop_dispatcher
-# Badop more functor fun
-database/Badop_wrapper_template
-database/Badop_stash
-database/Badop_cache
-database/Badop_debug
-database/Badop_stats
-database/Badop_workaround
-database/Badop_check
-# support for run-time choice of backend (Ocaml 3.12)
-database/Badop_meta
-# high-level run-time schema support
-database/Gml_parser
-database/Dbgraph
-database/Xml_dump
-#database/Xml_import
-#Internal structs
-database/db3/structs/SigListMap
-database/db3/structs/RaListMap
-database/db3/structs/SimpleListMap
-database/db3/structs/TabMap
-# Badop light
-?HAS_DBM:database/Badop_light
-?HAS_DBM:database/light/Node_light
-?HAS_DBM:database/light/Session_light
-?HAS_DBM:database/light/Session_light_sig
-?HAS_DBM:database/light/Transaction_light
-?HAS_DBM:database/light/Transaction_light_sig
-?HAS_DBM:database/light/Db_light
-?HAS_DBM:database/light/Db_light_sig
-?HAS_DBM:database/light/Io_light
-?HAS_DBM:database/light/Io_light_sig
-?HAS_DBM:database/light/Encode_light
-?HAS_DBM:database/light/Mem_tree_light
-?HAS_DBM:database/light/Mst
-?HAS_DBM:database/light/KeySet
-?HAS_DBM:database/light/DbSig
-?HAS_DBM:database/light/DbmDB
View
0 copyright/01_ocaml → doc/copyright/01_ocaml
File renamed without changes.
View
0 copyright/02_cryptokit → doc/copyright/02_cryptokit
File renamed without changes.
View
0 copyright/03_ocamlgraph → doc/copyright/03_ocamlgraph
File renamed without changes.
View
0 copyright/04_jsmin → doc/copyright/04_jsmin
File renamed without changes.
View
0 copyright/05_jquery → doc/copyright/05_jquery
File renamed without changes.
View
0 copyright/06_ulex → doc/copyright/06_ulex
File renamed without changes.
View
0 copyright/07_xmlm → doc/copyright/07_xmlm
File renamed without changes.
View
0 copyright/08_libnatpmp → doc/copyright/08_libnatpmp
File renamed without changes.
View
0 copyright/09_miniupnpc → doc/copyright/09_miniupnpc
File renamed without changes.
View
0 copyright/10_iconv-ocaml → doc/copyright/10_iconv-ocaml
File renamed without changes.
View
0 copyright/11_node → doc/copyright/11_node
File renamed without changes.
View
0 copyright/copyright → doc/copyright/copyright
File renamed without changes.
View
0 compiler/opabsl_for_compiler.mllib → lib/opabsl_for_compiler.mllib
File renamed without changes.
View
0 compiler/opabsl_for_interpreter.mllib → lib/opabsl_for_interpreter.mllib
File renamed without changes.
View
0 compiler/opabsl_for_server.mllib → lib/opabsl_for_server.mllib
File renamed without changes.
View
2 lib/stdlib/all_plugins.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# script used to generate the list of packages
+# script used to generate the list of plugins
DIRS=$(find . -type d | sed "s/.\///")
View
0 compiler/appruntime.mllib → ocamllib/appruntime.mllib
File renamed without changes.
View
95 ocamllib/database.mllibp
@@ -0,0 +1,95 @@
+# -*- conf -*-
+# low_level Io
+ocamllib/database/db3/io/FileIo
+ocamllib/database/db3/io/IoMmap
+ocamllib/database/db3/io/IoUnix
+ocamllib/database/db3/io/DbIoSig
+ocamllib/database/db3/io/DbIo
+ocamllib/database/db3/io/IoSig
+ocamllib/database/db3/io/DbTypes
+# Db3 low-level
+ocamllib/database/db3/IoManager
+ocamllib/database/db3/Keys
+ocamllib/database/db3/Path
+ocamllib/database/DataImpl
+ocamllib/database/db3/Datas
+ocamllib/database/db3/Common
+ocamllib/database/db3/Eid
+ocamllib/database/db3/EidMap
+ocamllib/database/db3/Uid
+ocamllib/database/db3/UidMap
+ocamllib/database/db3/Revision
+ocamllib/database/db3/RevisionMap
+ocamllib/database/db3/KeyMap
+ocamllib/database/db3/KeyRecMap
+ocamllib/database/db3/Node
+ocamllib/database/db3/Hldb
+ocamllib/database/db3/QueryMap
+ocamllib/database/db3/Unwind
+ocamllib/database/db3/Transaction
+ocamllib/database/db3/RevisionMachine
+ocamllib/database/db3/Dot
+ocamllib/database/db3/Session
+# Migration machinery (binary changes)
+ocamllib/database/db3/migration/Init
+ocamllib/database/db3/migration/Migration_18
+ocamllib/database/db3/migration/Migration_19
+ocamllib/database/db3/migration/Migration_20
+ocamllib/database/db3/migration/Migration_21
+ocamllib/database/db3/migration/Migration_22
+ocamllib/database/db3/migration/Migration_23
+ocamllib/database/db3/migration/Migration_24
+ocamllib/database/db3/migration/Migration_25
+ocamllib/database/db3/migration/Migration_26
+ocamllib/database/db3/migration/Migration
+# Badop interface generic
+ocamllib/database/badop/Badop_structure
+ocamllib/database/badop/Badop_lib
+ocamllib/database/Badop
+# Badop backends: database
+ocamllib/database/Badop_local
+ocamllib/database/Badop_sync
+ocamllib/database/Badop_trans
+# Badop backends: client-server
+ocamllib/database/Badop_protocol
+ocamllib/database/Badop_server
+ocamllib/database/Badop_client
+ocamllib/database/Badop_locator
+ocamllib/database/Badop_dispatcher
+# Badop more functor fun
+ocamllib/database/Badop_wrapper_template
+ocamllib/database/Badop_stash
+ocamllib/database/Badop_cache
+ocamllib/database/Badop_debug
+ocamllib/database/Badop_stats
+ocamllib/database/Badop_workaround
+ocamllib/database/Badop_check
+# support for run-time choice of backend (Ocaml 3.12)
+ocamllib/database/Badop_meta
+# high-level run-time schema support
+ocamllib/database/Gml_parser
+ocamllib/database/Dbgraph
+ocamllib/database/Xml_dump
+#ocamllib/database/Xml_import
+#Internal structs
+ocamllib/database/db3/structs/SigListMap
+ocamllib/database/db3/structs/RaListMap
+ocamllib/database/db3/structs/SimpleListMap
+ocamllib/database/db3/structs/TabMap
+# Badop light
+?HAS_DBM:ocamllib/database/Badop_light
+?HAS_DBM:ocamllib/database/light/Node_light
+?HAS_DBM:ocamllib/database/light/Session_light
+?HAS_DBM:ocamllib/database/light/Session_light_sig
+?HAS_DBM:ocamllib/database/light/Transaction_light
+?HAS_DBM:ocamllib/database/light/Transaction_light_sig
+?HAS_DBM:ocamllib/database/light/Db_light
+?HAS_DBM:ocamllib/database/light/Db_light_sig
+?HAS_DBM:ocamllib/database/light/Io_light
+?HAS_DBM:ocamllib/database/light/Io_light_sig
+?HAS_DBM:ocamllib/database/light/Encode_light
+?HAS_DBM:ocamllib/database/light/Mem_tree_light
+?HAS_DBM:ocamllib/database/light/Mst
+?HAS_DBM:ocamllib/database/light/KeySet
+?HAS_DBM:ocamllib/database/light/DbSig
+?HAS_DBM:ocamllib/database/light/DbmDB
View
0 compiler/libbase.mllib → ocamllib/libbase.mllib
File renamed without changes.
View
0 compiler/libirc.mllib → ocamllib/libirc.mllib
File renamed without changes.
View
0 compiler/libnet.mllib → ocamllib/libnet.mllib
File renamed without changes.
View
0 compiler/libruntime.mllib → ocamllib/libruntime.mllib
File renamed without changes.
View
0 compiler/libsecurity.mllib → ocamllib/libsecurity.mllib
File renamed without changes.
View
0 compiler/libsession.mllib → ocamllib/libsession.mllib
File renamed without changes.
View
0 compiler/libtools.mllib → ocamllib/libtools.mllib
File renamed without changes.
View
0 ocamlbase.mltop → ocamllib/ocamlbase.mltop
File renamed without changes.
View
0 compiler/oparuntime.mllib → ocamllib/oparuntime.mllib
File renamed without changes.
View
4 opa-run-js-libs.itarget
@@ -1,4 +0,0 @@
-qmljsimp/qmlJsImpClientLib.js
-qmlcps/qmlCpsClientLib.js
-qmlcps/qmlNoCpsClientLib.js
-qml2js/clientLibLib.js
View
6 tools/_tags
@@ -16,4 +16,8 @@
###
# jschecker
<jschecker>: traverse
-<opa-create/**>: traverse
+<opa-create/**>: traverse
+
+<teerex/**>: traverse
+
+<ocamldoc_plugin.{ml,byte,native}>: use_ocamldoc
View
8 tools/build/Makefile.bld
@@ -1,12 +1,12 @@
-#!/usr/bin/make
+#!/usr/bin/env make
# [ Warning ] don't use make to solve dependencies !!
#
# we rely on ocamlbuild which already handles them ; every rule should
# call it only once (more details below)
#
-# The OPA build system
+# The Opa build system
# --------------------
#
# - it's based on ocamlbuild, the Makefiles are simple wrappers on top of it
@@ -36,7 +36,7 @@
#
BUILD_DIR ?= _build
-BLDDIR ?= build
+BLDDIR ?= tools/build
MYOCAMLBUILD = $(BUILD_DIR)/myocamlbuild
OCAMLBUILD = $(MYOCAMLBUILD) -no-plugin -j 6 $(OCAMLBUILD_FLAGS)
@@ -111,6 +111,7 @@ target-libs = $(addsuffix .cmxa,$(1))
.PHONY: libs
libs: $(MYOCAMLBUILD)
+ @echo $(ALL_LIBS)
$(OCAMLBUILD) $(call target-libs,$(ALL_LIBS))
.PHONY: install-libs
@@ -152,6 +153,7 @@ copy-tools = $(foreach tool,$(1),$(copy-tool-$(tool));)
.PHONY: tools
tools: $(MYOCAMLBUILD)
+ @echo $(ALL_TOOLS)
$(OCAMLBUILD) $(call target-tools,$(ALL_TOOLS))
@$(call copy-tools,$(ALL_TOOLS))
View
11 tools/build/README
@@ -8,14 +8,15 @@ Important files:
* build_libs contains the external and internal mlstate libraries to be used
syntax:
- internal libname [dir [installdir]]
- defines library lib with source in directory dir (optional)
+ internal libname [sourcedir [installdir]]
+ defines library lib with source in directory sourcedir (optional)
there must be an according .mllib file.
- external libname [dir]
+ external libname [sourcedir]
defines an external library
-When dir is omitted, it's the name of the library. When installdir is omitted,
-it's dir. This defines the use_libname tags and the installation of these libs
+When sourcedir is omitted, it's the name of the library.
+When installdir is omitted, it's sourcedir.
+This defines the use_libname tags and the installation of these libs
in MLSTATELIBS. Lines starting with # are comments
View
2 tools/build/bld.sh
@@ -5,7 +5,7 @@ set -e
# README BEFORE EDITING THIS FILE!
#
-# This is supposed to be a portable script (Linux, Mac, and even Windows).
+# This is supposed to be a portable script (Linux, Mac and Windows).
# Due to Windows limitations, avoid complex pipes (you can pipe to an
# executable, but not to a `while' loop).
# Don't refer to absolute directories ("/tmp" is not a good idea).
View
4 tools/build/gen_myocamlbuild.sh
@@ -21,9 +21,9 @@ fi
. $CONFIG_SH
-. platform_helper.sh
+. tools/platform_helper.sh
-: ${BLDDIR:="$PWD"/build}
+: ${BLDDIR:="$PWD"/tools/build}
CONFIG_ML=config.ml
if [ ! -e $CONFIG_ML ]; then
View
5 tools/build/myocamlbuild_prefix.ml
@@ -15,6 +15,7 @@
You should have received a copy of the GNU Affero General Public License
along with OPA. If not, see <http://www.gnu.org/licenses/>.
*)
+
open Ocamlbuild_plugin
open Command
@@ -296,8 +297,8 @@ let _ = dispatch begin function
let dir = match dir with None -> lib | Some dir -> dir in
Hashtbl.add mlstate_libs_table lib ([lib],dir);
ocaml_lib ~dir lib;
- dep ["use_"^lib; "byte"] [lib^".cma"];
- dep ["use_"^lib; "native"] [lib^".cmxa"]
+ dep ["use_"^lib; "byte"] [(Pathname.dirname dir)/(lib^".cma")];
+ dep ["use_"^lib; "native"] [(Pathname.dirname dir)/(lib^".cmxa")]
(* How this works: the ~dir is only the top-level of the lib, hence
the .cmi from sub-directories are not seen. That's good, use them
for modules internal to your library *)
View
6 tools/build/myocamlbuild_suffix.ml
@@ -1,5 +1,5 @@
(*
- Copyright © 2011 MLstate
+ Copyright © 2011, 2012 MLstate
This file is part of OPA.
@@ -33,8 +33,8 @@
P (pp_script "mlstate_nodebug"),
P (pp_script "pa_ulex")
else
- P (Pathname.pwd/"utils"/"ppdebug.pl"),
- S [ P (Pathname.pwd/"utils"/"ppdebug.pl"); A "-r" ],
+ P (Pathname.pwd/"tools"/"utils"/"ppdebug.pl"),
+ S [ P (Pathname.pwd/"tools"/"utils"/"ppdebug.pl"); A "-r" ],
S [ P Config.camlp4o;
(match Config.Libdir.ulex with
| Some dir -> S [A "-I"; P dir]
View
2 tools/install_release.sh
@@ -315,7 +315,7 @@ else
fi
msg "Cleaning bin"
-for i in {bslbrowser,filepos,gen_opa_manpage,gen_opatop_manpage,genman.native,genproto,jsstat,mlidl,mlstate_platform,odep,odeplink,ofile,opa-db-server,opa-db-tool,opa-translate,opa2opa,opadep,opatop,opatrack,passdesign,ppdebug,ppdebug-opa,ppjs,qmljs,trx,trx_interpreter,wsdl2ml} ; do
+for i in {bslbrowser,filepos,gen_opa_manpage,gen_opatop_manpage,genman,genproto,jsstat,mlidl,mlstate_platform,odep,odeplink,ofile,opa-db-server,opa-db-tool,opa-translate,opa2opa,opadep,opatop,opatrack,passdesign,ppdebug,ppdebug-opa,ppjs,qmljs,trx,trx_interpreter,wsdl2ml} ; do
echo " -- Removing $INSTALLDIR/bin/$i"
rm -fv $INSTALLDIR/bin/$i
done
View
3 tools/installer/Mac/Scripts/postinstall
@@ -27,7 +27,8 @@ remove "mlstate_platform"
remove "mlidl"
remove "jsstat"
remove "genproto"
-remove "genman.native"
+remove "genman.native" # keep me, historic reason
+remove "genman"
remove "gen_opatop_manpage"
remove "gen_opa_manpage"
remove "filepos"
View
3 tools/installer/Mac/Scripts/postupgrade
@@ -27,7 +27,8 @@ remove "mlstate_platform"
remove "mlidl"
remove "jsstat"
remove "genproto"
-remove "genman.native"
+remove "genman.native" # keep me, historic reason
+remove "genman"
remove "gen_opatop_manpage"
remove "gen_opa_manpage"
remove "filepos"
View
10 tools/manpages/Makefile
@@ -4,7 +4,7 @@
# build the list of target binaries to be documented:
# bin/* and lib/opa/bin/* together with inclusions and exclusions
# --
-BLDDIR ?= ../_build
+BLDDIR ?= ../../_build
OCAMLBUILD ?= bld
BINDIR=$(BLDDIR)/bin
@@ -36,15 +36,15 @@ $(TARGETDIR)/%.1: %.man
# --
# second run specific manpage generation programs
# --
-$(BLDDIR)/opa/gen_opa_manpage.native: ../opa/gen_opa_manpage.ml
- cd ..; $(OCAMLBUILD) opa/gen_opa_manpage.native
+$(BLDDIR)/opa/gen_opa_manpage.native: ../../compiler/opa/gen_opa_manpage.ml
+ cd ../..; $(OCAMLBUILD) compiler/opa/gen_opa_manpage.native
$(TARGETDIR)/opa.1: $(BLDDIR)/opa/gen_opa_manpage.native
@mkdir -p $(TARGETDIR)
$< > $@
-$(BLDDIR)/opatop/gen_opatop_manpage.native: ../opatop/gen_opatop_manpage.ml
- cd ..; $(OCAMLBUILD) opatop/gen_opatop_manpage.native
+$(BLDDIR)/opatop/gen_opatop_manpage.native: ../../compiler/opatop/gen_opatop_manpage.ml
+ cd ../..; $(OCAMLBUILD) compiler/opatop/gen_opatop_manpage.native
$(TARGETDIR)/opatop.1: $(BLDDIR)/opatop/gen_opatop_manpage.native
@mkdir -p $(TARGETDIR)
View
0 compiler/teerex/_tags → tools/teerex/_tags
File renamed without changes.
View
0 compiler/teerex/java/_tags → tools/teerex/certified/_tags
File renamed without changes.
View
0 compiler/teerex/certified/trx2cert.ml → tools/teerex/certified/trx2cert.ml
File renamed without changes.
View
1 tools/teerex/default.trx
View
0 compiler/teerex/certified/_tags → tools/teerex/java/_tags
File renamed without changes.
View
0 compiler/teerex/java/bench.sh → tools/teerex/java/bench.sh
File renamed without changes.
View
0 compiler/teerex/java/java.mouse → tools/teerex/java/java.mouse
File renamed without changes.
View
0 compiler/teerex/java/java.trx → tools/teerex/java/java.trx
File renamed without changes.
View
0 compiler/teerex/java/java_parser.ml → tools/teerex/java/java_parser.ml
File renamed without changes.
View
0 compiler/teerex/mouse/_tags → tools/teerex/mouse/_tags
File renamed without changes.
View
0 compiler/teerex/mouse/grammar.mouse → tools/teerex/mouse/grammar.mouse
File renamed without changes.
View
0 compiler/teerex/mouse/mouse.trx → tools/teerex/mouse/mouse.trx
File renamed without changes.
View
0 compiler/teerex/mouse/mouse2trx.ml → tools/teerex/mouse/mouse2trx.ml
File renamed without changes.
View
0 compiler/teerex/mouse/mouseAst.ml → tools/teerex/mouse/mouseAst.ml
File renamed without changes.
View
0 compiler/teerex/prx.ml → tools/teerex/prx.ml
File renamed without changes.
View
0 compiler/teerex/prxparse.ml.cache → tools/teerex/prxparse.ml.cache
File renamed without changes.
View
0 compiler/teerex/prxparse.trx → tools/teerex/prxparse.trx
File renamed without changes.
View
0 compiler/teerex/tokenizer.ml.cache → tools/teerex/tokenizer.ml.cache
File renamed without changes.
View
0 compiler/teerex/tokenizer.mli.cache → tools/teerex/tokenizer.mli.cache
File renamed without changes.
View
0 compiler/teerex/tokenizer.trx → tools/teerex/tokenizer.trx
File renamed without changes.
View
0 compiler/teerex/trx_benchmarking.ods → tools/teerex/trx_benchmarking.ods
File renamed without changes.
View
0 compiler/teerex/trx_error_msg.txt → tools/teerex/trx_error_msg.txt
File renamed without changes.
View
0 compiler/teerex/trx_interpreter.ml → tools/teerex/trx_interpreter.ml
File renamed without changes.
View
0 compiler/teerex/trx_ocaml.ml → tools/teerex/trx_ocaml.ml
File renamed without changes.
View
0 tools/ocamldoc_plugin.ml → tools/utils/ocamldoc_plugin.ml
File renamed without changes.
View
0 tools/ppdebug-opa.pl → tools/utils/ppdebug-opa.pl
File renamed without changes.
View
0 tools/ppdebug.pl → tools/utils/ppdebug.pl
File renamed without changes.

0 comments on commit d863cc7

Please sign in to comment.
Something went wrong with that request. Please try again.