commit f568ab134857882fe945c12e04ec439d2f7c97b3
author Christopher Frost <frostc@vmware.com> Thu Dec 02 17:16:50 2010 +0000
committer Christopher Frost <frostc@vmware.com> Thu Dec 02 17:16:50 2010 +0000
tree f634a9f3351c9f829cce933eb3b7a86dced468e1
parent 6dba074d21093fec0aa5157df0f77ad1743e239d

Updating the p2 retrival target

common/common.properties

diff --git a/common/common.properties b/common/common.properties
index 99c13b8..8b0289d 100644
--- a/common/common.properties
+++ b/common/common.properties
@@ -91,6 +91,7 @@
 package.source-jar.output.file=${ant.project.name}-sources-${bundle.version}.jar
 org.springframework.build.aws.ant.version=3.0.3.RELEASE
 p2.publishing.dir=${basedir}/target/publishing
+p2.launcher.jar=${p2.publishing.dir}/plugins/org.eclipse.equinox.launcher.jar
 
 # AspectJ Properties
 org.aspectj.tools.version=1.6.6.RELEASE

multi-bundle/publish.xml

diff --git a/multi-bundle/publish.xml b/multi-bundle/publish.xml
index 258ab56..f0edc11 100644
--- a/multi-bundle/publish.xml
+++ b/multi-bundle/publish.xml
@@ -47,11 +47,20 @@
     </target>
     
     <target name="p2.extract-publisher" description="Extracts Equinox+P2 needed for P2 Publishing">
+        <delete quiet="true" file="${p2.publishing.dir}"/>
         <mkdir dir="${p2.publishing.dir}"/>
         <get src="http://www.eclipse.org/downloads/download.php?file=/equinox/drops/R-3.6.1-201009090800/equinox-p2-agent-3.6.1-linux.tar.gz&amp;r=1"
-             dest="${p2.publishing.dir}/p2agent.zip"
+             dest="${p2.publishing.dir}/p2agent.tar.gz"
              usetimestamp="true"/>
-        <gunzip src="${p2.publishing.dir}/p2agent.zip" dest="${p2.publishing.dir}"/>
+        
+        <gunzip src="${p2.publishing.dir}/p2agent.tar.gz" dest="${p2.publishing.dir}"/>
+        <untar src="${p2.publishing.dir}/p2agent.tar" dest="${p2.publishing.dir}"/>
+        
+        <move tofile="${p2.launcher.jar}">
+            <fileset dir="${p2.publishing.dir}/plugins">
+              <include name="org.eclipse.equinox.launcher*.jar"/>
+            </fileset>
+        </move>
     </target>
 
     <target name="publish-package-amazon" depends="aws.init">