Author: hibou
Date: Wed Oct 1 09:23:29 2008
New Revision: 700825
URL: http://svn.apache.org/viewvc?rev=700825&view=rev
Log:
Make two different targets when releaseing Ivy or when releasing IvyDE, so
there is no worry to have about some overrided jars, there should be none
Modified:
ant/ivy/updatesite/trunk/ (props changed)
ant/ivy/updatesite/trunk/build.xml
Propchange: ant/ivy/updatesite/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Oct 1 09:23:29 2008
@@ -0,0 +1,2 @@
+work
+local.build.properties
Modified: ant/ivy/updatesite/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/build.xml?rev=700825&r1=700824&r2=700825&view=diff
==============================================================================
--- ant/ivy/updatesite/trunk/build.xml (original)
+++ ant/ivy/updatesite/trunk/build.xml Wed Oct 1 09:23:29 2008
@@ -16,7 +16,9 @@
specific language governing permissions and limitations
under the License.
-->
-<project default="optimize">
+<project default="optimize" basedir=".">
+
+ <property file="local.build.properties" />
<property name="work.dir" value="${basedir}/work"/>
<property name="updatesite.dir" value="${basedir}/dist"/>
@@ -100,17 +102,33 @@
Targets to manage the updatesite
===================================================================================================================
-->
- <target name="optimize" depends="pack-jars,build-digest"
description="Optimize the update site" />
+ <target name="optimize-ivy" depends="pack-ivy-jars,build-digest"
description="Optimize the update site for an Ivy release" />
+
+ <target name="optimize-ivyde" depends="pack-ivyde-jars,build-digest"
description="Optimize the update site for an IvyDE release" />
- <target name="pack-jars" depends="eclipse-classpath">
+ <target name="prepare-pack-ivy-jars">
<!-- prepare the working area, so copy plugin jars -->
<delete dir="${work.dir}/updatesite/" />
<mkdir dir="${work.dir}/updatesite/" />
<copy todir="${work.dir}/updatesite">
<fileset dir="${updatesite.dir}">
- <include name="plugins/*.jar" />
+ <include name="plugins/org.apache.ivy_*.jar" />
</fileset>
</copy>
+ </target>
+
+ <target name="prepare-pack-ivyde-jars">
+ <!-- prepare the working area, so copy plugin jars -->
+ <delete dir="${work.dir}/updatesite/" />
+ <mkdir dir="${work.dir}/updatesite/" />
+ <copy todir="${work.dir}/updatesite">
+ <fileset dir="${updatesite.dir}">
+ <include name="plugins/org.apache.ivyde.*.jar" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="do-pack-jars" depends="eclipse-classpath">
<!-- launch the packing -->
<java classpath="${eclipse.classpath}"
classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true">
<arg value="-consolelog" />
@@ -127,6 +145,10 @@
</copy>
</target>
+ <target name="pack-ivy-jars" depends="prepare-pack-ivy-jars,do-pack-jars"
/>
+
+ <target name="pack-ivyde-jars"
depends="prepare-pack-ivyde-jars,do-pack-jars" />
+
<target name="build-digest" depends="eclipse-classpath">
<java classpath="${eclipse.classpath}"
classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true">
<arg value="-consolelog" />
