v0.3.0-rc: bump version number to 0.3.0

_oasis

@@ -1,7 +1,7 @@
 OASISFormat: 0.3
 OCamlVersion:     >= 4.01.0
 Name:        openflow
-Version:     0.2.0
+Version:     0.3.0
 Synopsis:    Serialization library for OpenFlow
 Authors:     https://github.com/frenetic-lang/ocaml-openflow/contributors
 License:     LGPL
@@ -74,13 +74,13 @@ Library quickcheck
     Path: quickcheck
     Build$: flag(tests) || flag(quickcheck)
     BuildDepends:
-        quickcheck,
-        openflow
+      quickcheck,
+      openflow
     Modules:
-        Arbitrary_Base,
-        Arbitrary_OpenFlow,
-        Arbitrary_OpenFlow0x01,
-        Arbitrary_SDN_Types
+      Arbitrary_Base,
+      Arbitrary_OpenFlow,
+      Arbitrary_OpenFlow0x01,
+      Arbitrary_SDN_Types
 
 Executable testtool
   Path: test

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 872119f14ab3f21a5c84730a2ca36fe5)
+# DO NOT EDIT (digest: e1e26434aaae617000c026272165c731)
 # 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
@@ -15,131 +15,129 @@
 "_darcs": not_hygienic
 # Library openflow
 "lib/openflow.cmxs": use_openflow
