ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r737331 - in /ant/ivy/ivyde/trunk: ./ build.xml builder/component/build.properties site-template.xml site.xml
Date Sat, 24 Jan 2009 11:19:12 GMT
Author: hibou
Date: Sat Jan 24 11:19:10 2009
New Revision: 737331

URL: http://svn.apache.org/viewvc?rev=737331&view=rev
Log:
Add a target to generate an updatesite for a fresh trunk build

Added:
    ant/ivy/ivyde/trunk/site-template.xml   (contents, props changed)
      - copied, changed from r737323, ant/ivy/ivyde/trunk/site.xml
Removed:
    ant/ivy/ivyde/trunk/site.xml
Modified:
    ant/ivy/ivyde/trunk/   (props changed)
    ant/ivy/ivyde/trunk/build.xml
    ant/ivy/ivyde/trunk/builder/component/build.properties

Propchange: ant/ivy/ivyde/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jan 24 11:19:10 2009
@@ -1,2 +1,5 @@
 local.build.properties
+work
+updatesite
+dist
 

Modified: ant/ivy/ivyde/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/build.xml?rev=737331&r1=737330&r2=737331&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/build.xml (original)
+++ ant/ivy/ivyde/trunk/build.xml Sat Jan 24 11:19:10 2009
@@ -38,12 +38,12 @@
     <property name="doc.work.dir" value="${work.dir}/doc" />
     <property name="eclipse.work.dir" value="${work.dir}/eclipse" />
     <property name="dist.dir" value="${basedir}/dist" />
+    <property name="updatesite.dir" value="${basedir}/updatesite" />
     <property name="eclipse-doc.dir" value="${basedir}/org.apache.ivyde.eclipse/doc" />
     <property name="src.doc.dir" value="${basedir}/doc" />
 
     <target name="/release" description="Make the build artifacts tagged with the release
version">
         <property name="forceContextQualifier" value="${version.qualifier}" />
-        <property name="generateFeatureVersionSuffix" value="false" />
     </target>
 
     <target name="dist" depends="generate-eclipse-doc,build,sources,checksum" description="Build
every artifacts for distribution" />
@@ -96,7 +96,6 @@
     <target name="compute-version">
         <tstamp />
         <property name="forceContextQualifier" value="${version.qualifier}-${DSTAMP}${TSTAMP}"
/>
-        <property name="generateFeatureVersionSuffix" value="true" />
         <loadfile srcfile="org.apache.ivyde.eclipse/META-INF/MANIFEST.MF" property="build.version">
             <filterchain>
                 <linecontainsregexp>
@@ -127,7 +126,6 @@
             <sysproperty key="DSTAMP" value="${DSTAMP}" />
             <sysproperty key="TSTAMP" value="${TSTAMP}" />
             <sysproperty key="forceContextQualifier" value="${forceContextQualifier}"
/>
-            <sysproperty key="generateFeatureVersionSuffix" value="${generateFeatureVersionSuffix}"
/>
             <sysproperty key="outputUpdateJars" value="true" />
             <sysproperty key="build.version" value="${build.version}" />
             <sysproperty key="javacDebugInfo" value="true" />
@@ -173,6 +171,25 @@
 
     <!-- 
         ======================================================================================
+        Target to create an updatesite with a fresh build of IvyDE
+        ======================================================================================
+     -->
+
+    <target name="generate-updatesite" depends="build">
+        <delete dir="${updatesite.dir}" />
+        <mkdir dir="${updatesite.dir}" />
+        <unzip src="${dist.dir}/org.apache.ivyde.feature-${build.version}.zip" dest="${updatesite.dir}"
/>
+        <copy file="${basedir}/site-template.xml" tofile="${updatesite.dir}/site.xml">
+            <filterchain>
+                <replacetokens>
+                    <token key="VERSION" value="${build.version}" />
+                </replacetokens>
+            </filterchain>
+        </copy>
+    </target>
+
+    <!-- 
+        ======================================================================================
         Targets related to the installation of Ivy in the Eclipse install
         ======================================================================================
      -->

Modified: ant/ivy/ivyde/trunk/builder/component/build.properties
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/builder/component/build.properties?rev=737331&r1=737330&r2=737331&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/builder/component/build.properties (original)
+++ ant/ivy/ivyde/trunk/builder/component/build.properties Sat Jan 24 11:19:10 2009
@@ -104,7 +104,7 @@
 
 #Enable / disable the generation of a suffix for the features that use .qualifier. 
 #The generated suffix is computed according to the content of the feature   
-generateFeatureVersionSuffix=true
+generateFeatureVersionSuffix=false
 
 ############# BASE CONTROL #############
 # Settings for the base Eclipse components and Java class libraries 

Copied: ant/ivy/ivyde/trunk/site-template.xml (from r737323, ant/ivy/ivyde/trunk/site.xml)
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/site-template.xml?p2=ant/ivy/ivyde/trunk/site-template.xml&p1=ant/ivy/ivyde/trunk/site.xml&r1=737323&r2=737331&rev=737331&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/site.xml (original)
+++ ant/ivy/ivyde/trunk/site-template.xml Sat Jan 24 11:19:10 2009
@@ -17,24 +17,9 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<!--
-  publishing this files means copying it into the ivyde website at:
-    svn.apache.org/repos/asf/ant/ivy/site/ivyde/updatesite/site.xml
--->
-<site pack200="true"
-      digestURL="http://www.apache.org/dist/ant/ivy/ivyde/updatesite/digest.zip/"
-      mirrorsURL="http://www.apache.org/ant/ivy/ivyde/updatesite/eclipse-update--xml.cgi">
-   <description url="http://www.apache.org/ant/ivy/ivyde/updatesite">
-      Eclipse update site for Apache IvyDE.
-   </description>
-
-   <feature url="features/org.apache.ivyde.feature_2.0.0.alpha1.jar" id="org.apache.ivyde.feature"
version="2.0.0.alpha1">
-      <category name="ivyde"/>
-   </feature>
-
-   <feature url="features/org.apache.ivy.feature_2.0.0.beta2.jar" id="org.apache.ivy.feature"
version="2.0.0.beta2">
+<site>
+   <feature url="features/org.apache.ivyde.feature_@VERSION@.jar" id="org.apache.ivyde.feature"
version="@VERSION@">
       <category name="ivyde"/>
    </feature>
-
-   <category-def name="ivyde" label="Apache IvyDE Eclipse plugins"/>
+   <category-def name="ivyde" label="Apache IvyDE Eclipse plugins (trunk builds)"/>
 </site>

Propchange: ant/ivy/ivyde/trunk/site-template.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/site-template.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/ivyde/trunk/site-template.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message