Version bump and cleanup

Author: Arjun Guha

.travis-ci.sh

@@ -1,31 +1,41 @@
-all: build
+# OASIS_START
+# DO NOT EDIT (digest: a3c674b4239234cbbe53afe090018954)
 
-ASYNC ?= $(shell if ocamlfind query async >/dev/null 2>&1; then echo --enable-async; else echo --disable-async; fi)
-# Implies --enable-quickcheck
-TESTS ?= $(shell if ocamlfind query quickcheck >/dev/null 2>&1; then echo --enable-tests; else echo --disable-tests; fi)
+SETUP = ocaml setup.ml
 
-NAME=openflow
-J=4
+build: setup.data
+	$(SETUP) -build $(BUILDFLAGS)
 
-setup.ml: _oasis
-	oasis setup
+doc: setup.data build
+	$(SETUP) -doc $(DOCFLAGS)
 
-setup.data: setup.ml
-	ocaml setup.ml -configure $(ASYNC) $(TESTS)
+test: setup.data build
+	$(SETUP) -test $(TESTFLAGS)
 
-build: setup.data setup.ml
-	ocaml setup.ml -build -j $(J)
+all:
+	$(SETUP) -all $(ALLFLAGS)
 
-install: setup.data setup.ml
-	ocaml setup.ml -install
+install: setup.data
+	$(SETUP) -install $(INSTALLFLAGS)
 
-test: setup.ml build
-	_build/test/Test.byte inline-test-runner openflow
+uninstall: setup.data
+	$(SETUP) -uninstall $(UNINSTALLFLAGS)
 
-reinstall: setup.ml
-	ocamlfind remove $(NAME) || true
-	ocaml setup.ml -reinstall
+reinstall: setup.data
+	$(SETUP) -reinstall $(REINSTALLFLAGS)
 
 clean:
-	ocamlbuild -clean
-	rm -f setup.data setup.log
+	$(SETUP) -clean $(CLEANFLAGS)
+
+distclean:
+	$(SETUP) -distclean $(DISTCLEANFLAGS)
+
+setup.data:
+	$(SETUP) -configure $(CONFIGUREFLAGS)
+
+configure:
+	$(SETUP) -configure $(CONFIGUREFLAGS)
+
+.PHONY: build doc test all install uninstall reinstall clean distclean configure
+
+# OASIS_STOP

Makefile

@@ -1,22 +1,14 @@
 OASISFormat: 0.3
 OCamlVersion:     >= 4.01.0
 Name:        openflow
-Version:     0.7.0
+Version:     0.8.0
 Synopsis:    Serialization library for OpenFlow
 Authors:     https://github.com/frenetic-lang/ocaml-openflow/contributors
 License:     LGPL
-Plugins:     META (0.3)
+Plugins:     META (0.3), DevFiles (0.3)
 BuildTools:
   ocamlbuild
 
-Flag quickcheck
-    Description: build the openflow.quickcheck library
-    Default: false
-
-Flag async
-    Description: build the openflow.async library
-    Default: false
-
 Library openflow
   Path: lib
   BuildDepends:
@@ -50,7 +42,6 @@ Library async
   Findlibparent: openflow
   Findlibname: async
   Path: async
-  Build$: flag(async)
   BuildDepends:
     async,
     openflow,
@@ -74,7 +65,6 @@ Library quickcheck
     Findlibparent: openflow
     Findlibname: quickcheck
     Path: quickcheck
-    Build$: flag(tests) || flag(quickcheck)
     BuildDepends:
       quickcheck,
       openflow,
@@ -103,19 +93,19 @@ Executable testtool
 Executable ping_test
   Path: ping-test
   Install: false
-  Build$: flag(tests) && flag(async)
+  Build$: flag(tests)
   MainIs: PingTest.ml
   BuildDepends: packet,openflow,openflow.async,oUnit,pa_ounit,pa_ounit.syntax
 
 Test all_tests
   Command: $testtool inline-test-runner openflow
-  Run$:  flag(quickcheck) && flag(tests)
+  Run$:  flag(tests)
   TestTools: testtool
 
 Executable learning_switch
   Path: examples
   MainIs: Learning_Switch.ml
-  Build$: flag(async)
+  Build$: flag(tests)
   Install: false
   BuildDepends:
     threads,
@@ -129,7 +119,7 @@ Executable learning_switch
 Executable learning_switch0x04
   Path: examples
   MainIs: Learning_Switch0x04.ml
-  Build$: flag(async)
+  Build$: flag(tests)
   Install: false
   BuildDepends:
     threads,

_oasis

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# OASIS_START
+# DO NOT EDIT (digest: dc86c2ad450f91ca10c931b6045d0499)
+set -e
+
+FST=true
+for i in "$@"; do
+  if $FST; then
+    set --
+    FST=false
+  fi
+
+  case $i in
+    --*=*)
+      ARG=${i%%=*}
+      VAL=${i##*=}
+      set -- "$@" "$ARG" "$VAL"
+      ;;
+    *)
+      set -- "$@" "$i"
+      ;;
+  esac
+done
+
+ocaml setup.ml -configure "$@"
+# OASIS_STOP

configure

@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: bca9ff9aca32d529880868a36b2f43fb)
-version = "0.7.0"
+# DO NOT EDIT (digest: 7d6f752d31baa2bcd0f0346f5d70c96f)
+version = "0.8.0"
 description = "Serialization library for OpenFlow"
 requires =
 "str cstruct cstruct.syntax packet core sexplib.syntax sexplib threads"
@@ -10,7 +10,7 @@ archive(native) = "openflow.cmxa"
 archive(native, plugin) = "openflow.cmxs"
 exists_if = "openflow.cma"
 package "quickcheck" (
- version = "0.7.0"
+ version = "0.8.0"
  description = "Serialization library for OpenFlow"
  requires = "quickcheck openflow packet.quickcheck"
  archive(byte) = "quickcheck.cma"
@@ -21,7 +21,7 @@ package "quickcheck" (
 )
 
 package "async" (
- version = "0.7.0"
+ version = "0.8.0"
  description = "Serialization library for OpenFlow"
  requires = "async openflow cstruct.async threads sexplib.syntax sexplib"
  archive(byte) = "async.cma"

lib/META

@@ -1,12 +1,14 @@
-opam-version: "1"
-ocaml-version: [ >= "4.01.0" ]
+opam-version: "1.2"
+ocaml-version: [ >= "4.02.0" ]
 version: "0.8.0"
 name: "openflow"
-maintainer: "Spiros Eliopoulos <[email protected]>"
+maintainer: "Arjun Guha <[email protected]>"
 build: [
-  ["ocaml" "setup.ml" "-configure" "--%{async:enable}%-async" "--%{quickcheck:enable}%-quickcheck" ]
-  ["ocaml" "setup.ml" "-build"]
-  ["ocaml" "setup.ml" "-install"]
+  ["./configure" "--%{pa_ounit:enable}%-tests"]
+  [make "install"]
+]
+build-test: [
+  [make "test"]
 ]
 remove: [
   ["ocamlfind" "remove" "openflow"]
@@ -15,10 +17,10 @@ depends: [
   "ocamlfind"
   "core"
   "cstruct" {>= "1.0.1"}
-  "packet"  {>= "0.3.0" }
+  "packet"  {>= "0.3.1" }
   "sexplib"
-]
-depopts: [
   "async" {>= "112.06.00" }
   "quickcheck"
-]
+  "ounit" {test}
+  "pa_ounit" {test}
+]