[Pkg-ocaml-maint-commits] [ocaml-deriving-ocsigen] 05/11: Imported Upstream version 0.6.2

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocaml-deriving-ocsigen.

commit 7ab67a2d98457a6f1a5602b2adb52cd7918b1c9e
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Jun 12 10:08:49 2014 +0200

    Imported Upstream version 0.6.2
---
 .gitignore    | 10 +---------
 Makefile.dist |  2 +-
 _oasis        | 11 +++++++----
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8feec27..5e1d2b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,3 @@
-*.cm[iaox]
-*.cmxa
-*.cmxs
-*.cmxas
-*.a
-*.o
-*.annot
 ._*
 *~
 #*
@@ -12,7 +5,6 @@
 _build
 setup.log
 setup.data
-syntax/id.ml
 *.native
 *.byte
 syntax/common/id.ml
@@ -21,4 +13,4 @@ syntax/common/id.ml
 setup-dev.exe
 *.mllib
 *.mlpack
-lib/META
\ No newline at end of file
+lib/META
diff --git a/Makefile.dist b/Makefile.dist
index 213989e..efe4c3c 100644
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -28,7 +28,7 @@ dist:
 	oasis -C deriving-${VERSION} setup
 	sed -i "s/SETUP := setup-dev.exe/SETUP := setup.exe/" \
 	    deriving-${VERSION}/Makefile
-	cd deriving-${VERSION} && rm -rf .git .gitignore Makefile.dist
+	cd deriving-${VERSION} && rm -rf .git .gitignore Makefile.dist opam
 	tar cvzf deriving-${VERSION}.tar.gz deriving-${VERSION}
 	@rm -rf deriving-${VERSION}
 
diff --git a/_oasis b/_oasis
index 7211fa4..66cb173 100644
--- a/_oasis
+++ b/_oasis
@@ -11,7 +11,7 @@ FilesAB:     syntax/common/id.ml.ab,
 
 Flag tc
   Description: type-conv support
-  Default: true
+  Default: false
 
 Library "deriving"
   Path            : lib
@@ -69,6 +69,7 @@ Executable test
   MainIs         : notc.ml
   BuildDepends   : deriving,optcomp
   Install        : false
+  Build$: flag(tests)
 
 Executable test_tc
   Path           : tests/tc
@@ -76,12 +77,14 @@ Executable test_tc
   CompiledObject : best
   MainIs         : tc.ml
   BuildDepends   : deriving,type_conv
-  Build$: flag(tc)
+  Build$: flag(tests) && flag(tc)
 
 Test std
   TestTools : test
-  Command   : _build/tests/notc.native
+  Command   : $test
+  Run$: flag(tests)
 
 Test tc
   TestTools : test_tc
-  Command   : _build/tests/tc.native
+  Command   : $test_tc
+  Run$: flag(tests) && flag(tc)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-deriving-ocsigen.git