Merge remote branch 'wagerlabs/unified_request_protocol' into wagerla…

…bs-unified_request_protocol

Conflicts:
	src/redis.ml
	tests/smoke_test.ml

Makefile

@@ -0,0 +1,38 @@
+# OASIS_START
+# DO NOT EDIT (digest: bc1e05bfc8b39b664f29dae8dbd3ebbb)
+
+SETUP = ocaml setup.ml
+
+build: setup.data
+	$(SETUP) -build $(BUILDFLAGS)
+
+doc: setup.data build
+	$(SETUP) -doc $(DOCFLAGS)
+
+test: setup.data build
+	$(SETUP) -test $(TESTFLAGS)
+
+all: 
+	$(SETUP) -all $(ALLFLAGS)
+
+install: setup.data
+	$(SETUP) -install $(INSTALLFLAGS)
+
+uninstall: setup.data
+	$(SETUP) -uninstall $(UNINSTALLFLAGS)
+
+reinstall: setup.data
+	$(SETUP) -reinstall $(REINSTALLFLAGS)
+
+clean: 
+	$(SETUP) -clean $(CLEANFLAGS)
+
+distclean: 
+	$(SETUP) -distclean $(DISTCLEANFLAGS)
+
+setup.data:
+	$(SETUP) -configure $(CONFIGUREFLAGS)
+
+.PHONY: build doc test all install uninstall reinstall clean distclean configure
+
+# OASIS_STOP

_oasis

@@ -0,0 +1,35 @@
+OASISFormat: 0.1
+Name: beagle
+Version: 1.0
+LicenseFile: COPYING
+License: BSD4
+Authors: Rory Geoghegan
+Homepage: https://github.com/rgeoghegan/ocaml-redis
+BuildTools: ocamlbuild
+Plugins: DevFiles (0.2), META (0.2)
+Synopsis: Redis client
+
+Library redis
+  Build: true 
+  FindlibName: ocaml-redis
+  Path: src
+  Modules: Redis
+  BuildDepends: unix
+  Install: true
+  CompiledObject: best
+
+Flag tests
+  Description: Build and run tests
+
+Executable test
+  Path:         tests
+  MainIs:       test.ml
+  Install:      false
+  Build$:       flag(tests)
+  BuildDepends: oUnit (>= 1.1.0), ocaml-redis, str
+  CompiledObject: best
+
+Test main
+  Run$:    flag(tests)
+  Command: $test
+

_tags

@@ -0,0 +1,15 @@
+# OASIS_START
+# DO NOT EDIT (digest: b4adbdfab949c1094f4b13a8ce18cc80)
+# Library redis
+"src": include
+<src/*.ml{,i}>: pkg_unix
+# Executable test
+<tests/test.{native,byte}>: use_redis
+<tests/test.{native,byte}>: pkg_unix
+<tests/test.{native,byte}>: pkg_str
+<tests/test.{native,byte}>: pkg_oUnit
+<tests/*.ml{,i}>: use_redis
+<tests/*.ml{,i}>: pkg_unix
+<tests/*.ml{,i}>: pkg_str
+<tests/*.ml{,i}>: pkg_oUnit
+# OASIS_STOP

configure

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# OASIS_START
+# DO NOT EDIT (digest: ed33e59fe00e48bc31edf413bbc8b8d6)
+set -e
+
+ocaml setup.ml -configure $*
+# OASIS_STOP