From: <ca...@us...> - 2007-07-26 20:21:24
|
Revision: 124 http://ant-contrib.svn.sourceforge.net/ant-contrib/?rev=124&view=rev Author: carnold Date: 2007-07-26 13:21:25 -0700 (Thu, 26 Jul 2007) Log Message: ----------- Bug 1761534: Add no-ivy option to build.xml Modified Paths: -------------- ant-contrib/trunk/build.xml Modified: ant-contrib/trunk/build.xml =================================================================== --- ant-contrib/trunk/build.xml 2007-07-25 23:26:42 UTC (rev 123) +++ ant-contrib/trunk/build.xml 2007-07-26 20:21:25 UTC (rev 124) @@ -20,7 +20,7 @@ <property name="dist.dir" location="dist" /> <property name="target.stage.dir" location="${target.dir}/stage" /> - <target name="init"> + <target name="init" unless="no-ivy"> <path id="ivy.lib.path"> <fileset dir="lib/ivy/jars" includes="ivy-1.3.1.jar"/> <fileset dir="lib/commons-cli/jars" includes="commons-cli-1.0.jar"/> @@ -35,15 +35,15 @@ classpathref="ivy.lib.path"/> </target> - <target name="configure" depends="init"> + <target name="configure" depends="init" unless="no-ivy"> <ivy:configure file="ivy-conf.xml" /> </target> - <target name="resolve" depends="configure"> + <target name="resolve" depends="configure" unless="no-ivy"> <ivy:resolve /> </target> - <target name="classpath" depends="resolve"> + <target name="classpath" depends="resolve" unless="no-ivy"> <ivy:cachepath id="compile.classpath" type="jar" conf="provided" /> <ivy:cachepath id="runtime.classpath" type="jar" conf="default" /> <ivy:cachepath id="test.classpath" type="jar" conf="test" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mat...@us...> - 2007-08-28 04:52:02
|
Revision: 142 http://ant-contrib.svn.sourceforge.net/ant-contrib/?rev=142&view=rev Author: mattinger Date: 2007-08-27 21:51:54 -0700 (Mon, 27 Aug 2007) Log Message: ----------- Fixing problems with classpath in verifydesign test Modified Paths: -------------- ant-contrib/trunk/build.xml Modified: ant-contrib/trunk/build.xml =================================================================== --- ant-contrib/trunk/build.xml 2007-08-23 18:18:30 UTC (rev 141) +++ ant-contrib/trunk/build.xml 2007-08-28 04:51:54 UTC (rev 142) @@ -269,7 +269,14 @@ </target> <target name="run-test" depends="compile-tests, jar"> - <junit haltonfailure="false" haltonerror="false" + <property name="lib.dir" location="lib" /> + <pathconvert pathsep="${path.separator}" + dirsep="/" + property="tpath"> + <path refid="test.classpath" /> + </pathconvert> + + <junit haltonfailure="false" haltonerror="false" errorproperty="junit.error" failureproperty="junit.failure"> <formatter type="brief" usefile="false"/> <batchtest> @@ -279,6 +286,7 @@ </fileset> </batchtest> <sysproperty key="antcontrib.jar" file="${target.dir}/${jar.name}"/> + <sysproperty key="test.classpath" value="${tpath}"/> <classpath> <path refid="test.classpath" /> <pathelement location="${target.classes.dir}" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |