moving some features to 5.1.0 since included plugins have moved up, updating build script so version numbers do not have to be the same for a release

8 files changed, 38 insertions, 32 deletions

diff --git a/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml b/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
index 7110ac00a41..9ca77527932 100644
--- a/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
+++ b/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.gnu.debug"
       label="%featureName"
-      version="5.0.0.qualifier"
+      version="5.1.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/releng/org.eclipse.cdt-feature/feature.xml b/releng/org.eclipse.cdt-feature/feature.xml
index ed6eeab2e75..5c2e8e65861 100644
--- a/releng/org.eclipse.cdt-feature/feature.xml
+++ b/releng/org.eclipse.cdt-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt"
       label="%featureName"
-      version="5.0.0.qualifier"
+      version="5.1.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
diff --git a/releng/org.eclipse.cdt.master/feature.xml b/releng/org.eclipse.cdt.master/feature.xml
index 829559971e3..0a41a0e6314 100644
--- a/releng/org.eclipse.cdt.master/feature.xml
+++ b/releng/org.eclipse.cdt.master/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.master"
       label="CDT Master Feature"
-      version="5.0.0"
+      version="6.0.0"
       provider-name="Eclipse.org">
 
    <description url="http://www.example.com/description">
@@ -16,7 +16,7 @@
    <license url="http://www.example.com/license">
       [Enter License Description here.]
    </license>
-   
+
    <includes
          id="org.eclipse.cdt.platform"
          version="0.0.0"/>
@@ -36,7 +36,7 @@
    <includes
          id="org.eclipse.cdt.core.lrparser.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="org.eclipse.cdt.core.parser.upc.feature"
          version="0.0.0"/>
diff --git a/releng/org.eclipse.cdt.platform-feature/feature.xml b/releng/org.eclipse.cdt.platform-feature/feature.xml
index 2484d939240..7e0eb3181b1 100644
--- a/releng/org.eclipse.cdt.platform-feature/feature.xml
+++ b/releng/org.eclipse.cdt.platform-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.platform"
       label="%featureName"
-      version="5.0.0.qualifier"
+      version="5.1.0.qualifier"
       provider-name="Eclipse.org">
 
    <description>
diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index 84bb59ad13b..655f048035e 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -13,9 +13,9 @@
 	<target name="init">
 		<touch file="${user.home}/.cvspass" />
 		<tstamp/>
-		<property name="eclipseDist" value="/home/data/httpd/download.eclipse.org/eclipse/downloads/drops/S-3.4RC4-200806091311/eclipse-SDK-3.4RC4-linux-gtk-ppc.tar.gz"/>
-		<property name="mylynDist" value="/home/data/httpd/download.eclipse.org/tools/mylyn/update/ganymede/mylyn-3.0.0.I20080526-0000-e3.4.zip"/>
-		<property name="branchVersion" value="5.1.0"/>
+		<property name="eclipseDist" value="/home/data/httpd/download.eclipse.org/eclipse/downloads/drops/R-3.4-200806172000/eclipse-SDK-3.4-linux-gtk-ppc.tar.gz"/>
+		<property name="mylynDist" value="/home/data/httpd/download.eclipse.org/tools/mylyn/update/ganymede/mylyn-3.0.0.v20080619-1900-e3.4.zip"/>
+		<property name="branchVersion" value="6.0.0"/>
 		<property name="timestamp" value="${DSTAMP}${TSTAMP}" />
 		<property name="forceContextQualifier" value="${timestamp}"/>
 		<property name="buildingOSGi" value="true"/>
@@ -29,6 +29,7 @@
 		<property name="buildId" value="${buildType}${timestamp}"/>
 		<property name="zipsdir" value="${buildDirectory}/${buildType}.${buildId}"/>
 		<property name="masterFile" value="cdt-master-${branchVersion}-${buildId}.zip"/>
+		<property name="cdtTest" value="org.eclipse.cdt.testing_5.0.0.${timestamp}"/>
 		<property name="eclipseTest" value="org.eclipse.test_3.2.0"/>
 		<property name="messagefile" value="message.in"/>
 		<property name="mailto" value="vivkong@ca.ibm.com"/>
@@ -125,7 +126,8 @@
 		<move file="${buildDirectory}/site/linux.gtk.x86/eclipse/notice.html" todir="${buildDirectory}/site/eclipse"/>
 		<copy file="buildsite.xml" tofile="${buildDirectory}/site/eclipse/site.xml"/>
 		<replace file="${buildDirectory}/site/eclipse/site.xml">
-			<replacefilter token="@buildVersion@" value="${branchVersion}.${timestamp}"/>
+			<replacefilter token="@buildVersion@" value="${branchVersion}"/>
+			<replacefilter token="@timeStamp@" value="${timestamp}"/>
 		</replace>
 		<copy file="pack.properties" todir="${buildDirectory}/site/eclipse"/>
 		<!-- for some reason LPG isn't getting picked up-->		
