Port from oasis to topkg.

Also includes an extended test for checking the actual functionality of crunched files and a .merlin file.
xclerc · Nov 10, 2016 · 00ba43a · 00ba43a
1 parent debb383
commit 00ba43a
Show file tree

Hide file tree

Showing 20 changed files with 111 additions and 7,786 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ lib_test/t1.*
 setup.bin
 setup.log
 setup.data
+crunch.install
diff --git a/.merlin b/.merlin
@@ -0,0 +1,7 @@
+PKG cmdliner
+PKG bos
+PKG lwt
+PKG cstruct
+S lib
+S test
+B _build/**
diff --git a/CHANGES → CHANGES.md b/CHANGES → CHANGES.md
diff --git a/LICENSE → LICENSE.md b/LICENSE → LICENSE.md
diff --git a/Makefile b/Makefile
diff --git a/_oasis b/_oasis
diff --git a/_tags b/_tags
@@ -1,27 +1,4 @@
-# OASIS_START
-# DO NOT EDIT (digest: 58af75697222d3710022d0f9de3ce0bb)
-# 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
 true: annot, bin_annot
-<**/.svn>: -traverse
-<**/.svn>: not_hygienic
-".bzr": -traverse
-".bzr": not_hygienic
-".hg": -traverse
-".hg": not_hygienic
-".git": -traverse
-".git": not_hygienic
-"_darcs": -traverse
-"_darcs": not_hygienic
-# Library crunch
-"lib/crunch.cmxs": use_crunch
-# Executable ocaml-crunch
-<lib/main.{native,byte}>: pkg_cmdliner
-<lib/main.{native,byte}>: pkg_unix
-<lib/main.{native,byte}>: use_crunch
-<lib/*.ml{,i,y}>: pkg_cmdliner
-<lib/*.ml{,i,y}>: pkg_unix
-<lib/*.ml{,i,y}>: use_crunch
-<lib/main.{native,byte}>: custom
-# OASIS_STOP
+<lib/**>: package(cmdliner), package(unix)
+
+<test/*>: package(bos), package(cstruct), package(lwt), package(io-page), package(io-page.unix), package(mirage-types)
diff --git a/configure b/configure
diff --git a/lib/crunch.mldylib b/lib/crunch.mldylib
@@ -1,4 +1 @@
-# OASIS_START
-# DO NOT EDIT (digest: c8f895a601026f69488fa9ed7f072d4c)
 Crunch
-# OASIS_STOP
diff --git a/lib/crunch.mllib b/lib/crunch.mllib
@@ -1,4 +1 @@
-# OASIS_START
-# DO NOT EDIT (digest: c8f895a601026f69488fa9ed7f072d4c)
 Crunch
-# OASIS_STOP
diff --git a/lib_test/Makefile b/lib_test/Makefile