From fd5371727638e5b67bee85821be5c5ed64bfadb9 Mon Sep 17 00:00:00 2001 From: Marco Canini Date: Tue, 14 Jan 2014 03:15:28 +0100 Subject: [PATCH] Fixing oasis. --- _oasis | 7 ------- _tags | 13 +------------ setup.ml | 34 +++------------------------------- 3 files changed, 4 insertions(+), 50 deletions(-) diff --git a/_oasis b/_oasis index 54f9e9e7f..59d2a86c0 100644 --- a/_oasis +++ b/_oasis @@ -113,13 +113,6 @@ Executable katnetic netcore, netcore.async -Executable dehop_test - Path: frenetic - MainIs: dehop_test.ml - Install$: flag(installexec) - BuildDepends: - netcore - Executable netkat_test Path: frenetic MainIs: netkat_test.ml diff --git a/_tags b/_tags index 80ea41bbb..c0c1c68d2 100644 --- a/_tags +++ b/_tags @@ -1,5 +1,5 @@ # OASIS_START -# DO NOT EDIT (digest: 3068f7ebbacda6b54aaa438a62410a81) +# DO NOT EDIT (digest: 0c5fb28fb1c1d223975619c49b74df51) # 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 @@ -104,17 +104,6 @@ : package(sexplib) : package(sexplib.syntax) : package(str) -# Executable dehop_test -"frenetic/dehop_test.byte": use_netcore -"frenetic/dehop_test.byte": package(packet) -"frenetic/dehop_test.byte": package(cstruct) -"frenetic/dehop_test.byte": package(dprle) -"frenetic/dehop_test.byte": package(ocamlgraph) -"frenetic/dehop_test.byte": package(openflow) -"frenetic/dehop_test.byte": package(topology) -"frenetic/dehop_test.byte": package(sexplib) -"frenetic/dehop_test.byte": package(sexplib.syntax) -"frenetic/dehop_test.byte": package(str) # Executable netkat_test "frenetic/netkat_test.byte": use_async "frenetic/netkat_test.byte": use_netcore diff --git a/setup.ml b/setup.ml index ef17586d6..b5d6319d0 100644 --- a/setup.ml +++ b/setup.ml @@ -1,7 +1,7 @@ (* setup.ml generated for the first time by OASIS v0.3.0 *) (* OASIS_START *) -(* DO NOT EDIT (digest: c108ac5327ccd0f13e83ec8c0daff74d) *) +(* DO NOT EDIT (digest: b1ce403f0cd63fb046e26edfe3da8583) *) (* Regenerated by OASIS v0.4.1 Visit http://oasis.forge.ocamlcore.org for more information and @@ -7085,34 +7085,6 @@ let setup_t = bs_nativeopt = [(OASISExpr.EBool true, [])] }, {exec_custom = false; exec_main_is = "katnetic.ml"}); - Executable - ({ - cs_name = "dehop_test"; - cs_data = PropList.Data.create (); - cs_plugin_data = [] - }, - { - bs_build = [(OASISExpr.EBool true, true)]; - bs_install = - [ - (OASISExpr.EBool true, false); - (OASISExpr.EFlag "installexec", true) - ]; - bs_path = "frenetic"; - bs_compiled_object = Byte; - bs_build_depends = [InternalLibrary "netcore"]; - bs_build_tools = - [ExternalTool "ocamlbuild"; ExternalTool "ocamldoc"]; - bs_c_sources = []; - bs_data_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, [])] - }, - {exec_custom = false; exec_main_is = "dehop_test.ml"}); Executable ({ cs_name = "netkat_test"; @@ -7222,7 +7194,7 @@ let setup_t = }; oasis_fn = Some "_oasis"; oasis_version = "0.4.1"; - oasis_digest = Some "jboP1\170 ?\028B\212\\\157s\217l"; + oasis_digest = Some "\214\155\r\"(\173\150\189\249\186\148\b\227\221)."; oasis_exec = None; oasis_setup_args = []; setup_update = false @@ -7230,6 +7202,6 @@ let setup_t = let setup () = BaseSetup.setup setup_t;; -# 7234 "setup.ml" +# 7206 "setup.ml" (* OASIS_STOP *) let () = setup ();;