@@ -142,7 +144,7 @@
 		<unzip src="${mylynDist}" dest="${testDirectory}/eclipse"/>
 		<unzip src="${zipsdir}/cdt-master-${branchVersion}-${buildId}.zip"
 			dest="${testDirectory}/eclipse"/>
-		<unzip src="${testDirectory}/eclipse/plugins/org.eclipse.cdt.testing_${branchVersion}.${timestamp}.jar"
+		<unzip src="${testDirectory}/eclipse/plugins/${cdtTest}.jar"
 			dest="${testDirectory}/test/cdt"/>
 		<unzip src="${testDirectory}/eclipse/plugins/${eclipseTest}.jar"
 			dest="${testDirectory}/test/eclipse"/>		
@@ -213,11 +215,11 @@
 		<copy todir="${copyToDir}/${buildType}.${buildId}">
 			<fileset dir="${buildDirectory}/${buildType}.${buildId}"/>
 		</copy>
+		
 		<!-- Create symlink to latest build -->
-		<!--
 		<symlink action="delete" link="${copyToDir}/latest" failonerror="false"/>
 		<symlink link="${copyToDir}/latest" resource="${copyToDir}/${buildType}.${buildId}" overwrite="true"/>
-		--> 
+
 	</target>
 
 	<target name="mail" depends="init">
diff --git a/releng/org.eclipse.cdt.releng/buildindex.html b/releng/org.eclipse.cdt.releng/buildindex.html
index d2c17af87c0..bc627f49725 100644
--- a/releng/org.eclipse.cdt.releng/buildindex.html
+++ b/releng/org.eclipse.cdt.releng/buildindex.html
@@ -15,7 +15,7 @@
 To install CDT:
 <ol>
 <li>Download the master zip file and put it somewhere on your machine.</li>
-<li>Fire up Eclipse (The Platform Run-time 3.4M6a is minimum recommended)</li>
+<li>Fire up Eclipse (The Platform Run-time 3.4 is minimum recommended)</li>
 <li>Help->Software Updates</li>
 <li>On the Available Features tab, select Manage sites...</li>
 <li>Add... in the master zip as an Archive...</li>
@@ -37,7 +37,7 @@ the CDT Optional Features category.</li>
 <li>LR Parser - provides a parser for the ISO/IEC 9899:1999 variant of the C programming language (aka C99) and the C++ programming language, 
 generated from a grammar using the LPG parser generator.  The grammar can be reused and extended to 
 create your own parser for variants on the C programming language.</li>
-<li>Unified Parallel C Support - Provides support for the Unified Parallel C programming langugage.  
+<li>Unified Parallel C Support - Provides support for the Unified Parallel C programming language.  
 Provides parsing/indexing infrastructure and language definition, allowing the UPC language to be recognized by CDT.  
 Requires the LR parser feature.</li>
 <li>Mylyn Bridge - allows CDT to work with Mylyn.</li>
diff --git a/releng/org.eclipse.cdt.releng/buildsite.xml b/releng/org.eclipse.cdt.releng/buildsite.xml
index 562368f8b49..9083265dd97 100644
--- a/releng/org.eclipse.cdt.releng/buildsite.xml
+++ b/releng/org.eclipse.cdt.releng/buildsite.xml
@@ -3,43 +3,43 @@
 	<category-def name="CDT Main Features" label="CDT Main Features"/>
 	<category-def name="CDT Optional Features" label="CDT Optional Features"/>
 	
-	<feature id="org.eclipse.cdt" url="features/org.eclipse.cdt_@buildVersion@.jar" version="@buildVersion@">
+	<feature id="org.eclipse.cdt" url="features/org.eclipse.cdt_5.1.0.@timeStamp@.jar" version="@buildVersion@.@timeStamp@">
 		<category name="CDT Main Features"/>
 	</feature>
-	<feature id="org.eclipse.cdt.sdk" url="features/org.eclipse.cdt.sdk_@buildVersion@.jar" version="@buildVersion@">
+	<feature id="org.eclipse.cdt.sdk" url="features/org.eclipse.cdt.sdk_5.1.0.@timeStamp@.jar" version="@buildVersion@.@timeStamp@">
 		<category name="CDT Main Features"/>
 	</feature>
-	<feature id="org.eclipse.cdt.debug.gdbjtag" url="features/org.eclipse.cdt.debug.gdbjtag_@buildVersion@.jar" version="@buildVersion@">
+	<feature id="org.eclipse.cdt.debug.gdbjtag" url="features/org.eclipse.cdt.debug.gdbjtag_5.0.0.@timeStamp@.jar" version="@buildVersion@.@timeStamp@">
 		<category name="CDT Optional Features"/>
 	</feature>
-	<feature id="org.eclipse.cdt.core.lrparser.feature" url="features/org.eclipse.cdt.core.lrparser.feature_@buildVersion@.jar" version="@buildVersion@">
+	<feature id="org.eclipse.cdt.core.lrparser.feature" url="features/org.eclipse.cdt.core.lrparser.feature_5.0.0.@timeStamp@.jar" version="@buildVersion@.@timeStamp@">
 		<category name="CDT Optional Features"/>
 	</feature>
