From 60a7ebd70cdc70baff55b7ee63a042b8943fcc7e Mon Sep 17 00:00:00 2001 From: ygrek Date: Sat, 30 Sep 2017 22:57:35 -0700 Subject: [PATCH] build: really do not require mysql and sqlite3 --- _oasis | 6 +++--- _tags | 15 ++++++++------- demo/build | 6 +++--- demo/build.cmd | 2 +- impl/{ => ocaml/mysql}/sqlgg_mysql.ml | 0 impl/{ => ocaml/mysql}/sqlgg_mysql.mldylib | 0 impl/{ => ocaml/mysql}/sqlgg_mysql.mllib | 0 impl/{ => ocaml}/sqlgg_traits.ml | 0 impl/{ => ocaml}/sqlgg_traits.mldylib | 0 impl/{ => ocaml}/sqlgg_traits.mllib | 0 impl/{ => ocaml/sqlite3}/sqlgg_sqlite3.ml | 0 impl/{ => ocaml/sqlite3}/sqlgg_sqlite3.mldylib | 0 impl/{ => ocaml/sqlite3}/sqlgg_sqlite3.mllib | 0 myocamlbuild.ml | 17 +++++++++++------ setup.ml | 13 ++++++------- 15 files changed, 32 insertions(+), 27 deletions(-) rename impl/{ => ocaml/mysql}/sqlgg_mysql.ml (100%) rename impl/{ => ocaml/mysql}/sqlgg_mysql.mldylib (100%) rename impl/{ => ocaml/mysql}/sqlgg_mysql.mllib (100%) rename impl/{ => ocaml}/sqlgg_traits.ml (100%) rename impl/{ => ocaml}/sqlgg_traits.mldylib (100%) rename impl/{ => ocaml}/sqlgg_traits.mllib (100%) rename impl/{ => ocaml/sqlite3}/sqlgg_sqlite3.ml (100%) rename impl/{ => ocaml/sqlite3}/sqlgg_sqlite3.mldylib (100%) rename impl/{ => ocaml/sqlite3}/sqlgg_sqlite3.mllib (100%) diff --git a/_oasis b/_oasis index cc0ce2b..b225150 100644 --- a/_oasis +++ b/_oasis @@ -30,7 +30,7 @@ Library sqlgg BuildDepends: extlib, deriving Library sqlgg_traits - Path: impl/ + Path: impl/ocaml/ Modules: Sqlgg_traits FindlibName: traits FindlibParent: sqlgg @@ -45,7 +45,7 @@ Flag sqlite3 Library sqlgg_mysql Build$: flag(mysql) - Path: impl/ + Path: impl/ocaml/mysql Modules: Sqlgg_mysql BuildDepends: mysql, sqlgg.traits FindlibName: mysql @@ -53,7 +53,7 @@ Library sqlgg_mysql Library sqlgg_sqlite3 Build$: flag(sqlite3) - Path: impl/ + Path: impl/ocaml/sqlite3 Modules: Sqlgg_sqlite3 BuildDepends: sqlite3, sqlgg.traits FindlibName: sqlite3 diff --git a/_tags b/_tags index ff8fa53..51237f7 100644 --- a/_tags +++ b/_tags @@ -1,5 +1,5 @@ # OASIS_START -# DO NOT EDIT (digest: 8ab06ee0b3001b2b21a3e3de45fd123d) +# DO NOT EDIT (digest: ca774f53d77e791de33c5a3c14d97170) # Ignore VCS directories, you can use the same kind of rule outside # OASIS_START/STOP if you want to exclude directories that contains # useless stuff for the build process @@ -34,14 +34,15 @@ true: annot, bin_annot : package(oUnit) : use_sqlgg # Library sqlgg_traits -"impl/sqlgg_traits.cmxs": use_sqlgg_traits +"impl/ocaml/sqlgg_traits.cmxs": use_sqlgg_traits # Library sqlgg_mysql -"impl/sqlgg_mysql.cmxs": use_sqlgg_mysql -: package(mysql) +"impl/ocaml/mysql/sqlgg_mysql.cmxs": use_sqlgg_mysql +: package(mysql) +: use_sqlgg_traits # Library sqlgg_sqlite3 -"impl/sqlgg_sqlite3.cmxs": use_sqlgg_sqlite3 -: package(sqlite3) -: use_sqlgg_traits +"impl/ocaml/sqlite3/sqlgg_sqlite3.cmxs": use_sqlgg_sqlite3 +: package(sqlite3) +: use_sqlgg_traits # OASIS_STOP true: annot, warn(+A-e-40-41-42-44-45) true: use_menhir diff --git a/demo/build b/demo/build index 7cf5984..fdfdf3a 100755 --- a/demo/build +++ b/demo/build @@ -15,11 +15,11 @@ sqlgg -gen csharp demo_mysql.sql > demo_csharp_gen.cs g++ -Wall -DSQLGG_DEBUG -g -o demo_cxx demo_cxx.cpp -lsqlite3 -ocamlfind ocamlc -linkpkg -package sqlite3 -w Alse -g -o demo_caml -I ../impl ../impl/sqlgg_sqlite3.ml ../impl/sqlgg_traits.ml demo_caml_gen.ml demo_caml.ml +ocamlfind ocamlc -linkpkg -package sqlite3 -w Alse -g -o demo_caml -I ../impl/ocaml -I ../impl/ocaml/sqlite3 ../impl/ocaml/sqlite3/sqlgg_sqlite3.ml ../impl/ocaml/sqlgg_traits.ml demo_caml_gen.ml demo_caml.ml # requires ocaml-mysql >= 1.1.0 -ocamlfind ocamlc -linkpkg -package mysql -w Alse -g -o demo_caml_mysql -I ../impl ../impl/sqlgg_mysql.ml ../impl/sqlgg_traits.ml demo_caml_gen_mysql.ml demo_caml_mysql.ml +ocamlfind ocamlc -linkpkg -package mysql -w Alse -g -o demo_caml_mysql -I ../impl/ocaml -I ../impl/ocaml/mysql ../impl/ocaml/mysql/sqlgg_mysql.ml ../impl/ocaml/sqlgg_traits.ml demo_caml_gen_mysql.ml demo_caml_mysql.ml -g++ -Wall -DSQLGG_DEBUG -g -o demo_cxx_mysql demo_cxx_mysql.cpp -lmysqlclient +g++ -Wall -DSQLGG_DEBUG -g -o demo_cxx_mysql demo_cxx_mysql.cpp -lmariadbclient javac demo_java.java diff --git a/demo/build.cmd b/demo/build.cmd index e27fc0d..d13a05e 100644 --- a/demo/build.cmd +++ b/demo/build.cmd @@ -9,7 +9,7 @@ cl /c /MDd /D_UNICODE /D_DEBUG /W4 /Zc:forScope,wchar_t /EHsc demo_cxx.cpp link /DEBUG demo_cxx.obj sqlite3.lib -ocamlfind ocamlc -linkpkg -package sqlite3 -w Alse -g -o demo_caml -I ../impl ../impl/sqlgg_sqlite3.ml ../impl/sqlgg_traits.ml demo_caml_gen.ml demo_caml.ml +ocamlfind ocamlc -linkpkg -package sqlite3 -w Alse -g -o demo_caml -I ../impl/ocaml -I ../impl/ocaml/sqlite3 ../impl/sqlgg_sqlite3.ml ../impl/sqlgg_traits.ml demo_caml_gen.ml demo_caml.ml cl /c /MDd /D_UNICODE /D_DEBUG /W4 /Zc:forScope,wchar_t /EHsc demo_cxx_mysql.cpp link /DEBUG demo_cxx_mysql.obj libmysqlclient.lib diff --git a/impl/sqlgg_mysql.ml b/impl/ocaml/mysql/sqlgg_mysql.ml similarity index 100% rename from impl/sqlgg_mysql.ml rename to impl/ocaml/mysql/sqlgg_mysql.ml diff --git a/impl/sqlgg_mysql.mldylib b/impl/ocaml/mysql/sqlgg_mysql.mldylib similarity index 100% rename from impl/sqlgg_mysql.mldylib rename to impl/ocaml/mysql/sqlgg_mysql.mldylib diff --git a/impl/sqlgg_mysql.mllib b/impl/ocaml/mysql/sqlgg_mysql.mllib similarity index 100% rename from impl/sqlgg_mysql.mllib rename to impl/ocaml/mysql/sqlgg_mysql.mllib diff --git a/impl/sqlgg_traits.ml b/impl/ocaml/sqlgg_traits.ml similarity index 100% rename from impl/sqlgg_traits.ml rename to impl/ocaml/sqlgg_traits.ml diff --git a/impl/sqlgg_traits.mldylib b/impl/ocaml/sqlgg_traits.mldylib similarity index 100% rename from impl/sqlgg_traits.mldylib rename to impl/ocaml/sqlgg_traits.mldylib diff --git a/impl/sqlgg_traits.mllib b/impl/ocaml/sqlgg_traits.mllib similarity index 100% rename from impl/sqlgg_traits.mllib rename to impl/ocaml/sqlgg_traits.mllib diff --git a/impl/sqlgg_sqlite3.ml b/impl/ocaml/sqlite3/sqlgg_sqlite3.ml similarity index 100% rename from impl/sqlgg_sqlite3.ml rename to impl/ocaml/sqlite3/sqlgg_sqlite3.ml diff --git a/impl/sqlgg_sqlite3.mldylib b/impl/ocaml/sqlite3/sqlgg_sqlite3.mldylib similarity index 100% rename from impl/sqlgg_sqlite3.mldylib rename to impl/ocaml/sqlite3/sqlgg_sqlite3.mldylib diff --git a/impl/sqlgg_sqlite3.mllib b/impl/ocaml/sqlite3/sqlgg_sqlite3.mllib similarity index 100% rename from impl/sqlgg_sqlite3.mllib rename to impl/ocaml/sqlite3/sqlgg_sqlite3.mllib diff --git a/myocamlbuild.ml b/myocamlbuild.ml index a7d4641..f044f92 100644 --- a/myocamlbuild.ml +++ b/myocamlbuild.ml @@ -1,5 +1,5 @@ (* OASIS_START *) -(* DO NOT EDIT (digest: 8b06a149b2b4ad6a825f18b1e522a831) *) +(* DO NOT EDIT (digest: 7cf10622f927c47688300149522910b4) *) module OASISGettext = struct (* # 22 "src/oasis/OASISGettext.ml" *) @@ -882,13 +882,18 @@ let package_default = MyOCamlbuildBase.lib_ocaml = [ ("sqlgg", ["lib"], []); - ("sqlgg_traits", ["impl"], []); - ("sqlgg_mysql", ["impl"], []); - ("sqlgg_sqlite3", ["impl"], []) + ("sqlgg_traits", ["impl/ocaml"], []); + ("sqlgg_mysql", ["impl/ocaml/mysql"], []); + ("sqlgg_sqlite3", ["impl/ocaml/sqlite3"], []) ]; lib_c = []; flags = []; - includes = [("src", ["lib"])] + includes = + [ + ("src", ["lib"]); + ("impl/ocaml/sqlite3", ["impl/ocaml"]); + ("impl/ocaml/mysql", ["impl/ocaml"]) + ] } ;; @@ -896,6 +901,6 @@ let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false} let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;; -# 900 "myocamlbuild.ml" +# 905 "myocamlbuild.ml" (* OASIS_STOP *) Ocamlbuild_plugin.dispatch dispatch_default;; diff --git a/setup.ml b/setup.ml index c421401..780d045 100644 --- a/setup.ml +++ b/setup.ml @@ -1,7 +1,7 @@ (* setup.ml generated for the first time by OASIS v0.4.4 *) (* OASIS_START *) -(* DO NOT EDIT (digest: f0e3d5a4fc4b32f2c7996f48e87eb8ae) *) +(* DO NOT EDIT (digest: dca7d53a1a276135f7aef6a8d3217dcd) *) (* Regenerated by OASIS v0.4.10 Visit http://oasis.forge.ocamlcore.org for more information and @@ -7375,7 +7375,7 @@ let setup_t = { bs_build = [(OASISExpr.EBool true, true)]; bs_install = [(OASISExpr.EBool true, true)]; - bs_path = "impl/"; + bs_path = "impl/ocaml/"; bs_compiled_object = Best; bs_build_depends = []; bs_build_tools = @@ -7548,7 +7548,7 @@ let setup_t = (OASISExpr.EFlag "mysql", true) ]; bs_install = [(OASISExpr.EBool true, true)]; - bs_path = "impl/"; + bs_path = "impl/ocaml/mysql"; bs_compiled_object = Best; bs_build_depends = [ @@ -7703,7 +7703,7 @@ let setup_t = (OASISExpr.EFlag "sqlite3", true) ]; bs_install = [(OASISExpr.EBool true, true)]; - bs_path = "impl/"; + bs_path = "impl/ocaml/sqlite3"; bs_compiled_object = Best; bs_build_depends = [ @@ -7960,8 +7960,7 @@ let setup_t = }; oasis_fn = Some "_oasis"; oasis_version = "0.4.10"; - oasis_digest = - Some "\212\134\r\151\255\222\235\2515\173\139p\019)\183\249"; + oasis_digest = Some "\198\024\237~\211\029\182\239T6\1427\136\165\250A"; oasis_exec = None; oasis_setup_args = []; setup_update = false @@ -7969,7 +7968,7 @@ let setup_t = let setup () = BaseSetup.setup setup_t;; -# 7973 "setup.ml" +# 7972 "setup.ml" let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t open BaseCompat.Compat_0_4 (* OASIS_STOP *) -- 2.11.4.GIT