[arch-commits] CVS update of extra/devel/junit (PKGBUILD build.xml)

Jan de Groot jgc at archlinux.org
Sat Jan 5 21:34:06 UTC 2008


    Date: Saturday, January 5, 2008 @ 16:34:06
  Author: jgc
    Path: /home/cvs-extra/extra/devel/junit

Modified: PKGBUILD (1.2 -> 1.3) build.xml (1.1 -> 1.2)

upgpkg: junit 4.4-1
Update to 4.4, use build.xml from Redhat this time


-----------+
 PKGBUILD  |   27 ++++----
 build.xml |  193 ++++++++++++++++++++++++++++++++----------------------------
 2 files changed, 117 insertions(+), 103 deletions(-)


Index: extra/devel/junit/PKGBUILD
diff -u extra/devel/junit/PKGBUILD:1.2 extra/devel/junit/PKGBUILD:1.3
--- extra/devel/junit/PKGBUILD:1.2	Mon Jul  2 21:00:27 2007
+++ extra/devel/junit/PKGBUILD	Sat Jan  5 16:34:06 2008
@@ -1,31 +1,32 @@
-# $Id: PKGBUILD,v 1.2 2007/07/03 01:00:27 eric Exp $
+# $Id: PKGBUILD,v 1.3 2008/01/05 21:34:06 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=junit
-pkgver=3.8.2
+pkgver=4.4
 pkgrel=1
 pkgdesc="Automated testing framework for Java"
 arch=('i686' 'x86_64')
 url="http://www.junit.org/"
 license=('custom')
-force=y
 depends=('java-runtime')
-makedepends=('java-gcj-compat' 'fastjar' 'unzip' 'apache-ant')
+makedepends=('java-gcj-compat' 'fastjar' 'apache-ant')
 source=(http://downloads.sourceforge.net/sourceforge/junit/${pkgname}${pkgver}.zip
 	build.xml)
-md5sums=('9b8963ba2147a64bd5f1574b6fd289cb'
-         '00f9e3548251e4bf938ff9d059955bdc')
+md5sums=('4755aa0af58a834bedce1f0119dc9514'
+         'd8bd6d5961386ce602241ed7f87dd5d2')
 
 build() {
   cd ${startdir}/src/junit${pkgver}
-  unzip -qo src.jar
-  rm -f *.jar
-  rm -rf javadoc ${pkgname}${pkgver}
+  jar xf junit-${pkgver}-src.jar || return 1
+  rm -f junit-${pkgver}-src.jar
   cp ${startdir}/src/build.xml .
-  ant dist
+  find . -name \*.class -delete || return 1
+  find . -name \*.jar -delete || return 1
+
+  ant dist || return 1
   mkdir -p ${startdir}/pkg/usr/share/java
   mkdir -p ${startdir}/pkg/usr/lib
-  install -m644 ${pkgname}${pkgver}/junit.jar ${startdir}/pkg/usr/share/java
+  install -m644 ${pkgname}${pkgver}/junit.jar ${startdir}/pkg/usr/share/java || return 1
   # Do this for ant, though ant needs to have these files in /usr/share/java, but that will get fixed later.
-  ln -sf ../share/java/junit.jar ${startdir}/pkg/usr/lib/junit.jar
-  install -D cpl-v10.html ${startdir}/pkg/usr/share/licenses/${pkgname}/cpl-v10.html
+  ln -sf ../share/java/junit.jar ${startdir}/pkg/usr/lib/junit.jar || return 1
+  install -D cpl-v10.html ${startdir}/pkg/usr/share/licenses/${pkgname}/cpl-v10.html || return 1
 }