-	<feature id="org.eclipse.cdt.core.parser.upc.feature" url="features/org.eclipse.cdt.core.parser.upc.feature_@buildVersion@.jar" version="@buildVersion@">
+	<feature id="org.eclipse.cdt.core.parser.upc.feature" url="features/org.eclipse.cdt.core.parser.upc.feature_5.0.0.@timeStamp@.jar" version="@buildVersion@.@timeStamp@">
 		<category name="CDT Optional Features"/>
 	</feature>
-	<feature id="org.eclipse.cdt.xlc.feature" url="features/org.eclipse.cdt.xlc.feature_@buildVersion@.jar" version="@buildVersion@">
+	<feature id="org.eclipse.cdt.xlc.feature" url="features/org.eclipse.cdt.xlc.feature_5.0.0.@timeStamp@.jar" version="@buildVersion@.@timeStamp@">
 		<category name="CDT Optional Features"/>
 	</feature>
-	<feature id="org.eclipse.cdt.xlc.sdk" url="features/org.eclipse.cdt.xlc.sdk_@buildVersion@.jar" version="@buildVersion@">
+	<feature id="org.eclipse.cdt.xlc.sdk" url="features/org.eclipse.cdt.xlc.sdk_5.0.0.@timeStamp@.jar" version="@buildVersion@.@timeStamp@">
 		<category name="CDT Optional Features"/>
 	</feature>
-	<feature id="org.eclipse.cdt.util" url="features/org.eclipse.cdt.util_@buildVersion@.jar" version="@buildVersion@">
+	<feature id="org.eclipse.cdt.util" url="features/org.eclipse.cdt.util_5.0.0.@timeStamp@.jar" version="@buildVersion@.@timeStamp@">
 		<category name="CDT Optional Features"/>
 	</feature>
-	<feature id="org.eclipse.cdt.mylyn" url="features/org.eclipse.cdt.mylyn_@buildVersion@.jar" version="@buildVersion@">
+	<feature id="org.eclipse.cdt.mylyn" url="features/org.eclipse.cdt.mylyn_5.0.0.@timeStamp@.jar" version="@buildVersion@.@timeStamp@">
 		<category name="CDT Optional Features"/>
 	</feature>
-	<feature id="org.eclipse.cdt.testing" url="features/org.eclipse.cdt.testing_@buildVersion@.jar" version="@buildVersion@">
+	<feature id="org.eclipse.cdt.testing" url="features/org.eclipse.cdt.testing_5.0.0.@timeStamp@.jar" version="@buildVersion@.@timeStamp@">
 		<category name="CDT Optional Features"/>
 	</feature>
-	<feature id="org.eclipse.cdt.gnu.build" url="features/org.eclipse.cdt.gnu.build_@buildVersion@.jar" version="@buildVersion@">
+	<feature id="org.eclipse.cdt.gnu.build" url="features/org.eclipse.cdt.gnu.build_5.0.0.@timeStamp@.jar" version="@buildVersion@.@timeStamp@">
 		<category name="CDT Optional Features"/>
 	</feature>
-	<feature id="org.eclipse.cdt.gnu.debug" url="features/org.eclipse.cdt.gnu.debug_@buildVersion@.jar" version="@buildVersion@">
+	<feature id="org.eclipse.cdt.gnu.debug" url="features/org.eclipse.cdt.gnu.debug_5.1.0.@timeStamp@.jar" version="@buildVersion@.@timeStamp@">
 		<category name="CDT Optional Features"/>
 	</feature>
-	<feature id="org.eclipse.cdt.platform" url="features/org.eclipse.cdt.platform_@buildVersion@.jar" version="@buildVersion@">
+	<feature id="org.eclipse.cdt.platform" url="features/org.eclipse.cdt.platform_5.1.0.@timeStamp@.jar" version="@buildVersion@.@timeStamp@">
 		<category name="CDT Optional Features"/>
 	</feature>
 </site>
diff --git a/releng/org.eclipse.cdt.sdk-feature/feature.xml b/releng/org.eclipse.cdt.sdk-feature/feature.xml
index cbf6aa55370..ea5dc45b8e8 100644
--- a/releng/org.eclipse.cdt.sdk-feature/feature.xml
+++ b/releng/org.eclipse.cdt.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.sdk"
       label="%featureName"
-      version="5.0.0.qualifier"
+      version="5.1.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -20,11 +20,11 @@
    <url>
       <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/ganymede"/>
    </url>
-   
+
    <includes
          id="org.eclipse.cdt.platform.source"
          version="0.0.0"/>
-         
+
    <requires>
       <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
       <import feature="org.eclipse.cdt" version="5.0.0" match="compatible"/>
@@ -43,13 +43,17 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-   
+
    <plugin
          id="org.eclipse.cdt.gnu.build.source"
+         download-size="0"
+         install-size="0"
          version="0.0.0"/>
 
    <plugin
          id="org.eclipse.cdt.gnu.debug.source"
+         download-size="0"
+         install-size="0"
          version="0.0.0"/>
 
 </feature>