Move back to separate packages, with ocamlfind compatibility stubs.

This reverts commit 471401a.

Conflicts:
	META.sqlexpr

META.pa_sqlexpr

@@ -0,0 +1,8 @@
+version = "dev"
+description = "Sqlexpr syntax extension"
+requires = "camlp4 estring"
+archive(syntax,preprocessor) = "pa_sql.cma"
+archive(syntax, toploop) = "pa_sql.cma"
+archive(syntax, preprocessor, native) = "pa_sql.cmxa"
+archive(syntax, preprocessor, native, plugin) = "pa_sql.cmxs"
+exists_if = "pa_sql.cma"

META.sqlexpr

@@ -1,4 +1,4 @@
-description = "SQLite database access."
+description = "Convenient, type-safe SQLite database access."
 requires = "bigarray
             bytes
             csv
@@ -16,38 +16,11 @@ plugin(byte) = "sqlexpr.cma"
 plugin(native) = "sqlexpr.cmxs"
 
 package "ppx" (
-  directory = "ppx"
-  version = "dev"
-  description = "Sqlexpr PPX syntax extension"
-  requires(ppx_driver) = "sqlexpr.omp"
-  requires(-ppx_driver) = "bytes sqlexpr re result"
-  ppx(-ppx_driver,-custom_ppx) = "./ppx.exe --as-ppx"
-)
-
-package "omp" (
-  directory = "ppx"
-  version = "dev"
-  description = "Sqlexpr ocaml-migrate-parsetree PPX (internal)"
-  requires(ppx_driver) = "compiler-libs
-                          compiler-libs.common
-                          ocaml-migrate-parsetree
-                          ppx_tools_versioned"
- ppx_runtime_deps = "bytes sqlexpr re result"
- exists_if = "ppx_sqlexpr.cma"
- archive(byte) = "ppx_sqlexpr.cma"
- archive(native) = "ppx_sqlexpr.cmxa"
- plugin(byte) = "ppx_lwt.cma"
- plugin(native) = "ppx_lwt.cmxs"
+  description = "Deprecated, use ppx_sqlexpr directly"
+  requires = "ppx_sqlexpr"
 )
 
 package "syntax" (
-  directory = "syntax"
-  version = "dev"
-  description = "Sqlexpr syntax extension"
-  requires = "camlp4 estring"
-  archive(syntax,preprocessor) = "pa_sql.cma"
-  archive(syntax, toploop) = "pa_sql.cma"
-  archive(syntax, preprocessor, native) = "pa_sql.cmxa"
-  archive(syntax, preprocessor, native, plugin) = "pa_sql.cmxs"
-  exists_if = "pa_sql.cma"
+  description = "Deprecated, use pa_sqlexpr directly"
+  requires = "pa_sqlexpr"
 )

pa_sqlexpr.opam

@@ -0,0 +1,15 @@
+opam-version: "1.2"
+maintainer: "mfp@acm.org"
+authors: ["Mauricio Fernandez <mfp@acm.org>"]
+license: "LGPL-2.1 with OCaml linking exception"
+homepage: "http://github.com/mfp/ocaml-sqlexpr"
+dev-repo: "https://github.com/mfp/ocaml-sqlexpr.git"
+bug-reports: "https://github.com/mfp/ocaml-sqlexpr/issues"
+build: [
+  [ "jbuilder" "build" "-p" name "-j" jobs ]
+]
+depends: [
+  "jbuilder" {build}
+  "sqlexpr"
+  "camlp4"
+]

ppx_sqlexpr.opam

@@ -0,0 +1,23 @@
+opam-version: "1.2"
+maintainer: "mfp@acm.org"
+authors: ["Mauricio Fernandez <mfp@acm.org>"]
+license: "LGPL-2.1 with OCaml linking exception"
+homepage: "http://github.com/mfp/ocaml-sqlexpr"
+dev-repo: "https://github.com/mfp/ocaml-sqlexpr.git"
+bug-reports: "https://github.com/mfp/ocaml-sqlexpr/issues"
+doc: "doc"
+build: [
+  [ "jbuilder" "build" "-p" name "-j" jobs ]
+]
+build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
+depends: [
+  "jbuilder" {build}
+  "sqlexpr"
+  "ppx_tools_versioned"
+  "ppx_core"
+  "ocaml-migrate-parsetree"
+  "base-unix"
+  "re" {build & >= "1.3.0"}
+  "ounit" {test}
+  "lwt" {test}
+]

sqlexpr.opam

@@ -8,20 +8,10 @@ bug-reports: "https://github.com/mfp/ocaml-sqlexpr/issues"
 build: [
   [ "jbuilder" "build" "-p" name "-j" jobs ]
 ]
-build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
 depends: [
   "jbuilder" {build}
   "csv"
   "lwt" {>= "2.2.0"}
   ("sqlite3" {>= "2.0.4"} | "sqlite3" {= "2.0.3"})
   "base-unix"
-  "ppx_tools_versioned"
-  "ppx_core"
-  "ocaml-migrate-parsetree"
-  "re" {build & >= "1.3.0"}
-  "ounit" {test}
-]
-depopts: [
-  "camlp4"
-  "estring"
 ]

src/ppx/jbuild

@@ -2,7 +2,7 @@
 
 (library
  ((name        ppx_sqlexpr)
-  (public_name sqlexpr.ppx)
+  (public_name ppx_sqlexpr)
   (synopsis "Sqlexpr PPX syntax extension")
   (wrapped false)
   (kind ppx_rewriter)

src/syntax/jbuild

@@ -2,10 +2,8 @@
 
 (library
  ((name        pa_sql)
-  (public_name sqlexpr.syntax)
+  (public_name pa_sqlexpr)
   (synopsis "Camlp4 syntax for sqlexpr")
-  (optional)
-  (wrapped false)
   (libraries (camlp4 camlp4.quotations.r estring))
   (library_flags (-linkall))
   (preprocess (action (run camlp4orf ${<})))))

tests/ppx/jbuild

@@ -4,27 +4,27 @@
  ((name         example)
   (modules      (example))
   (libraries    (sqlexpr oUnit))
-  (preprocess   (pps (sqlexpr.ppx)))))
+  (preprocess   (pps (ppx_sqlexpr)))))
 
 (executable
  ((name         t_parse)
   (modules      (t_parse))
   (libraries    (sqlexpr oUnit))
-  (preprocess   (pps (sqlexpr.ppx)))))
+  (preprocess   (pps (ppx_sqlexpr)))))
 
 (alias
  ((name runtest)
-  (package sqlexpr)
+  (package ppx_sqlexpr)
   (action (run ${exe:t_parse.exe}))))
 
 (executable
  ((name         t_sqlexpr)
   (modules      (t_sqlexpr))
   (libraries    (sqlexpr oUnit lwt))
-  (preprocess   (pps (sqlexpr.ppx lwt.ppx)))))
+  (preprocess   (pps (ppx_sqlexpr lwt.ppx)))))
 
 (alias
  ((name runtest)
-  (package sqlexpr)
+  (package ppx_sqlexpr)
   (action (run ${exe:t_sqlexpr.exe}))))