packages: java-jargs/java-jargs.spec, java-jargs/compile-test.patch (NEW) -...

[glen]

Author: glen                         Date: Sun Jul 10 14:45:50 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- patch build.xml to be able to build without test dependencies (junit), fix javadoc classpath

---- Files affected:
packages/java-jargs:
   java-jargs.spec (1.5 -> 1.6) , compile-test.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/java-jargs/java-jargs.spec
diff -u packages/java-jargs/java-jargs.spec:1.5 packages/java-jargs/java-jargs.spec:1.6
--- packages/java-jargs/java-jargs.spec:1.5	Fri Jul  8 17:56:00 2011
+++ packages/java-jargs/java-jargs.spec	Sun Jul 10 16:45:45 2011
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-# TODO
-# - make without tests not to depend on junit (compile target is stupid)
 #
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
@@ -16,15 +14,18 @@
 Release:	1
 License:	BSD
 Group:		Libraries/Java
-Source0:	http://downloads.sourceforge.net/project/jargs/jargs/1.0/jargs-%{version}.tar.bz2
+Source0:	http://downloads.sourceforge.net/jargs/jargs-%{version}.tar.bz2
 # Source0-md5:	9b86c8ebd69069a19e8424df2af349f0
+Patch0:		compile-test.patch
 URL:		http://jargs.sourceforge.net/
 BuildRequires:	ant
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
-BuildRequires:	java-junit
 BuildRequires:	rpmbuild(macros) >= 1.555
 BuildRequires:	sed >= 4.0
+%if %{with tests}
+BuildRequires:	java-junit
+%endif
 Requires:	jpackage-utils
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -64,6 +65,8 @@
 
 %prep
 %setup -q -n %{srcname}-%{version}
+%patch0 -p1
+
 find -name '*.class' | xargs rm
 rm -rf docs/api
 
@@ -125,6 +128,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2011/07/10 14:45:45  glen
+- patch build.xml to be able to build without test dependencies (junit), fix javadoc classpath
+
 Revision 1.5  2011/07/08 15:56:00  glen
 - fix deps, add tests bcond
 

================================================================
Index: packages/java-jargs/compile-test.patch
diff -u /dev/null packages/java-jargs/compile-test.patch:1.1
--- /dev/null	Sun Jul 10 16:45:51 2011
+++ packages/java-jargs/compile-test.patch	Sun Jul 10 16:45:45 2011
@@ -0,0 +1,58 @@
+--- jargs-1.0/build.xml~	2005-04-07 23:53:58.000000000 +0300
++++ jargs-1.0/build.xml	2011-07-10 17:42:13.601253918 +0300
+@@ -18,9 +18,20 @@
+ 
+    <target name="compile">
+       <mkdir dir="classes"/>
+-      <javac srcdir="${build.src}" destdir="${build.classes}" debug="${debug}"
++      <javac destdir="${build.classes}" debug="${debug}"
++             source="${source-version}" target="${jdk-version}">
++          <classpath path="${build.classes}:${java.class.path}"/>
++          <src path="${build.src}" />
++          <exclude name="jargs/test/**"/>
++      </javac>
++   </target>
++
++   <target name="compile-test">
++      <mkdir dir="classes"/>
++      <javac destdir="${build.classes}" debug="${debug}"
+              source="${source-version}" target="${jdk-version}">
+           <classpath path="${build.classes}:${junit.jar}:${java.class.path}"/>
++          <src path="${build.src}/jargs/test" />
+       </javac>
+    </target>
+ 
+@@ -38,7 +49,7 @@
+       <delete dir="dist"/>
+    </target>
+ 
+-   <target name="testjar" depends="compile">
++   <target name="testjar" depends="compile-test">
+       <mkdir dir="dist"/>
+       <mkdir dir="lib"/>
+       <copy todir="dist">
+@@ -49,14 +60,14 @@
+       <delete dir="dist"/>
+    </target>
+ 
+-   <target name="test" depends="compile">
++   <target name="test" depends="compile,compile-test">
+       <java classname="junit.textui.TestRunner"
+        classpath="${build.classes}:${junit.jar}:${java.class.path}">
+          <arg value="jargs.test.gnu.AllTests"/>
+       </java>
+    </target>
+ 
+-   <target name="testgui" depends="compile">
++   <target name="testgui" depends="compile,compile-test">
+       <java classname="junit.swingui.TestRunner" fork="true"
+        classpath="${build.classes}:${junit.jar}:${java.class.path}">
+          <arg value="jargs.test.gnu.AllTests"/>
+@@ -87,6 +98,7 @@
+              footer="${javadoc.header}"
+              bottom="${javadoc.bottom}">
+              <package name="**.*" />
++             <classpath path="${build.classes}:${junit.jar}:${java.class.path}"/>
+          </javadoc>
+   </target>
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-jargs/java-jargs.spec?r1=1.5&r2=1.6&f=u