Index: extra/devel/junit/build.xml
diff -u extra/devel/junit/build.xml:1.1 extra/devel/junit/build.xml:1.2
--- extra/devel/junit/build.xml:1.1	Mon Jul  2 17:34:46 2007
+++ extra/devel/junit/build.xml	Sat Jan  5 16:34:06 2008
@@ -1,90 +1,103 @@
-<?xml version="1.0" ?>
-<!-- JUnit build script using ant 1.4 --><project basedir="." default="dist" name="junit">
-	<property file="${user.home}/.junit.properties"/>
-	<property name="build.compiler" value="classic"/>
-	<property name="version" value="3.8.2"/>
-	<property name="dist" value="junit${version}"/>
-	<property name="versionfile" value="junit/runner/Version.java"/>
-	<property name="zipfile" value="${dist}.zip"/>
-	<target name="init">
-		<tstamp/>
-	</target>
-
-	<target depends="init" name="versiontag">
-		<filter token="version" value="${version}"/>
-		<copy file="${versionfile}" filtering="on" tofile="${versionfile}tmp"/>
-		<move file="${versionfile}tmp" tofile="${versionfile}"/>
-	</target>
-
-	<target depends="versiontag" name="build">
-		<javac debug="on" destdir="." source="1.3" srcdir="." target="1.3"/>	
-	</target>
-
-	<target depends="build" name="dist">
-		<delete dir="${dist}"/>
-		<mkdir dir="${dist}"/>
-		<jar basedir="." excludes="**/*.jar, junit/tests/**, junit/samples/**, **/*.class, doc/**, README.html, .classpath, .project, cpl-v10.html" jarfile="${dist}/src.jar"/>
-		<jar basedir="." excludes="**/*.jar, junit/tests/**, junit/samples/**, **/*.java, doc/**, README.html,  build.xml, jar-manifest.txt, .classpath, .project, cpl-v10.html" jarfile="${dist}/junit.jar"/>
-		<copy todir="${dist}/junit/samples">
-			<fileset dir="junit/samples"/>
-		</copy>
-		<copy todir="${dist}/junit/tests">
-			<fileset dir="junit/tests"/>
-		</copy>
-
-
-		<delete file="${dist}/junit/tests/runner/test.jar"/> 
-		<jar basedir="." includes="junit/tests/runner/LoadedFromJar.class" jarfile="${dist}/junit/tests/runner/test.jar"/> 
-
-		<copy file="README.html" tofile="${dist}/README.html"/>
-		<copy file="cpl-v10.html" tofile="${dist}/cpl-v10.html"/>
-		
-		<java classname="junit.textui.TestRunner" fork="yes">
-			<arg value="junit.samples.AllTests"/>
-			<classpath>
-				<pathelement location="${dist}"/>
-				<pathelement location="${dist}/junit.jar"/>
-			</classpath>
-		</java>
-	</target>
-
-	<target name="javadoc">
-		<mkdir dir="${dist}/javadoc"/>
-		<javadoc author="false" destdir="${dist}/javadoc" packagenames="junit.framework.*, junit.extensions.*" source="1.3" sourcepath="." use="false" version="false" windowtitle="JUnit API"/>
-		<copy todir="${dist}/doc">
-			<fileset dir="doc"/>
-		</copy>
-	</target>
-	
-	<target depends="dist" name="zip">
-		<zip basedir="." includes="${dist}/**" zipfile="${zipfile}"/>
-	</target>
-	
-	<target depends="dist" name="awtui">
-		<java classname="junit.awtui.TestRunner" fork="yes">
-			<arg value="junit.samples.AllTests"/>
-			<classpath>
-				<pathelement location="${dist}"/>
-				<pathelement location="${dist}/junit.jar"/>
-			</classpath>
-		</java>
-	</target>
-	
-	<target depends="dist" name="swingui">
-		<java classname="junit.swingui.TestRunner" fork="yes">
-			<arg value="junit.samples.AllTests"/>
-			<classpath>
-				<pathelement location="${dist}"/>
-				<pathelement location="${dist}/junit.jar"/>
-			</classpath>
-		</java>
-	</target>
-
-	<target name="clean">
-		<delete dir="${dist}" quiet="true"/>			
-		<delete file="${zipfile}" quiet="true"/> 
-		<delete>
-			<fileset dir="${basedir}" includes="**/*.class"/> 
-		</delete>
-	</target>
-</project>
+<!-- JUnit build script using ant 1.4 -->
+<project name="junit" default="dist" basedir=".">
+	<property file="${user.home}/.junit.properties" />
+	<property name="build.compiler" value="classic" />
+	<property name="version" value="4.4" />
+	<property name="dist"  value="junit${version}" />
+	<property name="versionfile"  value="junit/runner/Version.java" />
+	<property name="zipfile"  value="${dist}.zip" />
+	<target name="init">
+		<tstamp/>
+	</target>
+
+	<target name="versiontag" depends="init">
+		<filter token="version" value="${version}" />
+		<copy 
+			file="${versionfile}" 
+			tofile="${versionfile}tmp" 
+			filtering="on"
+		/>
+		<move file="${versionfile}tmp" tofile="${versionfile}" />
+	</target>
+
+	<target name="build" depends="versiontag">
+		<javac 
+			srcdir="."
+			destdir="."
+			debug="on"
+			source="1.5"
+			target="1.5"
+  		/>	
+	</target>
+
+	<target name="dist" depends="build">
+		<delete dir="${dist}" />
+		<mkdir dir="${dist}" />
+		<jar 
+			jarfile="${dist}/src.jar"
+			basedir="."
+			excludes="**/*.jar, junit/tests/**, junit/samples/**, **/*.class, doc/**, README.html, .classpath, .project, cpl-v10.html"
+		/>
+		<jar 
+			jarfile="${dist}/junit.jar"
+			basedir="."
+			excludes="**/*.jar, junit/tests/**, junit/samples/**, **/*.java, doc/**, README.html,  build.xml, jar-manifest.txt, .classpath, .project, cpl-v10.html"
+		/>
+		<copy todir="${dist}/junit/samples">
+			<fileset dir="junit/samples" />
+		</copy>
+		<copy todir="${dist}/junit/tests">
+			<fileset dir="junit/tests" />
+		</copy>
+
+
+		<delete file="${dist}/junit/tests/runner/test.jar"/> 
+		<jar jarfile="${dist}/junit/tests/runner/test.jar" 
+	 	     basedir="." 
+		     includes="junit/tests/runner/LoadedFromJar.class"
+		 /> 
+
+		<copy todir="${dist}/doc">
+			<fileset dir="doc"/>
+		</copy>		
+		<copy file="README.html" tofile="${dist}/README.html" />
+		<copy file="cpl-v10.html" tofile="${dist}/cpl-v10.html" />
+		
+	</target>
+	
+	<target name="zip" depends="dist">
+		<zip 
+			zipfile="${zipfile}"
+			basedir="."
+			includes="${dist}/**"
+		/>
+	</target>
+	
+	<target name="awtui" depends="dist">
+		<java classname="junit.awtui.TestRunner" fork="yes">
+			<arg value="junit.samples.AllTests" />
+			<classpath>
+				<pathelement location="${dist}" />
+				<pathelement location="${dist}/junit.jar" />
+			</classpath>
+		</java>
+	</target>
+	
+	<target name="swingui" depends="dist">
+		<java classname="junit.swingui.TestRunner" fork="yes">
+			<arg value="junit.samples.AllTests" />
+			<classpath>
+				<pathelement location="${dist}" />
+				<pathelement location="${dist}/junit.jar" />
+			</classpath>
+		</java>
+	</target>
+
+	<target name="clean">
+		<delete dir="${dist}" quiet="true"/>			
+		<delete file="${zipfile}" quiet="true"/> 
+		<delete>
+			<fileset dir="${basedir}" includes="**/*.class" /> 
+		</delete>
+	</target>
+</project>




More information about the arch-commits mailing list