|
From: <mba...@us...> - 2007-03-02 20:23:26
|
Revision: 2075
http://svn.sourceforge.net/rubyeclipse/?rev=2075&view=rev
Author: mbarchfe
Date: 2007-03-02 12:23:23 -0800 (Fri, 02 Mar 2007)
Log Message:
-----------
fix update site replacement in feature.xml
Modified Paths:
--------------
trunk/org.rubypeople.rdt.pluginbuilder/build-files/build.properties
trunk/org.rubypeople.rdt.pluginbuilder/build-files/customTargets.xml
Modified: trunk/org.rubypeople.rdt.pluginbuilder/build-files/build.properties
===================================================================
--- trunk/org.rubypeople.rdt.pluginbuilder/build-files/build.properties 2007-03-02 19:14:44 UTC (rev 2074)
+++ trunk/org.rubypeople.rdt.pluginbuilder/build-files/build.properties 2007-03-02 20:23:23 UTC (rev 2075)
@@ -105,3 +105,19 @@
#collBase=.
#collectingFolder=eclipse
#archivePrefix=eclipse
+
+# the buildResultsDirectory specifies a directory into which the build results are copied
+# after a successful build
+buildResultsDirectory=${buildDirectory}/dist
+
+# There are three update site URLs for three streams of RDT builds: releases, integration
+# and nightly builds. For each build the appropriate URL must be placed into feature.xml
+# The feature.xml file contains the release update site by default
+
+releaseUpdateSiteURL=http://rubyeclipse.sourceforge.net/updatesite
+
+# in case of a nightly or integration build the releaseUpdateSiteURL in feature.xml is
+# replaced with one of the following entries
+nightlyBuildUpdateSiteURL=http://updatesite.rubypeople.org/nightly
+integrationBuildUpdateSiteURL=http://updatesite.rubypeople.org/integration
+
Modified: trunk/org.rubypeople.rdt.pluginbuilder/build-files/customTargets.xml
===================================================================
--- trunk/org.rubypeople.rdt.pluginbuilder/build-files/customTargets.xml 2007-03-02 19:14:44 UTC (rev 2074)
+++ trunk/org.rubypeople.rdt.pluginbuilder/build-files/customTargets.xml 2007-03-02 20:23:23 UTC (rev 2075)
@@ -75,7 +75,8 @@
<!-- Steps to do after fetching the build elements -->
<!-- ===================================================================== -->
<target name="postFetch">
- <antcall target="replaceVersions"/>
+ <antcall target="replaceVersions"/>
+ <antcall target="setUpdateSiteURL"/>
</target>
<target name="replaceVersions">
@@ -101,7 +102,22 @@
<replacefilter token="Bundle-Version: 0.0.0" value="Bundle-Version: ${version.full}" />
<replacefilter token="VERSION_QUALIFIER" value="${version.qualifier}" />
</replace>
- </target>
+ </target>
+
+ <target name="setUpdateSiteURL" if="isNightlyOrIntegrationBuild">
+
+ <!-- do not replace the update site URL if it is a release build -->
+ <condition property="updateSiteUrl"
+ value="${nightlyBuildUpdateSiteURL}"
+ else="${integrationBuildUpdateSiteURL}">
+ <isset property="isNightlyBuild"/>
+ </condition>
+ <echo message="Setting update-site URL: ${updateSiteUrl}"/>
+ <replace dir="${buildDirectory}/features">
+ <include name="org.rubypeople.*/feature.xml"/>
+ <replacefilter token="${releaseUpdateSiteURL}" value="${updateSiteUrl}" />
+ </replace>
+ </target>
<!-- ===================================================================== -->
<!-- Steps to do before generating the build scripts. -->
<!-- ===================================================================== -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|