+<lib/*.ml{,i}>: package(threads)
 <lib/*.ml{,i}>: package(core)
-<lib/*.ml{,i}>: package(cstruct)
-<lib/*.ml{,i}>: package(cstruct.syntax)
 <lib/*.ml{,i}>: package(packet)
 <lib/*.ml{,i}>: package(sexplib.syntax)
 <lib/*.ml{,i}>: package(str)
-<lib/*.ml{,i}>: package(threads)
+<lib/*.ml{,i}>: package(cstruct)
+<lib/*.ml{,i}>: package(cstruct.syntax)
 # Library async
 "async/async.cmxs": use_async
-<async/*.ml{,i}>: package(async)
+<async/*.ml{,i}>: use_openflow
+<async/*.ml{,i}>: package(threads)
 <async/*.ml{,i}>: package(core)
-<async/*.ml{,i}>: package(cstruct)
-<async/*.ml{,i}>: package(cstruct.async)
-<async/*.ml{,i}>: package(cstruct.syntax)
+<async/*.ml{,i}>: package(async)
 <async/*.ml{,i}>: package(packet)
+<async/*.ml{,i}>: package(cstruct.async)
 <async/*.ml{,i}>: package(sexplib.syntax)
 <async/*.ml{,i}>: package(str)
-<async/*.ml{,i}>: package(threads)
-<async/*.ml{,i}>: use_openflow
+<async/*.ml{,i}>: package(cstruct)
+<async/*.ml{,i}>: package(cstruct.syntax)
 # Library quickcheck
 "quickcheck/quickcheck.cmxs": use_quickcheck
+<quickcheck/*.ml{,i}>: use_openflow
+<quickcheck/*.ml{,i}>: package(threads)
 <quickcheck/*.ml{,i}>: package(core)
-<quickcheck/*.ml{,i}>: package(cstruct)
-<quickcheck/*.ml{,i}>: package(cstruct.syntax)
 <quickcheck/*.ml{,i}>: package(packet)
 <quickcheck/*.ml{,i}>: package(quickcheck)
 <quickcheck/*.ml{,i}>: package(sexplib.syntax)
 <quickcheck/*.ml{,i}>: package(str)
-<quickcheck/*.ml{,i}>: package(threads)
-<quickcheck/*.ml{,i}>: use_openflow
+<quickcheck/*.ml{,i}>: package(cstruct)
+<quickcheck/*.ml{,i}>: package(cstruct.syntax)
 # Executable testtool
+"test/Test.byte": use_quickcheck
+"test/Test.byte": use_openflow
+"test/Test.byte": package(threads)
 "test/Test.byte": package(core)
-"test/Test.byte": package(cstruct)
-"test/Test.byte": package(cstruct.syntax)
+"test/Test.byte": package(packet)
 "test/Test.byte": package(oUnit)
 "test/Test.byte": package(pa_ounit)
 "test/Test.byte": package(pa_ounit.syntax)
-"test/Test.byte": package(packet)
 "test/Test.byte": package(quickcheck)
 "test/Test.byte": package(sexplib.syntax)
 "test/Test.byte": package(str)
-"test/Test.byte": package(threads)
-"test/Test.byte": use_openflow
-"test/Test.byte": use_quickcheck
+"test/Test.byte": package(cstruct)
+"test/Test.byte": package(cstruct.syntax)
+<test/*.ml{,i}>: use_quickcheck
+<test/*.ml{,i}>: use_openflow
+<test/*.ml{,i}>: package(threads)
 <test/*.ml{,i}>: package(core)
-<test/*.ml{,i}>: package(cstruct)
-<test/*.ml{,i}>: package(cstruct.syntax)
+<test/*.ml{,i}>: package(packet)
 <test/*.ml{,i}>: package(oUnit)
 <test/*.ml{,i}>: package(pa_ounit)
 <test/*.ml{,i}>: package(pa_ounit.syntax)
-<test/*.ml{,i}>: package(packet)
 <test/*.ml{,i}>: package(quickcheck)
 <test/*.ml{,i}>: package(sexplib.syntax)
 <test/*.ml{,i}>: package(str)
-<test/*.ml{,i}>: package(threads)
-<test/*.ml{,i}>: use_openflow
-<test/*.ml{,i}>: use_quickcheck
+<test/*.ml{,i}>: package(cstruct)
+<test/*.ml{,i}>: package(cstruct.syntax)
 # Executable ping_test
-"ping-test/PingTest.byte": package(async)
+"ping-test/PingTest.byte": use_async
+"ping-test/PingTest.byte": use_openflow
+"ping-test/PingTest.byte": package(threads)
 "ping-test/PingTest.byte": package(core)
-"ping-test/PingTest.byte": package(cstruct)
+"ping-test/PingTest.byte": package(async)
+"ping-test/PingTest.byte": package(packet)
 "ping-test/PingTest.byte": package(cstruct.async)
-"ping-test/PingTest.byte": package(cstruct.syntax)
 "ping-test/PingTest.byte": package(oUnit)
 "ping-test/PingTest.byte": package(pa_ounit)
 "ping-test/PingTest.byte": package(pa_ounit.syntax)
-"ping-test/PingTest.byte": package(packet)
 "ping-test/PingTest.byte": package(sexplib.syntax)
 "ping-test/PingTest.byte": package(str)
-"ping-test/PingTest.byte": package(threads)
-"ping-test/PingTest.byte": use_async
-"ping-test/PingTest.byte": use_openflow
-<ping-test/*.ml{,i}>: package(async)
+"ping-test/PingTest.byte": package(cstruct)
+"ping-test/PingTest.byte": package(cstruct.syntax)
+<ping-test/*.ml{,i}>: use_async
+<ping-test/*.ml{,i}>: use_openflow
+<ping-test/*.ml{,i}>: package(threads)
 <ping-test/*.ml{,i}>: package(core)
-<ping-test/*.ml{,i}>: package(cstruct)
+<ping-test/*.ml{,i}>: package(async)
+<ping-test/*.ml{,i}>: package(packet)
 <ping-test/*.ml{,i}>: package(cstruct.async)
-<ping-test/*.ml{,i}>: package(cstruct.syntax)
 <ping-test/*.ml{,i}>: package(oUnit)
 <ping-test/*.ml{,i}>: package(pa_ounit)
 <ping-test/*.ml{,i}>: package(pa_ounit.syntax)
-<ping-test/*.ml{,i}>: package(packet)
 <ping-test/*.ml{,i}>: package(sexplib.syntax)
 <ping-test/*.ml{,i}>: package(str)
-<ping-test/*.ml{,i}>: package(threads)
-<ping-test/*.ml{,i}>: use_async
-<ping-test/*.ml{,i}>: use_openflow
+<ping-test/*.ml{,i}>: package(cstruct)
+<ping-test/*.ml{,i}>: package(cstruct.syntax)
 # Executable Hypervisor
-"examples/Hypervisor.byte": package(async)
+"examples/Hypervisor.byte": use_async
+"examples/Hypervisor.byte": use_openflow
+"examples/Hypervisor.byte": package(threads)
 "examples/Hypervisor.byte": package(core)
-"examples/Hypervisor.byte": package(cstruct)
-"examples/Hypervisor.byte": package(cstruct.async)
-"examples/Hypervisor.byte": package(cstruct.syntax)
+"examples/Hypervisor.byte": package(async)
 "examples/Hypervisor.byte": package(packet)
+"examples/Hypervisor.byte": package(cstruct.async)
 "examples/Hypervisor.byte": package(sexplib.syntax)
 "examples/Hypervisor.byte": package(str)
-"examples/Hypervisor.byte": package(threads)
-"examples/Hypervisor.byte": use_async
-"examples/Hypervisor.byte": use_openflow
+"examples/Hypervisor.byte": package(cstruct)
+"examples/Hypervisor.byte": package(cstruct.syntax)
 # Executable learning_switch
-"examples/Learning_Switch.byte": package(async)
+"examples/Learning_Switch.byte": use_async
+"examples/Learning_Switch.byte": use_openflow
+"examples/Learning_Switch.byte": package(threads)
 "examples/Learning_Switch.byte": package(core)
-"examples/Learning_Switch.byte": package(cstruct)
-"examples/Learning_Switch.byte": package(cstruct.async)
-"examples/Learning_Switch.byte": package(cstruct.syntax)
+"examples/Learning_Switch.byte": package(async)
 "examples/Learning_Switch.byte": package(packet)
+"examples/Learning_Switch.byte": package(cstruct.async)
 "examples/Learning_Switch.byte": package(sexplib.syntax)
 "examples/Learning_Switch.byte": package(str)
-"examples/Learning_Switch.byte": package(threads)
-"examples/Learning_Switch.byte": use_async
-"examples/Learning_Switch.byte": use_openflow
-<examples/*.ml{,i}>: package(async)
+"examples/Learning_Switch.byte": package(cstruct)
+"examples/Learning_Switch.byte": package(cstruct.syntax)
+<examples/*.ml{,i}>: use_async
+<examples/*.ml{,i}>: use_openflow
+<examples/*.ml{,i}>: package(threads)
 <examples/*.ml{,i}>: package(core)
-<examples/*.ml{,i}>: package(cstruct)
-<examples/*.ml{,i}>: package(cstruct.async)
-<examples/*.ml{,i}>: package(cstruct.syntax)
+<examples/*.ml{,i}>: package(async)
 <examples/*.ml{,i}>: package(packet)
+<examples/*.ml{,i}>: package(cstruct.async)
 <examples/*.ml{,i}>: package(sexplib.syntax)
 <examples/*.ml{,i}>: package(str)
-<examples/*.ml{,i}>: package(threads)
-<examples/*.ml{,i}>: use_async
-<examples/*.ml{,i}>: use_openflow
+<examples/*.ml{,i}>: package(cstruct)
+<examples/*.ml{,i}>: package(cstruct.syntax)
 # OASIS_STOP
 <lib/*.ml>: syntax_camlp4o
-<lwt/*.ml>: syntax_camlp4o
 <async/*.ml>: syntax_camlp4o
 <test/*.ml>: syntax_camlp4o
 <examples/*.ml>: syntax_camlp4o
-<of13test/*.ml>: syntax_camlp4o

lib/META

@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: 1c838b69b24adcd8387ed95f9166c840)
-version = "0.2.0"
+# DO NOT EDIT (digest: c6492aee0dc64a6c8fdb707e88fe46ef)
+version = "0.3.0"
 description = "Serialization library for OpenFlow"
 requires = "str cstruct cstruct.syntax packet core sexplib.syntax threads"
 archive(byte) = "openflow.cma"
@@ -9,7 +9,7 @@ archive(native) = "openflow.cmxa"
 archive(native, plugin) = "openflow.cmxs"
 exists_if = "openflow.cma"
 package "quickcheck" (
- version = "0.2.0"
+ version = "0.3.0"
  description = "Serialization library for OpenFlow"
  requires = "quickcheck openflow"
  archive(byte) = "quickcheck.cma"
@@ -20,7 +20,7 @@ package "quickcheck" (
 )
 
 package "async" (
- version = "0.2.0"
+ version = "0.3.0"
  description = "Serialization library for OpenFlow"
  requires = "async openflow cstruct.async threads sexplib.syntax"
  archive(byte) = "async.cma"

myocamlbuild.ml

@@ -1,5 +1,5 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 0033a12558b72c01d3b44bdf3aef3fdf) *)
+(* DO NOT EDIT (digest: e55731d28dfe72908834e5aad8131d7a) *)
 module OASISGettext = struct
 (* # 22 "src/oasis/OASISGettext.ml" *)
 
@@ -204,27 +204,26 @@ module BaseEnvLight = struct
       end
 
 
-  let rec var_expand str env =
-    let buff =
-      Buffer.create ((String.length str) * 2)
-    in
-      Buffer.add_substitute
-        buff
-        (fun var ->
-           try
-             var_expand (MapString.find var env) env
-           with Not_found ->
-             failwith
-               (Printf.sprintf
-                  "No variable %s defined when trying to expand %S."
-                  var
-                  str))
-        str;
-      Buffer.contents buff
-
-
   let var_get name env =
-    var_expand (MapString.find name env) env
+    let rec var_expand str =
+      let buff =
+        Buffer.create ((String.length str) * 2)
+      in
+        Buffer.add_substitute
+          buff
+          (fun var ->
+             try
+               var_expand (MapString.find var env)
+             with Not_found ->
+               failwith
+                 (Printf.sprintf
+                    "No variable %s defined when trying to expand %S."
+                    var
+                    str))
+          str;
+        Buffer.contents buff
+    in
+      var_expand (MapString.find name env)
 
 
   let var_choose lst env =
@@ -234,7 +233,7 @@ module BaseEnvLight = struct
 end
 
 
-# 237 "myocamlbuild.ml"
+# 236 "myocamlbuild.ml"
 module MyOCamlbuildFindlib = struct
 (* # 22 "src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
 
@@ -307,22 +306,6 @@ module MyOCamlbuildFindlib = struct
   let find_syntaxes () = ["camlp4o"; "camlp4r"]
 
 
-  let well_known_syntax = [
-    "camlp4.quotations.o";
-    "camlp4.quotations.r";
-    "camlp4.exceptiontracer";
-    "camlp4.extend";
-    "camlp4.foldgenerator";
-    "camlp4.listcomprehension";
-    "camlp4.locationstripper";
-    "camlp4.macro";
-    "camlp4.mapgenerator";
-    "camlp4.metagenerator";
-    "camlp4.profiler";
-    "camlp4.tracer"
-  ]
-
-
   let dispatch =
     function
       | Before_options ->
@@ -348,17 +331,13 @@ module MyOCamlbuildFindlib = struct
           List.iter
             begin fun pkg ->
               let base_args = [A"-package"; A pkg] in
-              (* TODO: consider how to really choose camlp4o or camlp4r. *)
               let syn_args = [A"-syntax"; A "camlp4o"] in
               let args =
-              (* Heuristic to identify syntax extensions: whether they end in
-                 ".syntax"; some might not.
-               *)
-                if Filename.check_suffix pkg "syntax" ||
-                   List.mem pkg well_known_syntax then
-                  syn_args @ base_args
-                else
-                  base_args
+          (* Heuristic to identify syntax extensions: whether they end in
+           * ".syntax"; some might not *)
+                if Filename.check_suffix pkg "syntax"
+                then syn_args @ base_args
+                else base_args
               in
               flag ["ocaml"; "compile";  "pkg_"^pkg] & S args;
               flag ["ocaml"; "ocamldep"; "pkg_"^pkg] & S args;
@@ -552,14 +531,10 @@ module MyOCamlbuildBase = struct
               (* Add flags *)
               List.iter
               (fun (tags, cond_specs) ->
-                 let spec = BaseEnvLight.var_choose cond_specs env in
-                 let rec eval_specs =
-                   function
-                     | S lst -> S (List.map eval_specs lst)
-                     | A str -> A (BaseEnvLight.var_expand str env)
-                     | spec -> spec
+                 let spec =
+                   BaseEnvLight.var_choose cond_specs env
                  in
-                   flag tags & (eval_specs spec))
+                   flag tags & spec)
               t.flags
         | _ ->
             ()
@@ -576,7 +551,7 @@ module MyOCamlbuildBase = struct
 end
 
 
-# 579 "myocamlbuild.ml"
+# 554 "myocamlbuild.ml"
 open Ocamlbuild_plugin;;
 let package_default =
   {
@@ -601,6 +576,6 @@ let package_default =
 
 let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
 
-# 605 "myocamlbuild.ml"
+# 580 "myocamlbuild.ml"
 (* OASIS_STOP *)
 Ocamlbuild_plugin.dispatch dispatch_default;;