[packages/nailgun: 2/3] do not depend build on tests

glen glen at pld-linux.org
Tue Mar 18 19:41:05 CET 2014


commit e119525010cfb111f0b4f5f1f6e7910e4f6c0e62
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Mar 18 17:54:19 2014 +0200

    do not depend build on tests

 nailgun.spec    |  4 +++-
 notestdep.patch | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/nailgun.spec b/nailgun.spec
index 6f7ef60..5bf57dc 100644
--- a/nailgun.spec
+++ b/nailgun.spec
@@ -16,6 +16,7 @@ Source0:	http://downloads.sourceforge.net/nailgun/%{name}-src-%{version}.zip
 # Source0-md5:	79365e339275d774b7c5c8b17b7ece40
 URL:		http://martiansoftware.com/nailgun/
 Patch0:		remove-tools-jar-dependencies.patch
+Patch1:		notestdep.patch
 BuildRequires:	ant
 %{?with_tests:BuildRequires:	ant-junit}
 BuildRequires:	jdk
@@ -40,11 +41,12 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 find -name '*.jar' | xargs rm -v
 
 %build
-%ant jar %{?with_tests:test} %{?with_apidocs:javadoc}
+%ant compile-server jar %{?with_tests:test} %{?with_apidocs:javadoc}
 
 # rebuild with our cflags
 %{__cc} -Wall -pedantic %{rpmcppflags} %{rpmcflags} %{rpmldflags} -o ng src/c/ng.c
diff --git a/notestdep.patch b/notestdep.patch
new file mode 100644
index 0000000..e7038bd
--- /dev/null
+++ b/notestdep.patch
@@ -0,0 +1,12 @@
+do not depend on test. we invoke test separately if needed
+--- nailgun-0.7.1/build.xml~	2014-03-18 17:45:26.000000000 +0200
++++ nailgun-0.7.1/build.xml	2014-03-18 17:49:03.690615471 +0200
+@@ -147,7 +147,7 @@
+ 	    </junitreport>
+ 	</target>
+ 	
+-	<target name="jar" depends="test">
++	<target name="jar">
+ 		<mkdir dir="${dist}"/>
+ 		<jar basedir="${build.prod}" destfile="${dist}/${jar}" excludes="com/martiansoftware/nailgun/examples/**,**/*.java">
+ 			<manifest>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nailgun.git/commitdiff/9a3ab212043988c0d63d2cdb7cc9541f1ab34356



More information about the pld-cvs-commit mailing list