Author: thomas.diesler(a)jboss.com Date: 2010-01-28 13:52:22 -0500 (Thu, 28 Jan 2010) New Revision: 100069 Modified: projects/jboss-osgi/projects/osgitck/trunk/ant.properties.example projects/jboss-osgi/projects/osgitck/trunk/build.xml Log: SVN checkout and use osgitck.dir Modified: projects/jboss-osgi/projects/osgitck/trunk/ant.properties.example =================================================================== --- projects/jboss-osgi/projects/osgitck/trunk/ant.properties.example 2010-01-28 18:49:24 UTC (rev 100068) +++ projects/jboss-osgi/projects/osgitck/trunk/ant.properties.example 2010-01-28 18:52:22 UTC (rev 100069) @@ -11,8 +11,7 @@ aQute.bnd.version=0.0.366-SNAPSHOT # The location of the OSGi TCK -# osgitck.export=/home/username/svn/osgitck/r4v42 -# osgitck.zip.file=/home/username/svn/osgitck/osgitck-r4v42.zip +# osgitck.dir=/home/username/svn/osgi.org/build/trunk # The location of the local maven repository # maven.local.repository=/home/username/.m2/repository Modified: projects/jboss-osgi/projects/osgitck/trunk/build.xml =================================================================== --- projects/jboss-osgi/projects/osgitck/trunk/build.xml 2010-01-28 18:49:24 UTC (rev 100068) +++ projects/jboss-osgi/projects/osgitck/trunk/build.xml 2010-01-28 18:52:22 UTC (rev 100069) @@ -15,7 +15,6 @@ <property name="target.dir" value="${basedir}/target" /> <property name="reports.dir" value="${target.dir}/test-reports" /> - <property name="osgitck.dir" value="${target.dir}/osgitck-r4v42" /> <!-- ================================================================== --> <!-- Initialization --> @@ -32,8 +31,7 @@ <!-- Setup property defaults --> <property environment="env" /> <property name="hudson.username" value="${env.USER}" /> - <property name="osgitck.export" value="/home/${hudson.username}/svn/osgitck/r4v42" /> - <property name="osgitck.tar.file" value="${osgitck.export}/../osgitck-r4v42.tar" /> + <property name="osgitck.dir" value="${basedir}/../osgitck.dir" /> <property name="maven.local.repository" value="/home/${hudson.username}/.m2/repository" /> <property name="hudson.root" value="/home/${hudson.username}/workspace/osgitck" /> @@ -41,13 +39,12 @@ <echo message="hudson.username=${hudson.username}" /> <echo message="aQute.bnd.version=${aQute.bnd.version}" /> <echo message="framework.version=${framework.version}" /> - <echo message="osgitck.export=${osgitck.export}" /> - <echo message="osgitck.tar.file=${osgitck.tar.file}" /> + <echo message="osgitck.dir=${osgitck.dir}" /> <echo>************************************************</echo> <!-- Check if the osgitck export is available --> - <available property="osgitck.export.available" file="${osgitck.export}" /> - <available property="osgitck.tar.available" file="${osgitck.tar.file}" /> + <available property="osgitck.dir.available" file="${osgitck.dir}" /> + <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> <!-- Check if the aQute.bnd jar is available --> <property name="aQute.bnd.jar" value="${maven.local.repository}/biz/aQute/aQute.bnd/${aQute.bnd.version}/aQute.bnd-${aQute.bnd.version}.jar" /> @@ -68,21 +65,8 @@ <!-- Setup --> <!-- ================================================================== --> - <!-- Tar the OSGi TCK--> - <target name="tar-osgitck" depends="init" unless="osgitck.tar.available"> - <fail message="Cannot find osgitck export: ${osgitck.export}" unless="osgitck.export.available" /> - <tar basedir="${osgitck.export}" destfile="${osgitck.tar.file}" longfile="gnu" excludes="**/.svn" /> - </target> - - <!-- Untar the OSGi TCK--> - <target name="untar-osgitck" depends="tar-osgitck" unless="osgitck.dir.available"> - <mkdir dir="${osgitck.dir}" /> - <untar src="${osgitck.tar.file}" dest="${osgitck.dir}" /> - <available property="osgitck.dir.available" file="${osgitck.dir}" /> - </target> - <!-- Setup the TCK to use the RI (equinox) --> - <target name="setup.ri" description="Setup the TCK using the RI (Equinox)" depends="untar-osgitck"> + <target name="setup.ri" description="Setup the TCK using the RI (Equinox)" depends="init"> <!-- Copy the aQute.bnd --> <copy file="${aQute.bnd.jar}" tofile="${osgitck.dir}/licensed/repo/biz.aQute.bnd/biz.aQute.bnd-latest.jar" overwrite="true" /> @@ -93,7 +77,7 @@ </target> <!-- Setup the TCK to use the JBoss OSGi Framework --> - <target name="setup.jboss" description="Setup the TCK using the JBoss OSGi Framework" depends="untar-osgitck"> + <target name="setup.jboss" description="Setup the TCK using the JBoss OSGi Framework" depends="init"> <!-- Overlay the TCK setup --> <copy todir="${osgitck.dir}" overwrite="true">