ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r697082 - in /ant/ivy/ivyde/trunk: build.properties build.xml org.apache.ivyde.feature/feature.properties org.apache.ivyde.feature/feature.xml
Date Fri, 19 Sep 2008 13:15:58 GMT
Author: hibou
Date: Fri Sep 19 06:15:57 2008
New Revision: 697082

URL: http://svn.apache.org/viewvc?rev=697082&view=rev
Log:
Simplify the build as there is no more updatesite to handle here, and no more ivy feature
to handle neither

Modified:
    ant/ivy/ivyde/trunk/build.properties
    ant/ivy/ivyde/trunk/build.xml
    ant/ivy/ivyde/trunk/org.apache.ivyde.feature/feature.properties
    ant/ivy/ivyde/trunk/org.apache.ivyde.feature/feature.xml

Modified: ant/ivy/ivyde/trunk/build.properties
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/build.properties?rev=697082&r1=697081&r2=697082&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/build.properties (original)
+++ ant/ivy/ivyde/trunk/build.properties Fri Sep 19 06:15:57 2008
@@ -17,4 +17,5 @@
 #	 * under the License.
 #	 ***************************************************************
 
-version.qualifier=alpha1
+version.qualifier=beta1
+outputUpdateJars=true

Modified: ant/ivy/ivyde/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/build.xml?rev=697082&r1=697081&r2=697082&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/build.xml (original)
+++ ant/ivy/ivyde/trunk/build.xml Fri Sep 19 06:15:57 2008
@@ -41,11 +41,7 @@
         <property name="generateFeatureVersionSuffix" value="false" />
     </target>
 
-    <target name="/updatesite" description="Make the feature zip package deployable in
an update site">
-        <property name="outputUpdateJars" value="true" />
-    </target>
-
-    <target name="dist" depends="build-ivy-feature-zip,/updatesite,build,sources,updatesite:build,updatesite:optimize,checksum"
description="Build every artifacts for distribution" />
+    <target name="dist" depends="build,sources,checksum" description="Build every artifacts
for distribution" />
 
     <target name="clean" description="Remove every build artifacts">
         <delete dir="${work.dir}" />
@@ -163,110 +159,33 @@
         </zip>
     </target>
 
-    <target name="updatesite:build" depends="/updatesite,build" description="Build the
distribution binaries and put them into the update-site">
-        <mkdir dir="${dist.dir}/updatesite" />
-        <unzip src="${dist.dir}/org.apache.ivyde.feature-${build.version}.zip" dest="${dist.dir}/updatesite"
/>
-    </target>
-
-    <target name="updatesite:optimize" depends="updatesite:pack-jars,updatesite:build-digest"
description="Optimize the update site" />
-
-    <target name="updatesite:pack-jars" 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="-jarProcessor -verbose -processAll -pack"/>
-            <arg line="-outputDir ${dist.dir}/updatesite/plugins"/>
-            <arg line="${dist.dir}/updatesite/plugins"/>
-        </java>
-    </target>
-
-    <target name="updatesite:build-digest" depends="eclipse-classpath">
-        <mkdir dir="${dist.dir}/updatesite/" />
-        <copy file="${basedir}/site.xml" tofile="${dist.dir}/updatesite/site.xml" />
-        <!-- see http://wiki.eclipse.org/Update_Site_Optimization -->
-        <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=${dist.dir}/updatesite/"/>
-            <arg line="-siteXML=${dist.dir}/updatesite/site.xml"/>
-        </java>
+    <!-- due to a bug in the packaging of Ivy, some repackaging is needed (IVY-828,IVY-802)
-->
+    <target name="install-ivy">
+        <get src="http://apache.org/dist/ant/ivy/2.0.0-rc1/apache-ivy-2.0.0-rc1-bin.zip"
usetimestamp="true" dest="apache-ivy-2.0.0-rc1-bin.zip" />
+        <mkdir dir="work-ivy" />
+        <unzip overwrite="true" src="apache-ivy-2.0.0-rc1-bin.zip" dest="ivy-work" />
+        <copy file="ivy-work/apache-ivy-2.0.0-rc1/ivy-2.0.0-rc1.jar" tofile="${baseLocation}/plugins/org.apache.ivy_2.0.0.rc1.jar"
/>
+        <delete dir="work-ivy" />
     </target>
 
     <target name="checksum" description="Compute the checksum for every artifact to distribute">
         <checksum algorithm="MD5" fileext=".md5" format="MD5SUM">
             <fileset dir="${dist.dir}">
-                <include name="updatesite/plugins/org.apache.ivy*.jar" />
-                <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="updatesite/digest.zip" />
-                <include name="org.apache.ivy.feature-*.zip" />
                 <include name="org.apache.ivyde.feature-*.zip" />
                 <include name="apache-ivyde-sources-*.zip" />
             </fileset>
         </checksum>
         <checksum algorithm="SHA" fileext=".sha" format="MD5SUM">
             <fileset dir="${dist.dir}">
-                <include name="updatesite/plugins/org.apache.ivy*.jar" />
-                <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="updatesite/digest.zip" />
-                <include name="org.apache.ivy.feature-*.zip" />
                 <include name="org.apache.ivyde.feature-*.zip" />
                 <include name="apache-ivyde-sources-*.zip" />
             </fileset>
         </checksum>
     </target>
 
