From f25a4506161f6eb049ca62bdabbf920a76adfb0e Mon Sep 17 00:00:00 2001
From: Euan Harris <euan.harris@citrix.com>
Date: Tue, 12 Jan 2016 17:32:29 +0000
Subject: [PATCH] build: Switch from obuild to oasis

Signed-off-by: Euan Harris <euan.harris@citrix.com>
---
 .gitignore   | 14 +++++++++++++-
 Makefile     | 31 -------------------------------
 _oasis       | 26 ++++++++++++++++++++++++++
 cdrom.obuild | 17 -----------------
 lib/META     |  8 --------
 5 files changed, 39 insertions(+), 57 deletions(-)
 delete mode 100644 Makefile
 create mode 100644 _oasis
 delete mode 100644 cdrom.obuild
 delete mode 100644 lib/META

diff --git a/.gitignore b/.gitignore
index 849ddff..a0aba5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,13 @@
-dist/
+META
+_tags
+*.mldylib
+*.mllib
+myocamlbuild.ml
+setup.ml
+setup.data
+setup.log
+_build/
+*.native
+*.clib
+Makefile
+configure
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 0a5afc3..0000000
--- a/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-OBUILDOPTS=--debug+
-#CONFOPTS=--enable-library-bytecode --enable-executable-bytecode
-PKGNAME=cdrom
-
-SUFFIXES:=cdrom.a cdrom.cmi cdrom.cmx cdrom.o dllstubs_cdrom.so \
-       cdrom.cma  cdrom.cmo  cdrom.cmxa  cdrom_stubs.c.o  libstubs_cdrom.a
-FILES:=$(addprefix dist/build/lib-$(PKGNAME)/,$(SUFFIXES))
-
-ifneq "$(DESTDIR)" ""
-INSTALL_ARGS := -destdir $(DESTDIR)
-endif
-
-.PHONY: configure build install clean uninstall
-
-all: build
-
-configure:
-	obuild $(OBUILDOPTS) configure $(CONFOPTS)
-
-build: configure
-	obuild $(OBUILDOPTS) build
-
-install: build
-	ocamlfind remove $(PKGNAME)
-	ocamlfind install $(PKGNAME) $(FILES) lib/META lib/$(PKGNAME).mli $(INSTALL_ARGS)
-
-clean:
-	obuild clean
-
-uninstall:
-	ocamlfind remove $(PKGNAME)
diff --git a/_oasis b/_oasis
new file mode 100644
index 0000000..02d90c3
--- /dev/null
+++ b/_oasis
@@ -0,0 +1,26 @@
+OASISFormat:    0.4
+Name:           cdrom
+Version:        0.9.1
+Synopsis:       Query Linux CDROM devices
+Authors:        David Scott
+License:        LGPL-2.1 with OCaml linking exception
+Plugins:        META (0.4), Devfiles (0.4)
+BuildTools:     ocamlbuild
+
+Library cdrom
+  Path:             lib
+  FindlibName:      cdrom
+  Modules:          Cdrom
+  CSources:         cdrom_stubs.c
+  ByteOpt:          -warn-error +1..45
+  NativeOpt:        -warn-error +1..45
+  BuildDepends:     unix
+
+Executable query
+  Path:             query
+  MainIs:           query.ml
+  CompiledObject:   best
+  ByteOpt:          -warn-error +1..45
+  NativeOpt:        -warn-error +1..45
+  BuildDepends:     cdrom
+
diff --git a/cdrom.obuild b/cdrom.obuild
deleted file mode 100644
index 6871461..0000000
--- a/cdrom.obuild
+++ /dev/null
@@ -1,17 +0,0 @@
-name: cdrom 
-version: 0.9.1
-synopsis: Query Linux CDROM devices
-obuild-ver: 1
-
-library cdrom
-  src-dir: lib
-  modules: Cdrom
-  cdir: lib
-  c-sources: cdrom_stubs.c
-  build-deps: unix
-
-executable query
-  main: query.ml
-  src-dir: query
-  build-deps: cdrom
-
diff --git a/lib/META b/lib/META
deleted file mode 100644
index 5e86e4f..0000000
--- a/lib/META
+++ /dev/null
@@ -1,8 +0,0 @@
-version = "0.9.1"
-description = "CDROM device misc bindings"
-archive(byte) = "cdrom.cma"
-archive(byte, plugin) = "cdrom.cma"
-archive(native) = "cdrom.cmxa"
-archive(native, plugin) = "cdrom.cmxs"
-exists_if = "cdrom.cma"
-