Author: hibou
Date: Wed Oct 1 07:59:15 2008
New Revision: 700803
URL: http://svn.apache.org/viewvc?rev=700803&view=rev
Log:
remove the moved updatesite, just keep the cgi script for mirror managing and
the artifact deployed into the site
Removed:
ant/ivy/site/ivyde/updatesite/features/
ant/ivy/site/ivyde/updatesite/ivy-feature-template/
ant/ivy/site/ivyde/updatesite/plugins/
ant/ivy/site/ivyde/updatesite/signArtifacts.sh
ant/ivy/site/ivyde/updatesite/verifyArtifacts.sh
Modified:
ant/ivy/site/build.xml
Modified: ant/ivy/site/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/site/build.xml?rev=700803&r1=700802&r2=700803&view=diff
==============================================================================
--- ant/ivy/site/build.xml (original)
+++ ant/ivy/site/build.xml Wed Oct 1 07:59:15 2008
@@ -21,8 +21,6 @@
<taskdef uri="antlib:xooki" file="${basedir}/xooki/antlib.xml" />
<property name="target.dir" value="${basedir}/target" />
- <property name="work.dir" value="${basedir}/work"/>
- <property name="updatesite.dir" value="${basedir}/ivyde/updatesite"/>
<target name="/all" description="--> force whole site generation,
disabling incremental mode">
<property name="checkUpToDate" value="false" />
@@ -247,165 +245,4 @@
</generate-tagsdoc>
</target>
- <!--
-
===================================================================================================================
- Targets to intialize an ant run with Eclipse. Will be used to manage
the updatesite
-
===================================================================================================================
- -->
- <target name="eclipse-startup-check">
- <fail message="An Eclipse install is needed to run the build. Set your
Eclipse install dir into the baseLocation property." unless="baseLocation" />
-
- <condition property="eclipse.startup">
- <available file="${baseLocation}/startup.jar" />
- </condition>
- </target>
-
- <target name="eclipse-startup-classpath" depends="eclipse-startup-check"
if="eclipse.startup">
- <property name="eclipse.classpath" value="${baseLocation}/startup.jar"
/>
- </target>
-
- <target name="eclipse-launcher-classpath" depends="eclipse-startup-check"
unless="eclipse.startup">
- <!-- store path to newest launcher JAR in path id
'newest.equinox.launcher.path.id' -->
- <path id="newest.equinox.launcher.path.id">
- <first count="1">
- <sort>
- <fileset dir="${baseLocation}/plugins"
includes="**/org.eclipse.equinox.launcher_*.jar" />
- <!-- Seems the default order is oldest > newest so we must
reverse it.
- The 'reverse' and 'date' comparators are in the
internal antlib
- org.apache.tools.ant.types.resources.comparators.
- -->
- <reverse
xmlns="antlib:org.apache.tools.ant.types.resources.comparators">
- <!-- 'date' inherits 'reverse's namespace -->
- <date />
- </reverse>
- </sort>
- </first>
- </path>
-
- <!-- turn the path into a property -->
- <property name="eclipse.classpath"
refid="newest.equinox.launcher.path.id" />
- </target>
-
- <target name="eclipse-classpath"
depends="eclipse-startup-classpath,eclipse-launcher-classpath">
- <echo message="Using equinox launcher jar: ${eclipse.classpath}" />
- </target>
-
- <!--
-
===================================================================================================================
- Target to generate the Ivy feature and put it in the updatesite
-
===================================================================================================================
- -->
- <target name="updatesite:generate-ivy-feature" description="Generate the
Eclipse feature for Ivy">
- <fail message="You have to specify the version of the ivy"
unless="ivy.version" />
- <!-- first generate a feature descriptor with the proper version -->
- <delete file="${work.dir}/feature.xml" />
- <copy file="${updatesite.dir}/ivy-feature-template/feature.xml"
todir="${work.dir}">
- <filterset>
- <filter token="ivy.version" value="${ivy.version}"/>
- </filterset>
- </copy>
- <!-- package the feature -->
- <jar
destfile="${updatesite.dir}/features/org.apache.ivy.feature_${ivy.version}.jar">
- <fileset dir="${updatesite.dir}/ivy-feature-template">
- <include name="feature.properties" />
- <include name="LICENCE"/>
- <include name="NOTICE"/>
- </fileset>
- <fileset dir="${work.dir}">
- <include name="feature.xml"/>
- </fileset>
- </jar>
- </target>
-
- <!--
-
===================================================================================================================
- Targets to manage the updatesite
-
===================================================================================================================
- -->
- <target name="updatesite:optimize"
depends="updatesite:pack-jars,updatesite:build-digest" description="Optimize
the update site" />
-
- <target name="updatesite:pack-jars" depends="eclipse-classpath">
- <!-- 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" />
- </fileset>
- </copy>
- <!-- launch the packing -->
- <java classpath="${eclipse.classpath}"
classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true">
- <arg value="-consolelog" />
- <arg line="-application org.eclipse.update.core.siteOptimizer"/>
- <arg line="-jarProcessor -verbose -processAll -pack"/>
- <arg line="-outputDir ${work.dir}/updatesite/plugins"/>
- <arg line="${work.dir}/updatesite/plugins"/>
- </java>
- <!-- put the packs back to the updatesite -->
- <copy todir="${updatesite.dir}">
- <fileset dir="${work.dir}/updatesite">
- <include name="plugins/*.jar.pack.gz" />
- </fileset>
- </copy>
- </target>
-
- <target name="updatesite:build-digest" depends="eclipse-classpath">
- <java classpath="${eclipse.classpath}"
classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true">
- <arg value="-consolelog" />
- <arg line="-application org.eclipse.update.core.siteOptimizer"/>
- <arg line="-digestBuilder -digestOutputDir=${updatesite.dir}"/>
- <arg line="-siteXML=${updatesite.dir}/site.xml"/>
- </java>
- </target>
-
- <target name="updatesite:checksum" description="Compute the checksum for
every artifact to distribute">
- <checksum algorithm="MD5" fileext=".md5" format="MD5SUM">
- <fileset dir="${updatesite.dir}">
- <include name="plugins/org.apache.ivy*.jar" />
- <include name="plugins/org.apache.ivy*.jar.pack.gz" />
- <include name="features/org.apache.ivy*.jar" />
- <include name="digest.zip" />
- </fileset>
- </checksum>
- <checksum algorithm="SHA" fileext=".sha" format="MD5SUM">
- <fileset dir="${updatesite.dir}">
- <include name="plugins/org.apache.ivy*.jar" />
- <include name="plugins/org.apache.ivy*.jar.pack.gz" />
- <include name="features/org.apache.ivy*.jar" />
- <include name="digest.zip" />
- </fileset>
- </checksum>
- </target>
-
- <target name="updatesite:verify-checksum" description="Verify the
checksums of the artifacts to publish">
- <checksum algorithm="MD5" fileext=".md5" format="MD5SUM"
verifyproperty="checksum.md5.ok" >
- <fileset dir="${updatesite.dir}">
- <include name="plugins/org.apache.ivy*.jar" />
- <include name="plugins/org.apache.ivy*.jar.pack.gz" />
- <include name="features/org.apache.ivy*.jar" />
- <include name="digest.zip" />
- </fileset>
- </checksum>
- <fail message="MD5 Checksum verify failed !">
- <condition>
- <isfalse value="${checksum.md5.ok}"/>
- </condition>
- </fail>
- <echo message="MD5 Checksum verify passed successfully" />
- <checksum algorithm="SHA" fileext=".sha" format="MD5SUM"
verifyproperty="checksum.sha.ok" >
- <fileset dir="${updatesite.dir}">
- <include name="plugins/org.apache.ivy*.jar" />
- <include name="plugins/org.apache.ivy*.jar.pack.gz" />
- <include name="features/org.apache.ivy*.jar" />
- <include name="digest.zip" />
- </fileset>
- </checksum>
- <fail message="SHA Checksum verify failed !">
- <condition>
- <isfalse value="${checksum.sha.ok}"/>
- </condition>
- </fail>
- <echo message="SHA Checksum verify passed successfully" />
- </target>
-
</project>
