Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[fix] postgres: Remove apigen build code.

  • Loading branch information...
commit aec066e3e1b539e25a98671f2204d05f48c7f542 1 parent d012be3
@nrs135 nrs135 authored
Showing with 3 additions and 65 deletions.
  1. +3 −22 Makefile
  2. +0 −1  tools/_tags
  3. +0 −42 tools/build/build_rules.ml
View
25 Makefile
@@ -41,7 +41,7 @@ MYOCAMLBUILD_OPT = opabsl.qmljs.stamp
# ALL_TOOLS is built by Makefile.bld from build_tools files
.PHONY: node
node: $(MYOCAMLBUILD)
- $(OCAMLBUILD) plugins.qmljs.stamp $(call target-tools,$(ALL_TOOLS)) opa-node-packages.stamp qmljs.opa.create qmljs.apigen
+ $(OCAMLBUILD) plugins.qmljs.stamp $(call target-tools,$(ALL_TOOLS)) opa-node-packages.stamp qmljs.opa.create
@$(call copy-tools,$(ALL_TOOLS))
$(INSTALL) $(BUILD_DIR)/$(target-tool-opa-create) $(BUILD_DIR)/bin/opa-create
@@ -66,14 +66,14 @@ opa-node-packages: $(MYOCAMLBUILD)
stdlib: opa-node-packages
.PHONY: opa-tools
-opa-tools: $(MYOCAMLBUILD) opa-create apigen
+opa-tools: $(MYOCAMLBUILD) opa-create
@echo "Tools build"
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) plugins.qmljs.stamp $(call target-tools,$(DISTRIB_TOOLS)) opa-node-packages.stamp qmljs.opa.create qmljs.apigen
+ $(OCAMLBUILD) plugins.qmljs.stamp $(call target-tools,$(DISTRIB_TOOLS)) opa-node-packages.stamp qmljs.opa.create
@$(call copy-tools,$(DISTRIB_TOOLS))
##
@@ -108,25 +108,6 @@ install-opa-create:
@chmod 755 $(INSTALL_DIR)/bin/opa-create
##
-## APIGEN
-##
-
-target-tool-apigen = $(OPALANG_DIR)/tools/apigen/apigen.exe
-
-.PHONY: apigen
-apigen: $(MYOCAMLBUILD)
- $(OCAMLBUILD) $(target-tool-apigen)
- @mkdir -p $(BUILD_DIR)/bin
- $(INSTALL) $(BUILD_DIR)/$(target-tool-apigen) $(BUILD_DIR)/bin/apigen
- @chmod 755 $(BUILD_DIR)/bin/apigen
-
-.PHONY: install-apigen
-install-apigen:
- @mkdir -p $(PREFIX)/bin
- $(INSTALL) $(BUILD_DIR)/bin/apigen $(INSTALL_DIR)/bin/apigen
- @chmod 755 $(INSTALL_DIR)/bin/apigen
-
-##
## INSTALLATION
##
View
1  tools/_tags
@@ -22,7 +22,6 @@
# jschecker
<jschecker>: traverse
<opa-create/**>: traverse
-<apigen/**>: traverse
<teerex/**>: traverse
<dissemination>: traverse
View
42 tools/build/build_rules.ml
@@ -1090,48 +1090,6 @@ opa_create "opa node application creator" "qmljs.opa.create" ["opabsl.qmljs.stam
(* -- end opa-create -- *)
-
-(* -- begin apigen -- *)
-
-let apigen_prefix = prefix_me "tools/apigen/" in
-(*let apigen_src = apigen_prefix ^ ".opa" in*)
-let apigen_srcs = List.map (fun f -> P (apigen_prefix^f))
- [ "api.opa"; "config_parser.opa"; "apigen.opa"; "codegen.opa"; "messages.opa"; "types.opa" ] in
-let apigen_dst = apigen_prefix ^ "apigen.exe" in
-
-let dir_all_files dir =
- List.filter (fun p -> (not (Pathname.is_directory p))) (dirlist dir)
-in
-
-let dir_rec_all_files dir =
- let dirs = rec_subdirs [ dir ] in
- List.fold_right (fun dir acc -> dir_all_files dir @ acc) dirs []
-in
-
-let apigen name stamp deps ?(more_app_opts=[]) app_opx_dir =
-rule name
- ~deps:(deps @ tool_deps "opa-bin" @ dir_rec_all_files (prefix_me "tools/apigen"))
- ~stamp
- ~prods: [apigen_dst]
- (fun env build ->
- if no_tools then Nop
- else begin
- Cmd(S([
- (Sh ("MLSTATELIBS=\""^ build_dir ^"\""));
- get_tool "opa-bin";
- A"-o"; P apigen_dst; (*P apigen_src;*)
- A"--opx-dir"; A app_opx_dir;
- A"--no-server";
- A"--project-root"; P (Pathname.pwd ^ "/" ^ opalang_prefix); (* because the @static_resource in the stdlib expect this *)
- A"-I"; A prefixed_plugins_dir
- ] @ apigen_srcs @ more_app_opts)) end );
-in
-
-let _ = apigen "opa api generator" "qmljs.apigen" ["opabsl.qmljs.stamp"; "plugins.qmljs.stamp"] "stdlib.qmljs" in
-
-(* -- end apigen -- *)
-
-
(* -- begin misc -- *)
rule "opa bash_completion: opa-bin -> bash_completion"

0 comments on commit aec066e

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