-    <target name="build-ivy-feature" description="Build the feature of Ivy">
-        <mkdir dir="${dist.dir}/updatesite/features" />
-        <jar destfile="${dist.dir}/updatesite/features/org.apache.ivy.feature_2.0.0.beta2.jar">
-            <fileset dir="org.apache.ivy.feature">
-                <include name="feature.properties" />
-                <include name="feature.xml"/>
-                <include name="LICENCE"/>
-                <include name="NOTICE"/>
-            </fileset>
-        </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"
/>
-    </target>
-
-    <!-- due to a bug in the packaging of Ivy, some repackaging is needed (IVY-828,IVY-802)
-->
-    <target name="install-ivy">
-        <get src="http://apache.org/dist/ant/ivy/2.0.0-beta2/apache-ivy-2.0.0-beta2-bin.zip"
usetimestamp="true" dest="apache-ivy-2.0.0-beta2-bin.zip" />
-        <mkdir dir="work-ivy/orig" />
-        <unzip overwrite="true" src="apache-ivy-2.0.0-beta2-bin.zip" dest="ivy-work/orig"
/>
-        <unzip overwrite="true" src="ivy-work/orig/apache-ivy-2.0.0-beta2/ivy-2.0.0-beta2.jar"
dest="ivy-work/unpacked" />
-        <replaceregexp file="ivy-work/unpacked/META-INF/MANIFEST.MF" match="Bundle-Version:
0\.0\.0" replace="Bundle-Version: 2.0.0.beta2" byline="true"/>
-        <jar destfile="${baseLocation}/plugins/org.apache.ivy_2.0.0.beta2.jar" manifest="ivy-work/unpacked/META-INF/MANIFEST.MF">
-            <fileset dir="ivy-work/unpacked/" />
-        </jar>
-        <delete dir="work-ivy" />
-    </target>
-
     <target name="verify-checksum" description="Verify the checksums of the artifacts
to publish">
         <checksum algorithm="MD5" fileext=".md5" format="MD5SUM" verifyproperty="checksum.md5.ok"
>
             <fileset dir="${dist.dir}">
-                <include name="updatesite/plugins/org.apache.ivy*.jar" />
-                <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="updatesite/digest.zip" />
-                <include name="org.apache.ivy.feature-*.zip" />
                 <include name="org.apache.ivyde.feature-*.zip" />
                 <include name="apache-ivyde-sources-*.zip" />
             </fileset>
@@ -279,12 +198,6 @@
         <echo message="MD5 Checksum verify passed successfully" />
         <checksum algorithm="SHA" fileext=".sha" format="MD5SUM" verifyproperty="checksum.sha.ok"
>
             <fileset dir="${dist.dir}">
-                <include name="updatesite/plugins/org.apache.ivy*.jar" />
-                <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="updatesite/digest.zip" />
-                <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/org.apache.ivyde.feature/feature.properties
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.feature/feature.properties?rev=697082&r1=697081&r2=697082&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.feature/feature.properties (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.feature/feature.properties Fri Sep 19 06:15:57 2008
@@ -17,3 +17,27 @@
 #	 * under the License.
 #	 ***************************************************************
 
+featureName=Apache IvyDE
+providerName=Apache Software Foundation
+
+updateSiteName=The Apache IvyDE Updates
+
+description=IvyDE Eclipse plugin
+
+license=Licensed to the Apache Software Foundation (ASF) under one\n\
+or more contributor license agreements.  See the NOTICE file\n\
+distributed with this work for additional information\n\
+regarding copyright ownership.  The ASF licenses this file\n\
+to you under the Apache License, Version 2.0 (the\n\
+"License"); you may not use this file except in compliance\n\
+with the License.  You may obtain a copy of the License at\n\
+\n\
+  http://www.apache.org/licenses/LICENSE-2.0\n\
+\n\
+Unless required by applicable law or agreed to in writing,\n\
+software distributed under the License is distributed on an\n\
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n\
+KIND, either express or implied.  See the License for the\n\
+specific language governing permissions and limitations\n\
+under the License.
+

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.feature/feature.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.feature/feature.xml?rev=697082&r1=697081&r2=697082&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.feature/feature.xml (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.feature/feature.xml Fri Sep 19 06:15:57 2008
@@ -19,18 +19,23 @@
 -->
 <feature
       id="org.apache.ivyde.feature"
-      label="Apache IvyDE"
+      label="%featureName"
       version="2.0.0.qualifier"
-      provider-name="Apache Software Foundation">
+      provider-name="%providerName">
 
-   <description url="http://ant.apache.org/ivy/ivyde/">
-      Eclipse plug-in for Ivy
+   <description url="http://ant.apache.org/ivy/ivyde">
+      %description
    </description>
 
    <license url="http://www.apache.org/licenses/LICENSE-2.0">
-      Licensed to the Apache Software Foundation (ASF) under one or more contributor license
agreements. See the NOTICE file distributed with this work for additional information regarding
copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0
(the &quot;License&quot;); you may not use this file except in compliance with the
 license. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software distributed under the
License is distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific language governing
permissions and limitations under the License.
+      %license
    </license>
 
+   <url>
+      <update label="%updateSiteName" url="http://ant.apache.org/ivy/ivyde/updatesite"/>
+      <discovery label="%updateSiteName" url="http://ant.apache.org/ivy/ivyde/updatesite"/>
+   </url>
+
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>



Mime
View raw message