Author: thomas.diesler(a)jboss.com
Date: 2010-02-10 07:35:25 -0500 (Wed, 10 Feb 2010)
New Revision: 100801
Modified:
projects/jboss-osgi/projects/osgitck/trunk/build.xml
Log:
Restore target update-framework
Modified: projects/jboss-osgi/projects/osgitck/trunk/build.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/build.xml 2010-02-10 12:22:22 UTC (rev
100800)
+++ projects/jboss-osgi/projects/osgitck/trunk/build.xml 2010-02-10 12:35:25 UTC (rev
100801)
@@ -42,7 +42,7 @@
<echo message="osgitck.dir=${osgitck.dir}" />
<echo>************************************************</echo>
- <!-- Check if the osgitck export is available -->
+ <!-- Check if the osgitck dir is available -->
<available property="osgitck.dir.available"
file="${osgitck.dir}" />
<fail message="Cannot find: ${osgitck.dir}"
unless="osgitck.dir.available" />
@@ -56,9 +56,6 @@
<available property="jboss.osgi.framework.available"
file="${jboss.osgi.framework.jar}" />
<fail message="Cannot find: ${jboss.osgi.framework.jar}"
unless="jboss.osgi.framework.available" />
- <!-- Check if the osgitck dir is available -->
- <available property="osgitck.dir.available"
file="${osgitck.dir}" />
-
</target>
<!-- ================================================================== -->
@@ -76,20 +73,31 @@
</target>
<!-- Setup the TCK to use the Vendor Implemenation -->
- <target name="setup.vi" description="Setup the TCK using the Vendor
Implemenation" depends="init">
+ <target name="setup.vi" description="Setup the TCK using the Vendor
Implemenation" depends="init,update-framework">
+ <!-- Copy the aQute.bnd -->
+ <copy file="${aQute.bnd.jar}"
tofile="${osgitck.dir}/licensed/repo/biz.aQute.bnd/biz.aQute.bnd-latest.jar"
overwrite="true" />
+
+ <!-- Copy the core framework jar -->
+ <copy file="${jboss.osgi.framework.jar}"
tofile="${osgitck.dir}/licensed/repo/biz.aQute.bnd/biz.aQute.bnd-latest.jar"
overwrite="true" />
+
<!-- Overlay the TCK setup -->
<copy todir="${osgitck.dir}" overwrite="true">
<fileset dir="${basedir}/overlay" />
</copy>
- <!-- Copy the aQute.bnd -->
- <copy file="${aQute.bnd.jar}"
tofile="${osgitck.dir}/licensed/repo/biz.aQute.bnd/biz.aQute.bnd-latest.jar"
overwrite="true" />
-
<!-- Build the TCK -->
<ant dir="${osgitck.dir}" target="build-clean" />
</target>
+ <!-- Update the JBoss OSGi Framework -->
+ <target name="update-framework" description="Update the JBoss OSGi
Framework" depends="init">
+ <!-- Copy the OSGi Framework -->
+ <mkdir dir="${osgitck.dir}/licensed/repo/org.jboss.osgi.framework"
/>
+ <copy file="${jboss.osgi.framework.jar}"
tofile="${osgitck.dir}/licensed/repo/org.jboss.osgi.framework/org.jboss.osgi.framework-1.0.0.jar"
+ overwrite="true" />
+ </target>
+
<!-- ================================================================== -->
<!-- Hudson -->
<!-- ================================================================== -->
Show replies by date