Author: hibou
Date: Sun Jun 22 11:08:03 2008
New Revision: 670387
URL: http://svn.apache.org/viewvc?rev=670387&view=rev
Log:
Package also the binaries of the ivy bundle and feature (it should probably be
added later directly into Ivy's build system).
Modified:
ant/ivy/ivyde/trunk/build.xml
ant/ivy/ivyde/trunk/signArtifacts.sh
ant/ivy/ivyde/trunk/verifyArtifacts.sh
Modified: ant/ivy/ivyde/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/build.xml?rev=670387&r1=670386&r2=670387&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/build.xml (original)
+++ ant/ivy/ivyde/trunk/build.xml Sun Jun 22 11:08:03 2008
@@ -45,7 +45,7 @@
<property name="outputUpdateJars" value="true" />
</target>
- <target name="dist"
depends="build-ivy-feature,copy-ivy-bundle,/updatesite,build,sources,updatesite:build,updatesite:optimize,checksum"
description="Build every artifacts for distribution" />
+ <target name="dist"
depends="build-ivy-feature-zip,/updatesite,build,sources,updatesite:build,updatesite:optimize,checksum"
description="Build every artifacts for distribution" />
<target name="clean" description="Remove every build artifacts">
<delete dir="${work.dir}" />
@@ -199,6 +199,7 @@
<include name="updatesite/plugins/org.apache.ivy*.jar.pack.gz"
/>
<include name="updatesite/features/org.apache.ivy*.jar" />
<include
name="updatesite/features/org.apache.ivy*.jar.pack.gz" />
+ <include name="org.apache.ivy.feature-*.zip" />
<include name="org.apache.ivyde.feature-*.zip" />
<include name="apache-ivyde-sources-*.zip" />
</fileset>
@@ -209,6 +210,7 @@
<include name="updatesite/plugins/org.apache.ivy*.jar.pack.gz"
/>
<include name="updatesite/features/org.apache.ivy*.jar" />
<include
name="updatesite/features/org.apache.ivy*.jar.pack.gz" />
+ <include name="org.apache.ivy.feature-*.zip" />
<include name="org.apache.ivyde.feature-*.zip" />
<include name="apache-ivyde-sources-*.zip" />
</fileset>
@@ -227,6 +229,15 @@
</jar>
</target>
+ <target name="build-ivy-feature-zip"
depends="copy-ivy-bundle,build-ivy-feature" description="Build the zip
distribution of the Ivy feature">
+ <zip destfile="${dist.dir}/org.apache.ivy.feature-2.0.0.beta2.zip">
+ <fileset dir="${dist.dir}/updatesite/">
+ <include
name="features/org.apache.ivy.feature_2.0.0.beta2.jar" />
+ <include name="plugins/org.apache.ivy_2.0.0.beta2.jar"/>
+ </fileset>
+ </zip>
+ </target>
+
<target name="copy-ivy-bundle" description="Put the Ivy bundle into the
update site">
<mkdir dir="${dist.dir}/updatesite/plugins" />
<copy file="${baseLocation}/plugins/org.apache.ivy_2.0.0.beta2.jar"
tofile="${dist.dir}/updatesite/plugins/org.apache.ivy_2.0.0.beta2.jar" />
@@ -252,6 +263,7 @@
<include name="updatesite/plugins/org.apache.ivy*.jar.pack.gz"
/>
<include name="updatesite/features/org.apache.ivy*.jar" />
<include
name="updatesite/features/org.apache.ivy*.jar.pack.gz" />
+ <include name="org.apache.ivy.feature-*.zip" />
<include name="org.apache.ivyde.feature-*.zip" />
<include name="apache-ivyde-sources-*.zip" />
</fileset>
@@ -268,6 +280,7 @@
<include name="updatesite/plugins/org.apache.ivy*.jar.pack.gz"
/>
<include name="updatesite/features/org.apache.ivy*.jar" />
<include
name="updatesite/features/org.apache.ivy*.jar.pack.gz" />
+ <include name="org.apache.ivy.feature-*.zip" />
<include name="org.apache.ivyde.feature-*.zip" />
<include name="apache-ivyde-sources-*.zip" />
</fileset>
Modified: ant/ivy/ivyde/trunk/signArtifacts.sh
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/signArtifacts.sh?rev=670387&r1=670386&r2=670387&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/signArtifacts.sh (original)
+++ ant/ivy/ivyde/trunk/signArtifacts.sh Sun Jun 22 11:08:03 2008
@@ -23,5 +23,6 @@
for i in dist/updatesite/plugins/org.apache.ivy*.jar; do gpg --passphrase
"$passphrase" --output $i.asc --detach-sig --armor $i; done
for i in dist/updatesite/plugins/org.apache.ivy*.jar.pack.gz; do gpg
--passphrase "$passphrase" --output $i.asc --detach-sig --armor $i; done
for i in dist/apache-ivyde-sources-*.zip; do gpg --passphrase "$passphrase"
--output $i.asc --detach-sig --armor $i; done
+for i in dist/org.apache.ivy.feature-*.zip; do gpg --passphrase "$passphrase"
--output $i.asc --detach-sig --armor $i; done
for i in dist/org.apache.ivyde.feature-*.zip; do gpg --passphrase
"$passphrase" --output $i.asc --detach-sig --armor $i; done
Modified: ant/ivy/ivyde/trunk/verifyArtifacts.sh
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/verifyArtifacts.sh?rev=670387&r1=670386&r2=670387&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/verifyArtifacts.sh (original)
+++ ant/ivy/ivyde/trunk/verifyArtifacts.sh Sun Jun 22 11:08:03 2008
@@ -21,5 +21,6 @@
for i in dist/updatesite/plugins/org.apache.ivy*.jar; do gpg --verify $i.asc;
done
for i in dist/updatesite/plugins/org.apache.ivy*.jar.pack.gz; do gpg --verify
$i.asc; done
for i in dist/apache-ivyde-sources-*.zip; do gpg --verify $i.asc; done
+for i in dist/org.apache.ivy.feature-*.zip; do gpg --verify $i.asc; done
for i in dist/org.apache.ivyde.feature-*.zip; do gpg --verify $i.asc; done
