Skip to content

Commit

Permalink
Make sure opam pin add bamboo .; opam install works
Browse files Browse the repository at this point in the history
  • Loading branch information
@pirapira
pirapira committed May 3, 2018
1 parent 9e16b27 commit 92c87ce
Show file tree
Hide file tree
Showing 19 changed files with 256 additions and 20 deletions.
9 changes: 7 additions & 2 deletions _oasis
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,17 @@ Library basics
Install: false
BuildTools: ocamlbuild
Modules: Assoc, Hexa, Label, Misc, Storage
BuildDepends: batteries,rope
BuildDepends: cross-platform
Library cross-platform
Path: src/cross-platform-for-ocamlbuild
BuildTools: ocamlbuild
Modules: WrapBn, WrapCryptokit, WrapList, WrapString, WrapOption
BuildDepends: batteries,rope,cryptokit (>= 1.12),hex
Library codegen
Path: src/codegen
Install: false
BuildTools: ocamlbuild
Modules: CodegenEnv, Codegen, EntrypointDatabase, CompileFile,
Modules: CodegenEnv, Codegen, EntrypointDatabase,
LayoutInfo, LocationEnv, Parse
BuildDepends: basics, ast, parse
Library parse
Expand Down
20 changes: 19 additions & 1 deletion _tags
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# OASIS_START
# DO NOT EDIT (digest: 2a2127f33ba3796438e6a561b562f590)
# DO NOT EDIT (digest: c348eeadfb15aa1af2d805f976b82290)
# 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
Expand All @@ -14,17 +14,27 @@ true: annot, bin_annot
".git": not_hygienic
"_darcs": -traverse
"_darcs": not_hygienic
# Library cross-platform
"src/cross-platform-for-ocamlbuild/cross-platform.cmxs": use_cross-platform
<src/cross-platform-for-ocamlbuild/*.ml{,i,y}>: pkg_batteries
<src/cross-platform-for-ocamlbuild/*.ml{,i,y}>: pkg_cryptokit
<src/cross-platform-for-ocamlbuild/*.ml{,i,y}>: pkg_hex
<src/cross-platform-for-ocamlbuild/*.ml{,i,y}>: pkg_rope
# Library basics
"src/basics/basics.cmxs": use_basics
<src/basics/*.ml{,i,y}>: pkg_batteries
<src/basics/*.ml{,i,y}>: pkg_cryptokit
<src/basics/*.ml{,i,y}>: pkg_hex
<src/basics/*.ml{,i,y}>: pkg_rope
<src/basics/*.ml{,i,y}>: use_cross-platform
# Library ast
"src/ast/ast.cmxs": use_ast
<src/ast/*.ml{,i,y}>: pkg_batteries
<src/ast/*.ml{,i,y}>: pkg_cryptokit
<src/ast/*.ml{,i,y}>: pkg_hex
<src/ast/*.ml{,i,y}>: pkg_rope
<src/ast/*.ml{,i,y}>: use_basics
<src/ast/*.ml{,i,y}>: use_cross-platform
# Library parse
"src/parse/parse.cmxs": use_parse
<src/parse/*.ml{,i,y}>: pkg_batteries
Expand All @@ -34,6 +44,7 @@ true: annot, bin_annot
<src/parse/*.ml{,i,y}>: pkg_rope
<src/parse/*.ml{,i,y}>: use_ast
<src/parse/*.ml{,i,y}>: use_basics
<src/parse/*.ml{,i,y}>: use_cross-platform
# Library codegen
"src/codegen/codegen.cmxs": use_codegen
<src/codegen/*.ml{,i,y}>: pkg_batteries
Expand All @@ -43,6 +54,7 @@ true: annot, bin_annot
<src/codegen/*.ml{,i,y}>: pkg_rope
<src/codegen/*.ml{,i,y}>: use_ast
<src/codegen/*.ml{,i,y}>: use_basics
<src/codegen/*.ml{,i,y}>: use_cross-platform
<src/codegen/*.ml{,i,y}>: use_parse
# Executable bamboo
<src/exec/bamboo.{native,byte}>: pkg_batteries
Expand All @@ -53,6 +65,7 @@ true: annot, bin_annot
<src/exec/bamboo.{native,byte}>: use_ast
<src/exec/bamboo.{native,byte}>: use_basics
<src/exec/bamboo.{native,byte}>: use_codegen
<src/exec/bamboo.{native,byte}>: use_cross-platform
<src/exec/bamboo.{native,byte}>: use_parse
<src/exec/*.ml{,i,y}>: pkg_batteries
<src/exec/*.ml{,i,y}>: pkg_cryptokit
Expand All @@ -62,6 +75,11 @@ true: annot, bin_annot
<src/exec/*.ml{,i,y}>: use_ast
<src/exec/*.ml{,i,y}>: use_basics
<src/exec/*.ml{,i,y}>: use_codegen
<src/exec/*.ml{,i,y}>: use_cross-platform
<src/exec/*.ml{,i,y}>: use_parse
# OASIS_STOP
true: use_menhir
<bamboo-tests>: -traverse
<lib/bs>: -traverse
<node_modules>: -traverse
<batteries-included>: -traverse
6 changes: 4 additions & 2 deletions myocamlbuild.ml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(* OASIS_START *)
(* DO NOT EDIT (digest: ed367f6b6d3394fb533b5259e201518f) *)
(* DO NOT EDIT (digest: 9311c1947cc1275785273cf40407014e) *)
module OASISGettext = struct
(* # 22 "src/oasis/OASISGettext.ml" *)

Expand Down Expand Up @@ -881,6 +881,7 @@ let package_default =
{
MyOCamlbuildBase.lib_ocaml =
[
("cross-platform", ["src/cross-platform-for-ocamlbuild"], []);
("basics", ["src/basics"], []);
("ast", ["src/ast"], []);
("parse", ["src/parse"], []);
Expand All @@ -893,6 +894,7 @@ let package_default =
("src/parse", ["src/ast"]);
("src/exec", ["src/codegen"; "src/parse"]);
("src/codegen", ["src/ast"; "src/basics"; "src/parse"]);
("src/basics", ["src/cross-platform-for-ocamlbuild"]);
("src/ast", ["src/basics"])
]
}
Expand All @@ -902,6 +904,6 @@ let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false}

let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;;

# 906 "myocamlbuild.ml"
# 908 "myocamlbuild.ml"
(* OASIS_STOP *)
Ocamlbuild_plugin.dispatch dispatch_default;;
1 change: 1 addition & 0 deletions opam/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ homepage: "https://github.com/pirapira/bamboo"
dev-repo: "https://github.com/pirapira/bamboo.git"
bug-reports: "https://github.com/pirapira/bamboo/issues"
build: [
["rm" "-f" "src/parse/parser.ml" "src/parse/parser.mli" "src/parse/lexer.ml"]
["ocaml" "setup.ml" "-configure" "--prefix" prefix]
["ocaml" "setup.ml" "-build"]
]
Expand Down
169 changes: 160 additions & 9 deletions setup.ml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.4.10 *)

(* OASIS_START *)
(* DO NOT EDIT (digest: 639a87473c5ab280948327ec3666bea9) *)
(* DO NOT EDIT (digest: 53e026714604793ac4d1c1af4a51f84c) *)
(*
Regenerated by OASIS v0.4.10
Visit http://oasis.forge.ocamlcore.org for more information and
Expand Down Expand Up @@ -6904,20 +6904,173 @@ let setup_t =
});
Library
({
cs_name = "basics";
cs_name = "cross-platform";
cs_data = PropList.Data.create ();
cs_plugin_data = []
},
{
bs_build = [(OASISExpr.EBool true, true)];
bs_install = [(OASISExpr.EBool true, false)];
bs_path = "src/basics";
bs_install = [(OASISExpr.EBool true, true)];
bs_path = "src/cross-platform-for-ocamlbuild";
bs_compiled_object = Best;
bs_build_depends =
[
FindlibPackage ("batteries", None);
FindlibPackage ("rope", None)
FindlibPackage ("rope", None);
FindlibPackage
("cryptokit",
Some (OASISVersion.VGreaterEqual "1.12"));
FindlibPackage ("hex", None)
];
bs_build_tools = [ExternalTool "ocamlbuild"];
bs_interface_patterns =
[
{
OASISSourcePatterns.Templater.atoms =
[
OASISSourcePatterns.Templater.Text "";
OASISSourcePatterns.Templater.Expr
(OASISSourcePatterns.Templater.Call
("capitalize_file",
OASISSourcePatterns.Templater.Ident
"module"));
OASISSourcePatterns.Templater.Text ".mli"
];
origin = "${capitalize_file module}.mli"
};
{
OASISSourcePatterns.Templater.atoms =
[
OASISSourcePatterns.Templater.Text "";
OASISSourcePatterns.Templater.Expr
(OASISSourcePatterns.Templater.Call
("uncapitalize_file",
OASISSourcePatterns.Templater.Ident
"module"));
OASISSourcePatterns.Templater.Text ".mli"
];
origin = "${uncapitalize_file module}.mli"
}
];
bs_implementation_patterns =
[
{
OASISSourcePatterns.Templater.atoms =
[
OASISSourcePatterns.Templater.Text "";
OASISSourcePatterns.Templater.Expr
(OASISSourcePatterns.Templater.Call
("capitalize_file",
OASISSourcePatterns.Templater.Ident
"module"));
OASISSourcePatterns.Templater.Text ".ml"
];
origin = "${capitalize_file module}.ml"
};
{
OASISSourcePatterns.Templater.atoms =
[
OASISSourcePatterns.Templater.Text "";
OASISSourcePatterns.Templater.Expr
(OASISSourcePatterns.Templater.Call
("uncapitalize_file",
OASISSourcePatterns.Templater.Ident
"module"));
OASISSourcePatterns.Templater.Text ".ml"
];
origin = "${uncapitalize_file module}.ml"
};
{
OASISSourcePatterns.Templater.atoms =
[
OASISSourcePatterns.Templater.Text "";
OASISSourcePatterns.Templater.Expr
(OASISSourcePatterns.Templater.Call
("capitalize_file",
OASISSourcePatterns.Templater.Ident
"module"));
OASISSourcePatterns.Templater.Text ".mll"
];
origin = "${capitalize_file module}.mll"
};
{
OASISSourcePatterns.Templater.atoms =
[
OASISSourcePatterns.Templater.Text "";
OASISSourcePatterns.Templater.Expr
(OASISSourcePatterns.Templater.Call
("uncapitalize_file",
OASISSourcePatterns.Templater.Ident
"module"));
OASISSourcePatterns.Templater.Text ".mll"
];
origin = "${uncapitalize_file module}.mll"
};
{
OASISSourcePatterns.Templater.atoms =
[
OASISSourcePatterns.Templater.Text "";
OASISSourcePatterns.Templater.Expr
(OASISSourcePatterns.Templater.Call
("capitalize_file",
OASISSourcePatterns.Templater.Ident
"module"));
OASISSourcePatterns.Templater.Text ".mly"
];
origin = "${capitalize_file module}.mly"
};
{
OASISSourcePatterns.Templater.atoms =
[
OASISSourcePatterns.Templater.Text "";
OASISSourcePatterns.Templater.Expr
(OASISSourcePatterns.Templater.Call
("uncapitalize_file",
OASISSourcePatterns.Templater.Ident
"module"));
OASISSourcePatterns.Templater.Text ".mly"
];
origin = "${uncapitalize_file module}.mly"
}
];
bs_c_sources = [];
bs_data_files = [];
bs_findlib_extra_files = [];
bs_ccopt = [(OASISExpr.EBool true, [])];
bs_cclib = [(OASISExpr.EBool true, [])];
bs_dlllib = [(OASISExpr.EBool true, [])];
bs_dllpath = [(OASISExpr.EBool true, [])];
bs_byteopt = [(OASISExpr.EBool true, [])];
bs_nativeopt = [(OASISExpr.EBool true, [])]
},
{
lib_modules =
[
"WrapBn";
"WrapCryptokit";
"WrapList";
"WrapString";
"WrapOption"
];
lib_pack = false;
lib_internal_modules = [];
lib_findlib_parent = None;
lib_findlib_name = None;
lib_findlib_directory = None;
lib_findlib_containers = []
});
Library
({
cs_name = "basics";
cs_data = PropList.Data.create ();
cs_plugin_data = []
},
{
bs_build = [(OASISExpr.EBool true, true)];
bs_install = [(OASISExpr.EBool true, false)];
bs_path = "src/basics";
bs_compiled_object = Best;
bs_build_depends = [InternalLibrary "cross-platform"];
bs_build_tools = [ExternalTool "ocamlbuild"];
bs_interface_patterns =
[
Expand Down Expand Up @@ -7498,7 +7651,6 @@ let setup_t =
"CodegenEnv";
"Codegen";
"EntrypointDatabase";
"CompileFile";
"LayoutInfo";
"LocationEnv";
"Parse"
Expand Down Expand Up @@ -7686,16 +7838,15 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.10";
oasis_digest =
Some "\130\192G\144\244\215\130%X7\218\208\176\004\177\248";
oasis_digest = Some "{K\187i\187\193\237\184I\179\007\001]\226\027\006";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
};;

let setup () = BaseSetup.setup setup_t;;

# 7699 "setup.ml"
# 7850 "setup.ml"
let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t
open BaseCompat.Compat_0_4
(* OASIS_STOP *)
Expand Down
4 changes: 2 additions & 2 deletions src/basics/META
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# OASIS_START
# DO NOT EDIT (digest: d72151c45549e73b4697cb225d63d8a9)
# DO NOT EDIT (digest: 1e148fc7a95f09ac91c6e50835fab954)
version = "0.0.02"
description = "A compiler targeting Ethereum Virtual Machine"
requires = "batteries rope"
requires = "cross-platform"
archive(byte) = "basics.cma"
archive(byte, plugin) = "basics.cma"
archive(native) = "basics.cmxa"
Expand Down
3 changes: 1 addition & 2 deletions src/codegen/codegen.mldylib
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# OASIS_START
# DO NOT EDIT (digest: 2f70e8243507557eb8e2a11c17ea5f02)
# DO NOT EDIT (digest: 2e0624f260757657eae4c2d0f51f273f)
CodegenEnv
Codegen
EntrypointDatabase
CompileFile
LayoutInfo
LocationEnv
Parse
Expand Down
3 changes: 1 addition & 2 deletions src/codegen/codegen.mllib
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# OASIS_START
# DO NOT EDIT (digest: 2f70e8243507557eb8e2a11c17ea5f02)
# DO NOT EDIT (digest: 2e0624f260757657eae4c2d0f51f273f)
CodegenEnv
Codegen
EntrypointDatabase
CompileFile
LayoutInfo
LocationEnv
Parse
Expand Down
12 changes: 12 additions & 0 deletions src/cross-platform-for-ocamlbuild/META
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# OASIS_START
# DO NOT EDIT (digest: b2fffa926a7abefedbea94f41fa7edfe)
version = "0.0.02"
description = "A compiler targeting Ethereum Virtual Machine"
requires = "batteries rope cryptokit hex"
archive(byte) = "cross-platform.cma"
archive(byte, plugin) = "cross-platform.cma"
archive(native) = "cross-platform.cmxa"
archive(native, plugin) = "cross-platform.cmxs"
exists_if = "cross-platform.cma"
# OASIS_STOP

8 changes: 8 additions & 0 deletions src/cross-platform-for-ocamlbuild/cross-platform.mldylib
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# OASIS_START
# DO NOT EDIT (digest: 5f3e3f97fec314fba146c24e67ee5ea3)
WrapBn
WrapCryptokit
WrapList
WrapString
WrapOption
# OASIS_STOP
Loading

0 comments on commit 92c87ce

Please sign in to comment.