Geir, it looks like the commit [r452245] HARMONY-698 This should be equivalent to what HARMONY-698 broken the downloading of junit.jar (which we used to take from Eclipse distribution).
The below patch adds junit.jar as a separate download from ibiblio jar repository. --- 8< --- added downloading of junit.jar diff --git build/make/lnx.properties build/make/lnx.properties index c4f6c56..1404b5b 100644 --- build/make/lnx.properties +++ build/make/lnx.properties @@ -57,6 +57,10 @@ # APR-iconv, version 1.1.1 or above # http://apr.apache.org/download.cgi remote.APRICONV.archive=http://apache.reverse.net/pub/apache/apr/apr-iconv-1.1.1.tar.gz +# JUnit, version 3.8.1 or above +remote.JUNIT.archive=http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar +remote.JUNIT.archive.type=asis + # LOG4CXX, svn revision 416779 # http://logging.apache.org/site/cvs-repositories.html remote.LOG4CXX.archive=-r 416779 http://svn.apache.org/repos/asf/logging/log4cxx/trunk diff --git build/make/setup.xml build/make/setup.xml index e570ae0..be28782 100644 --- build/make/setup.xml +++ build/make/setup.xml @@ -105,6 +105,7 @@ Version: $Revision: 1.5.2.33 $ <property name="CLASSLIB.check.file" value="native-src/README.txt" /> <property name="XALAN.check.file" value="xalan.jar" /> <property name="VM.check.file" value="vmcore/src/init/vm_main.cpp" /> + <property name="JUNIT.check.file" value="junit-3.8.1.jar" /> <property name="ANTLR.check.file" value="antlr-2.7.5.jar" /> <property name="PATCHES.check.file" value="README.txt" /> </target> @@ -148,6 +149,12 @@ Version: $Revision: 1.5.2.33 $ <target name="copy.nessessary.jars"> + <copy tofile="tmp/junit.jar"> + <fileset dir="${build.precopied.dir}/common/JUNIT"> + <include name="junit*.jar" /> + </fileset> + </copy> + <propertyregex property="build.XALAN.path" input="${if.XALAN.exist}" regexp="(.*)/${XALAN.check.f ile}" select="\1" /> <copy file="${build.XALAN.path}/xalan.jar" todir="tmp" /> @@ -176,7 +183,7 @@ Version: $Revision: 1.5.2.33 $ <target name="setup.resources" depends="plugin.antcontrib"> - <property name="common.resources" value="LOG4CXX,CPPTASKS,XALAN,VM,ANTLR,PATCHES" /> + <property name="common.resources" value="LOG4CXX,CPPTASKS,XALAN,VM,ANTLR,PATCHES,JUNIT" /> <property name="build.resources" value="CPPTASKS" /> <if> <isset property="if.lnx" /> diff --git build/make/win.properties build/make/win.properties index 51274f1..6753d2b 100644 --- build/make/win.properties +++ build/make/win.properties @@ -60,6 +60,10 @@ # APR-iconv, version 1.1.1 or above # http://apr.apache.org/download.cgi remote.APRICONV.archive=http://apache.reverse.net/pub/apache/apr/apr-iconv-1.1.1-win32-src.zip +# JUnit, version 3.8.1 or above +remote.JUNIT.archive=http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar +remote.JUNIT.archive.type=asis + # LOG4CXX, svn revision 416779 remote.LOG4CXX.archive=-r 416779 http://svn.apache.org/repos/asf/logging/log4cxx/trunk remote.LOG4CXX.archive.type=svn --------------------------------------------------------------------- Terms of use : http://incubator.apache.org/harmony/mailing.html To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
