[dynalang] 01/01: Removed the build dependency on libemma-java

Sun Jul 6 23:08:31 UTC 2014

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

ebourg-guest pushed a commit to branch master
in repository dynalang.

commit 2e220e788f0ef54dc149ecd4ed8b1795aadb9d81
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 7 01:07:01 2014 +0200

    Removed the build dependency on libemma-java
---
 debian/changelog                       |  7 ++++++
 debian/control                         |  2 +-
 debian/patches/0004-disable-emma.patch | 43 ++++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 debian/rules                           |  2 +-
 5 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a746572..8f7d105 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dynalang (0.4-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Removed the build dependency on libemma-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 19 Jun 2014 12:06:49 +0200
+
 dynalang (0.4-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index e051fe5..dc0f47d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 9), cdbs, javahelper
-Build-Depends-Indep: ant-optional, default-jdk, junit, libemma-java
+Build-Depends-Indep: ant-optional, default-jdk, junit
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-java/dynalang.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/dynalang.git
diff --git a/debian/patches/0004-disable-emma.patch b/debian/patches/0004-disable-emma.patch
new file mode 100644
index 0000000..e147888
--- /dev/null
+++ b/debian/patches/0004-disable-emma.patch
@@ -0,0 +1,43 @@
+Description: Disable the test coverage with Emma
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/mop/build.xml
++++ b/mop/build.xml
+@@ -95,17 +95,21 @@
+ 		<property name="coverage.dir" location="${build.dir}/coverage"/>
+ 		<property name="coverage.classes.dir" location="${build.dir}/coverage/classes"/>
+ 		<mkdir dir="${coverage.classes.dir}"/>
++<!--
+ 		<path id="emma.lib">
+ 			<pathelement location="build/lib/test/emma.jar" />
+ 			<pathelement location="build/lib/test/emma_ant.jar" />
+ 		</path>
+ 		<taskdef resource="emma_ant.properties" classpathref="emma.lib" />
++-->
+ 		<property name="coverage.instrumentationfile" location="${coverage.dir}/instrumentation"/>
++<!--
+ 		<emma enabled="true">
+ 			<instr 
+ 	        instrpath="${classes.dir}" outdir="${coverage.classes.dir}" 
+ 	        outfile="${coverage.instrumentationfile}" mode="copy"/>
+ 		</emma>
++-->
+ 		<copy todir="${coverage.classes.dir}">
+ 			<fileset dir="src" excludes="**/*.java"/>
+ 		</copy>
+@@ -159,6 +163,7 @@
+ 		<mkdir dir="${coverage.report.dir}"/>
+ 		<delete dir="${coverage.report.dir}"/>
+ 		<mkdir dir="${coverage.report.dir}"/>
++<!--
+ 		<emma enabled="true">
+ 			<report>
+ 				<fileset dir="${basedir}">
+@@ -173,6 +178,7 @@
+ 				<html outfile="${coverage.report.dir}/index.html"/>
+ 			</report>
+ 		</emma>
++-->
+ 	</target>
+ 	
+ 	<target name="dist" depends="clean,test-run,jar,doc">
diff --git a/debian/patches/series b/debian/patches/series
index 5ccb13f..3391098 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-disable-ivy.patch
 0002-fix-build-failure.patch
 0003-java8-compatibility.patch
+0004-disable-emma.patch
diff --git a/debian/rules b/debian/rules
index 900679f..3cd0f29 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/cdbs/1/class/ant.mk
 JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_BUILDDIR         := mop
 DEB_ANT_BUILD_TARGET := jar test doc
-DEB_JARS             := ant-junit junit emma_ant emma ant-trax
+DEB_JARS             := ant-junit junit ant-trax
 
 install/libdynalang-java::
 	jh_installlibs -plibdynalang-java

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/dynalang.git

