Permalink
Browse files

wip

  • Loading branch information...
1 parent cea4b5f commit f54ec69e08aa9d6e6c856a05fe5f76531a652561 @Aqua-Ye Aqua-Ye committed Oct 3, 2012
Showing with 21 additions and 10 deletions.
  1. +9 −3 Makefile
  2. +7 −1 compiler/_tags
  3. +1 −1 compiler/{opa → }/main.ml
  4. +2 −3 compiler/opa/_tags
  5. +1 −1 tools/build/build_libs
  6. +1 −1 tools/build/build_tools
View
@@ -76,17 +76,23 @@ stdlib: opa-both-packages
stdlib-flat: opa-flat-packages
stdlib-node: opa-node-packages
-DISTRIB_TOOLS = opa-bin opa-plugin-builder-bin opa-plugin-browser-bin bslServerLib.ml # opa-cloud opa-db-server opa-db-tool opatop opa-translate
+.PHONY: opa_tools
+opa_tools:
+ifndef NO_TOOLS
+ $(MAKE) opa-create
+else
+ @echo "Not building tools"
+endif
-OPA_TOOLS = opa-create
+DISTRIB_TOOLS = opa-bin opa-plugin-builder-bin opa-plugin-browser-bin bslServerLib.ml # opa-cloud opa-db-server opa-db-tool opatop opa-translate
.PHONY: distrib
distrib: $(MYOCAMLBUILD)
$(OCAMLBUILD) $(call target-tools,$(DISTRIB_TOOLS)) opa-node-packages.stamp
@$(call copy-tools,$(DISTRIB_TOOLS))
@tools/utils/install.sh --quiet --dir $(realpath $(BUILD_DIR)) --ocaml-prefix $(OCAMLLIB)/../../.. --prefix $(realpath $(BUILD_DIR))
$(MAKE) manpages
- $(MAKE) $(OPA_TOOLS)
+ $(MAKE) opa_tools
.PHONY: distrib-all
distrib-all: $(MYOCAMLBUILD)
View
@@ -3,4 +3,10 @@
# COMPILER TAGS
#
-<{buildinfos,compilerlib,jslang,libbsl,libqmlcompil,libtrx,ocamllang,opa,opacapi,opalang,opalib,opatop,passes,passlib,pplib,protocols,qml2js,qml2ocaml,qmlcompilers,qmlcps,qmlflat,qmljsimp,qmlpasses,qmlslicer}>: traverse
+<{buildinfos,compilerlib,jslang,libbsl,libqmlcompil,libtrx,ocamllang,opa,opacapi,opalang,opalib,opatop,passes,passlib,pplib,protocols,qml2js,qml2ocaml,qmlcompilers,qmlcps,qmlflat,qmljsimp,qmlpasses,qmlslicer}>: traverse
+
+<main.ml>: use_opalib, use_opalang, use_opapasses, use_libqmlcompil, use_qml2ocaml, use_passlib, use_libbsl, use_qml2ocaml, use_qml2js, use_qmlflatcompiler, use_opa
+
+<main.{byte,native}>: thread, use_dynlink, use_graph, use_str, use_cryptokit, use_unix, use_nums, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmlflatcompiler, use_qml2ocaml, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi, use_opa
+
+<main.ml>: with_mlstate_debug
@@ -16,7 +16,7 @@
along with Opa. If not, see <http://www.gnu.org/licenses/>.
*)
-(** The main program for the OPA compiler. S3 version. *)
+(** The main program for the Opa compiler. *)
(* Opening the generic pass system. *)
module PH = PassHandler
View
@@ -58,16 +58,15 @@
# s3 main
<{s3Passes,qmljsPasses,qmlflatPasses}.{ml,mli}>: use_pplib, use_libqmlcompil, use_opalib, use_qmlslicer, use_passlib, use_opapasses, use_qml2ocaml, use_opalang, use_libbsl, use_qmlfakecompiler, use_ocamllang, use_qmlpasses, use_qml2js, use_jslang, use_qmlflatcompiler
-<{main,compiler,gen_opa_manpage}.ml>: use_opalib, use_opalang, use_opapasses, use_libqmlcompil, use_qml2ocaml, use_passlib, use_libbsl, use_qmlflatcompiler, use_qml2ocaml, use_qml2js
+<{compiler,gen_opa_manpage}.ml>: use_opalib, use_opalang, use_opapasses, use_libqmlcompil, use_qml2ocaml, use_passlib, use_libbsl, use_qml2ocaml, use_qml2js
<syntaxHelper.ml>: use_opalib, use_opalang, use_opapasses, use_libqmlcompil, use_qml2ocaml, use_passlib
# linking
-<{main,opa_parse,checkopacapi,gen_opa_manpage,syntaxHelper}.{byte,native}>: thread, use_dynlink, use_graph, use_str, use_cryptokit, use_unix, use_nums, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmlflatcompiler, use_qml2ocaml, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi
+<{opa_parse,checkopacapi,gen_opa_manpage,syntaxHelper}.{byte,native}>: thread, use_dynlink, use_graph, use_str, use_cryptokit, use_unix, use_nums, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmlflatcompiler, use_qml2ocaml, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi
<opa_InsertRemote.ml>: with_mlstate_debug
<main_utils.ml>: with_mlstate_debug
<passes.ml>: with_mlstate_debug
-<main.ml>: with_mlstate_debug
# Temporary dependencies introduced by the refactoring
# needed to remove the dependency of opalang on opalib
@@ -46,7 +46,7 @@ internal qmlflatserver compiler/qmlflat
internal qmljsimp compiler/qmljsimp
internal qmlpasses compiler/qmlpasses
internal qmlslicer compiler/qmlslicer
-# internal libopa compiler/opa
+internal opa compiler/opa
internal opabsl_for_compiler lib/plugins/opabsl.opp
internal opabsl_for_server lib/plugins/opabsl.opp
@@ -53,7 +53,7 @@ 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 compiler/opa/main.native lib/opa/bin
+internal opa-bin compiler/main.native lib/opa/bin
internal opa_bash_completion tools/bash/bash_completion share/opa

0 comments on commit f54ec69

Please sign in to comment.