From cca9c01c57496b15efa431c540ce1db6b0b40c08 Mon Sep 17 00:00:00 2001
From: Stavros Polymenis <sp@orbitalfox.com>
Date: Tue, 17 Jan 2017 23:32:12 +0000
Subject: [PATCH] switching to oasis, old Makefile still available for now

---
 .gitignore   |  6 ++++++
 Makefile     | 54 ++++++++++++++++++++++++++++++----------------------
 Makefile.old | 33 ++++++++++++++++++++++++++++++++
 _oasis       | 38 ++++++++++++++++++++++++++++++++++++
 4 files changed, 108 insertions(+), 23 deletions(-)
 create mode 100644 Makefile.old
 create mode 100644 _oasis

diff --git a/.gitignore b/.gitignore
index 344b655..d310efc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,11 @@
 *.cmx
 *~
 *.o
+*.native
+setup.*
+configure
+AUTHORS.txt
+INSTALL.txt
 logarion
 _build
+ymd/
\ No newline at end of file
diff --git a/Makefile b/Makefile
index c071a42..3639f14 100644
--- a/Makefile
+++ b/Makefile
@@ -1,33 +1,41 @@
-OCB_FLAGS = -use-ocamlfind -I src # -I lib
-OCB       = ocamlbuild $(OCB_FLAGS)
-PKGS      = toml,uuidm,omd,str,batteries,lens,lwt,lwt.unix,ptime,ptime.clock.os,re.str,lens.ppx_deriving
-WEB_PKGS  = $(PKGS),opium.unix,tyxml,mustache
-CMD_PKGS  = $(PKGS),cmdliner
+# OASIS_START
+# DO NOT EDIT (digest: a3c674b4239234cbbe53afe090018954)
 
-all: cmd web
+SETUP = ocaml setup.ml
 
-dirs:
-	mkdir -p ymd/uuid ymd/title
+build: setup.data
+	$(SETUP) -build $(BUILDFLAGS)
 
-web:
-	$(OCB) web.native -pkgs $(WEB_PKGS)
-	mv web.native logarion-web
+doc: setup.data build
+	$(SETUP) -doc $(DOCFLAGS)
 
-cmd:
-	$(OCB) command.native -pkg $(CMD_PKGS)
-	mv command.native logarion
+test: setup.data build
+	$(SETUP) -test $(TESTFLAGS)
 
-style:
-	sassc share/sass/main.sass > share/static/main.css
+all:
+	$(SETUP) -all $(ALLFLAGS)
 
-doc_html:
-	$(OCB) doc/logarion.docdir/index.html -pkgs $(PKGS)
+install: setup.data
+	$(SETUP) -install $(INSTALLFLAGS)
 
-opam.dependencies:
-	opam install toml uuidm omd batteries lens lwt ptime ptime re lens opium tyxml mustache cmdliner
+uninstall: setup.data
+	$(SETUP) -uninstall $(UNINSTALLFLAGS)
+
+reinstall: setup.data
+	$(SETUP) -reinstall $(REINSTALLFLAGS)
 
 clean:
-	$(OCB) -clean
-	rm -f src/*.{cmx,cmi,o} *.{cmx,cmi,o}
+	$(SETUP) -clean $(CLEANFLAGS)
 
-.PHONY: web doc
+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
diff --git a/Makefile.old b/Makefile.old
new file mode 100644
index 0000000..c071a42
--- /dev/null
+++ b/Makefile.old
@@ -0,0 +1,33 @@
+OCB_FLAGS = -use-ocamlfind -I src # -I lib
+OCB       = ocamlbuild $(OCB_FLAGS)
+PKGS      = toml,uuidm,omd,str,batteries,lens,lwt,lwt.unix,ptime,ptime.clock.os,re.str,lens.ppx_deriving
+WEB_PKGS  = $(PKGS),opium.unix,tyxml,mustache
+CMD_PKGS  = $(PKGS),cmdliner
+
+all: cmd web
+
+dirs:
+	mkdir -p ymd/uuid ymd/title
+
+web:
+	$(OCB) web.native -pkgs $(WEB_PKGS)
+	mv web.native logarion-web
+
+cmd:
+	$(OCB) command.native -pkg $(CMD_PKGS)
+	mv command.native logarion
+
+style:
+	sassc share/sass/main.sass > share/static/main.css
+
+doc_html:
+	$(OCB) doc/logarion.docdir/index.html -pkgs $(PKGS)
+
+opam.dependencies:
+	opam install toml uuidm omd batteries lens lwt ptime ptime re lens opium tyxml mustache cmdliner
+
+clean:
+	$(OCB) -clean
+	rm -f src/*.{cmx,cmi,o} *.{cmx,cmi,o}
+
+.PHONY: web doc
diff --git a/_oasis b/_oasis
new file mode 100644
index 0000000..0f37c43
--- /dev/null
+++ b/_oasis
@@ -0,0 +1,38 @@
+OASISFormat: 0.4
+Name: logarion
+Version: 0.1
+Synopsis: A journalling system using Yamado files.
+Description: A journalling system using Yamado files for storage.
+Authors: SP <sp@orbitalfox.com>
+Copyrights: (C) 2016 SP <sp@orbitalfox.com>
+License: https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence-eupl-v11
+Homepage: https://github.com/orbifx/logarion/
+Plugins: META (0.4), StdFiles (0.4), DevFiles (0.4)
+BuildTools: ocamlbuild
+
+Library "logarion"
+  Path: src
+  Modules: Logarion
+  BuildDepends:
+    toml,uuidm,omd,str,batteries,lens,lwt,lwt.unix,ptime,ptime.clock.os,re.str,lens.ppx_deriving
+
+Executable logarion
+  Path: src
+  BuildDepends:
+    toml,uuidm,omd,str,batteries,lens,lwt,lwt.unix,ptime,ptime.clock.os,re.str,lens.ppx_deriving,
+    cmdliner
+  MainIs: command.ml
+  CompiledObject: best
+
+Executable logarion-web
+  Path: src
+  BuildDepends:
+    toml,uuidm,omd,str,batteries,lens,lwt,lwt.unix,ptime,ptime.clock.os,re.str,lens.ppx_deriving,
+    opium.unix,tyxml,mustache
+  MainIs: web.ml
+  CompiledObject: best
+
+SourceRepository head
+  Type: git
+  Location: git://github.com:orbifx/logarion.git
+  Browser: https://github.com/orbifx/logarion
\ No newline at end of file