2.2.1

2 files changed, 42 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 58d32db68a9e..fada9bfe3df2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = ocaml-atd
-	pkgver = 2.2.0
+	pkgver = 2.2.1
 	pkgrel = 1
 	url = https://github.com/mjambon/atd
 	arch = i686
 	arch = x86_64
 	license = BSD
 	makedepends = ocaml-findlib
-	makedepends = dune
+	makedepends = dune>=2
 	makedepends = opam
 	makedepends = scala
 	depends = ocaml>=3.11
@@ -16,8 +16,8 @@ pkgbase = ocaml-atd
 	depends = ocaml-yojson
 	depends = ocaml-re
 	options = !strip
-	source = https://github.com/mjambon/atd/archive/2.2.0.tar.gz
-	md5sums = 316d541f4a58ae8558b4cd52234fee05
+	source = https://github.com/mjambon/atd/archive/2.2.1.tar.gz
+	md5sums = c4120ec4dd6a54d5c04a6b9d6ec942b3
 
 pkgname = ocaml-atd
 	pkgdesc = Adaptable type definitions for OCaml
@@ -25,5 +25,13 @@ pkgname = ocaml-atd
 pkgname = ocaml-atdgen
 	pkgdesc = Efficient JSON serializer, deserializer and validator generator for OCaml
 	depends = ocaml-atd
+	depends = ocaml-atdgen-runtime
+	depends = ocaml-atdgen-codec-runtime
 	depends = bash
 
+pkgname = ocaml-atdgen-runtime
+	pkgdesc = Runtime for atdgen generated bucklescript converters
+
+pkgname = ocaml-atdgen-codec-runtime
+	pkgdesc = Runtime library for code generated by atdgen
+
diff --git a/PKGBUILD b/PKGBUILD
index c89dfd9aea97..6295660b055e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Sean Anderson <seanga2@gmail.com>
-pkgname=('ocaml-atd' 'ocaml-atdgen')
+pkgname=('ocaml-atd' 'ocaml-atdgen' 'ocaml-atdgen-runtime' 'ocaml-atdgen-codec-runtime')
 _oname=atd
-pkgver=2.2.0
+pkgver=2.2.1
 pkgrel=1
 pkgdesc=""
 arch=('i686' 'x86_64')
@@ -13,10 +13,10 @@ depends=('ocaml>=3.11'
 	 'ocaml-biniou'
 	 'ocaml-yojson'
 	 'ocaml-re')
-makedepends=('ocaml-findlib' 'dune' 'opam' 'scala')
+makedepends=('ocaml-findlib' 'dune>=2' 'opam' 'scala')
 options=(!strip)
 source=("https://github.com/mjambon/${_oname}/archive/${pkgver}.tar.gz")
-md5sums=('316d541f4a58ae8558b4cd52234fee05')
+md5sums=('c4120ec4dd6a54d5c04a6b9d6ec942b3')
 _dune="dune $(getopt "j::" $MAKEOPTS 2>/dev/null | sed 's/--/\n/g' | head -n 1)"
 
 prepare() {
@@ -27,39 +27,49 @@ prepare() {
 
 build() {
 	cd $srcdir/$_oname-$pkgver
-	$_dune build 
+	$_dune build --profile=release -p atd,atdgen,atdgen-runtime,atdgen-codec-runtime
 }
 
 check() {
 	cd $srcdir/$_oname-$pkgver
-	$_dune runtest
+	$_dune runtest -p atd,atdgen,atdgen-runtime,atdgen-codec-runtime
 }
 
-package_ocaml-atd() {
-	# options and directives that can be overridden
-	pkgdesc="Adaptable type definitions for OCaml"
-
+_do_package() {
 	cd $srcdir/$_oname-$pkgver
+
 	opam-installer --prefix=$pkgdir/usr \
 		--libdir $pkgdir$(ocamlfind printconf destdir) \
-		--docdir $pkgdir/usr/share/doc atd.install
+		--docdir $pkgdir/usr/share/doc $1.install
 	
-	mv $pkgdir/usr/share/doc/atd $pkgdir/usr/share/doc/$pkgname
+	mv $pkgdir/usr/share/doc/$1 $pkgdir/usr/share/doc/$pkgname
 	mkdir -p $pkgdir/usr/share/licenses/$pkgname/
 	mv $pkgdir/usr/share/doc/$pkgname/LICENSE.md $pkgdir/usr/share/licenses/$pkgname/
 }
 
+package_ocaml-atd() {
+	# options and directives that can be overridden
+	pkgdesc="Adaptable type definitions for OCaml"
+
+	_do_package atd
+}
+
 package_ocaml-atdgen() {
 	# options and directives overrides
 	pkgdesc="Efficient JSON serializer, deserializer and validator generator for OCaml"
-	depends=('ocaml-atd' 'bash')
+	depends=('ocaml-atd' 'ocaml-atdgen-runtime' 'ocaml-atdgen-codec-runtime' 'bash')
 
-	cd $srcdir/$_oname-$pkgver
-	opam-installer --prefix=$pkgdir/usr \
-		--libdir $pkgdir$(ocamlfind printconf destdir) \
-		--docdir $pkgdir/usr/share/doc atdgen.install
+	_do_package atdgen
+}
+
+package_ocaml-atdgen-runtime() {
+	pkgdesc="Runtime for atdgen generated bucklescript converters"
+
+	_do_package atdgen-runtime
+}
+
+package_ocaml-atdgen-codec-runtime() {
+	pkgdesc="Runtime library for code generated by atdgen"
 	
-	mv $pkgdir/usr/share/doc/atdgen $pkgdir/usr/share/doc/$pkgname
-	mkdir -p $pkgdir/usr/share/licenses/$pkgname/
-	mv $pkgdir/usr/share/doc/$pkgname/LICENSE.md $pkgdir/usr/share/licenses/$pkgname/
+	_do_package atdgen-codec-runtime
 }