Added SDK feature.

8 files changed, 184 insertions, 29 deletions

diff --git a/releng/org.eclipse.cdt.releng/.cvsignore b/releng/org.eclipse.cdt.releng/.cvsignore
index c9726765e0b..2e9e5e7a6f7 100644
--- a/releng/org.eclipse.cdt.releng/.cvsignore
+++ b/releng/org.eclipse.cdt.releng/.cvsignore
@@ -6,3 +6,4 @@ build.log
 compile.log
 mail.txt
 eclipse-SDK-new.zip
+message.txt
diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index 78ef16a65f3..ee701d9c0db 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -33,9 +33,9 @@
 		<ant antfile="build.xml" dir="${pde.build.scripts}">
 			<property name="builder" value="${basedir}/platform" />
 		</ant>
-		<!--ant antfile="build.xml" dir="${pde.build.scripts}">
+		<ant antfile="build.xml" dir="${pde.build.scripts}">
 			<property name="builder" value="${basedir}/sdk" />
-		</ant-->
+		</ant>
 		<concat destfile="compile.log">
 			<fileset dir="${buildDirectory}/plugins" includes="**/*.bin.log"/>
 		</concat>
@@ -68,13 +68,13 @@
 	</target>
 	
 	<target name="updateSite" depends="init" unless="hasErrors">
-		<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-aix.motif.ppc.zip" dest="${sitedir}"/>
-		<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-hpux.motif.PA_RISC.zip" dest="${sitedir}"/>
-		<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-linux.gtk.x86.zip" dest="${sitedir}"/>
-		<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-linux.motif.x86.zip" dest="${sitedir}"/>
-		<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-qnx.photon.x86.zip" dest="${sitedir}"/>
-		<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-solaris.motif.sparc.zip" dest="${sitedir}"/>
-		<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-win32.win32.x86.zip" dest="${sitedir}"/>
+		<unzip src="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-aix.motif.ppc.zip" dest="${sitedir}"/>
+		<unzip src="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-hpux.motif.PA_RISC.zip" dest="${sitedir}"/>
+		<unzip src="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-linux.gtk.x86.zip" dest="${sitedir}"/>
+		<unzip src="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-linux.motif.x86.zip" dest="${sitedir}"/>
+		<unzip src="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-qnx.photon.x86.zip" dest="${sitedir}"/>
+		<unzip src="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-solaris.motif.sparc.zip" dest="${sitedir}"/>
+		<unzip src="${zipsdir}/org.eclipse.cdt.sdk-${buildId}-win32.win32.x86.zip" dest="${sitedir}"/>
 		<antcall target="allPlugins">
 			<param name="target" value="updateSrcPlugin"/>
 			<param name="srcPlugin" value="org.eclipse.cdt.source"/>
@@ -209,11 +209,6 @@
  		<antcall target="${target}">
  			<param name="type" value="plugin"/>
  			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="plugin"/>
- 			<param name="dir" value="plugins"/>
  			<param name="id" value="org.eclipse.cdt.core"/>
  		</antcall>
  		<antcall target="${target}">
@@ -276,34 +271,44 @@
  			<param name="id" value="org.eclipse.cdt"/>
  		</antcall>
  		<antcall target="${target}">
+ 			<param name="type" value="plugin"/>
+ 			<param name="dir" value="plugins"/>
+ 			<param name="id" value="org.eclipse.cdt"/>
+ 		</antcall>
+ 		<antcall target="${target}">
+ 			<param name="type" value="feature"/>
+ 			<param name="dir" value="features"/>
+ 			<param name="id" value="org.eclipse.cdt.sdk"/>
+ 		</antcall>
+ 		<antcall target="${target}">
+ 			<param name="type" value="plugin"/>
+ 			<param name="dir" value="plugins"/>
+ 			<param name="id" value="org.eclipse.cdt.sdk"/>
+ 		</antcall>
+		<antcall target="${target}">
  			<param name="type" value="fragment"/>
  			<param name="dir" value="plugins"/>
  			<param name="id" value="org.eclipse.cdt.core.aix"/>
-			<param name="srcPlugin" value="org.eclipse.cdt.source.aix.motif.ppc"/>
  		</antcall>
  		<antcall target="${target}">
  			<param name="type" value="fragment"/>
  			<param name="dir" value="plugins"/>
  			<param name="id" value="org.eclipse.cdt.core.linux"/>
-			<param name="srcPlugin" value="org.eclipse.cdt.source"/>
  		</antcall>
  		<antcall target="${target}">
  			<param name="type" value="fragment"/>
  			<param name="dir" value="plugins"/>
  			<param name="id" value="org.eclipse.cdt.core.qnx"/>
-			<param name="srcPlugin" value="org.eclipse.cdt.source"/>
  		</antcall>
  		<antcall target="${target}">
  			<param name="type" value="fragment"/>
  			<param name="dir" value="plugins"/>
  			<param name="id" value="org.eclipse.cdt.core.solaris"/>
-			<param name="srcPlugin" value="org.eclipse.cdt.source"/>
  		</antcall>
  		<antcall target="${target}">
  			<param name="type" value="fragment"/>
  			<param name="dir" value="plugins"/>
  			<param name="id" value="org.eclipse.cdt.core.win32"/>
-			<param name="srcPlugin" value="org.eclipse.cdt.source"/>
  		</antcall>
  		<antcall target="${target}">
  			<param name="type" value="plugin"/>
diff --git a/releng/org.eclipse.cdt.releng/cdt-map.in b/releng/org.eclipse.cdt.releng/cdt-map.in
index 6ac49ccea74..541a65d4276 100644
--- a/releng/org.eclipse.cdt.releng/cdt-map.in
+++ b/releng/org.eclipse.cdt.releng/cdt-map.in
@@ -5,3 +5,10 @@ org.eclipse.cdt-@buildId@-linux.motif.x86.zip = http://download.eclipse.org/tool
 org.eclipse.cdt-@buildId@-qnx.photon.x86.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | qnx,photon,x86 | | runtime | cdt
 org.eclipse.cdt-@buildId@-solaris.motif.sparc.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | solaris,motif,sparc | | runtime | cdt
 org.eclipse.cdt-@buildId@-win32.win32.x86.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | win32,win32,x86 | | runtime | cdt
+org.eclipse.cdt.sdk-@buildId@-aix.motif.ppc.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | aix,motif,ppc | | runtime | cdt
+org.eclipse.cdt.sdk-@buildId@-hpux.motif.PA_RISC.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | hpux,motif,PA_RISC | | runtime | cdt
+org.eclipse.cdt.sdk-@buildId@-linux.gtk.x86.zip =  http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | linux,gtk,x86 & linux,*,x86 | | runtime | cdt
+org.eclipse.cdt.sdk-@buildId@-linux.motif.x86.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | linux,motif,x86 & linux,*,x86 | | runtime | cdt
+org.eclipse.cdt.sdk-@buildId@-qnx.photon.x86.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | qnx,photon,x86 | | runtime | cdt
+org.eclipse.cdt.sdk-@buildId@-solaris.motif.sparc.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | solaris,motif,sparc | | runtime | cdt
+org.eclipse.cdt.sdk-@buildId@-win32.win32.x86.zip = http://download.eclipse.org/tools/cdt/wswb/@buildId@/ | win32,win32,x86 | | runtime | cdt
diff --git a/releng/org.eclipse.cdt.releng/index.xsl b/releng/org.eclipse.cdt.releng/index.xsl
index 03d216f7234..8017961ed00 100644
--- a/releng/org.eclipse.cdt.releng/index.xsl
+++ b/releng/org.eclipse.cdt.releng/index.xsl
@@ -210,6 +210,128 @@
 					    		</td>
 					    	</tr>
 					    </xsl:if>
+				    	<xsl:if test="substring(@label, 17, 12) &gt; '200405201200'">
+							<tr>
+								<td>
+					    			<a>
+					    				<xsl:attribute name="href">
+						    				<xsl:text>zips/I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+						    				<xsl:text>/org.eclipse.cdt.sdk-I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+						    				<xsl:text>-aix.motif.ppc.zip</xsl:text>
+						    			</xsl:attribute>
+					    				<font size="1">
+							    			<xsl:text>org.eclipse.cdt.sdk-I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+							    			<xsl:text>-aix.motif.ppc.zip</xsl:text>
+							    		</font>
+					    			</a>
+					    		</td>
+								<td>
+					    			<a>
+					    				<xsl:attribute name="href">
+						    				<xsl:text>zips/I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+						    				<xsl:text>/org.eclipse.cdt.sdk-I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+						    				<xsl:text>-hpux.motif.PA_RISC.zip</xsl:text>
+						    			</xsl:attribute>
+					    				<font size="1">
+							    			<xsl:text>org.eclipse.cdt.sdk-I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+							    			<xsl:text>-hpux.motif.PA_RISC.zip</xsl:text>
+							    		</font>
+					    			</a>
+					    		</td>
+					    	</tr>
+					    	<tr>
+					    		<td>
+					    			<a>
+					    				<xsl:attribute name="href">
+						    				<xsl:text>zips/I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+						    				<xsl:text>/org.eclipse.cdt.sdk-I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+						    				<xsl:text>-linux.gtk.x86.zip</xsl:text>
+						    			</xsl:attribute>
+					    				<font size="1">
+							    			<xsl:text>org.eclipse.cdt.sdk-I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+							    			<xsl:text>-linux.gtk.x86.zip</xsl:text>
+							    		</font>
+					    			</a>
+					    		</td>
+					    		<td>
+					    			<a>
+					    				<xsl:attribute name="href">
+						    				<xsl:text>zips/I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+						    				<xsl:text>/org.eclipse.cdt.sdk-I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+						    				<xsl:text>-linux.motif.x86.zip</xsl:text>
+						    			</xsl:attribute>
+					    				<font size="1">
+							    			<xsl:text>org.eclipse.cdt.sdk-I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+							    			<xsl:text>-linux.motif.x86.zip</xsl:text>
+							    		</font>
+					    			</a>
+					    		</td>
+					    	</tr>
+					    	<tr>
+					    		<td>
+					    			<a>
+					    				<xsl:attribute name="href">
+						    				<xsl:text>zips/I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+						    				<xsl:text>/org.eclipse.cdt.sdk-I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+						    				<xsl:text>-qnx.photon.x86.zip</xsl:text>
+						    			</xsl:attribute>
+						    			<font size="1">
+							    			<xsl:text>org.eclipse.cdt.sdk-I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+							    			<xsl:text>-qnx.photon.x86.zip</xsl:text>
+							    		</font>
+					    			</a>
+					    		</td>
+					    		<td>
+					    			<a>
+					    				<xsl:attribute name="href">
+						    				<xsl:text>zips/I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+						    				<xsl:text>/org.eclipse.cdt.sdk-I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+						    				<xsl:text>-solaris.motif.sparc.zip</xsl:text>
+						    			</xsl:attribute>
+						    			<font size="1">
+							    			<xsl:text>org.eclipse.cdt.sdk-I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+							    			<xsl:text>-solaris.motif.sparc.zip</xsl:text>
+							    		</font>
+					    			</a>
+					    		</td>
+					    	</tr>
+					    	<tr>
+					    		<td>
+					    			<a>
+					    				<xsl:attribute name="href">
+						    				<xsl:text>zips/I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+						    				<xsl:text>/org.eclipse.cdt.sdk-I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+						    				<xsl:text>-win32.win32.x86.zip</xsl:text>
+						    			</xsl:attribute>
+						    			<font size="1">
+							    			<xsl:text>org.eclipse.cdt.sdk-I</xsl:text>
+						    				<xsl:value-of select="substring(@label, 17, 12)"/>
+							    			<xsl:text>-win32.win32.x86.zip</xsl:text>
+							    		</font>
+					    			</a>
+					    		</td>
+					    	</tr>
+					    </xsl:if>
 				    </table>
 	    		</li>
 		    </ul>
diff --git a/releng/org.eclipse.cdt.releng/maps/cdt.map b/releng/org.eclipse.cdt.releng/maps/cdt.map
index bc52336dd88..bd5bb617462 100644
--- a/releng/org.eclipse.cdt.releng/maps/cdt.map
+++ b/releng/org.eclipse.cdt.releng/maps/cdt.map
@@ -38,6 +38,7 @@ plugin@org.eclipse.cdt.debug.ui.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/h
 plugin@org.eclipse.cdt.testing=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
 feature@org.eclipse.cdt.testing=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,,org.eclipse.cdt.testing-feature
 
-! Source Feature
+! SDK Feature
 
-feature@org.eclipse.cdt.source=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,,org.eclipse.cdt.source-feature
+plugin@org.eclipse.cdt.sdk=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,,org.eclipse.cdt-releng/org.eclipse.cdt.sdk
+feature@org.eclipse.cdt.sdk=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,,org.eclipse.cdt-releng/org.eclipse.cdt.sdk-feature
diff --git a/releng/org.eclipse.cdt.releng/sdk/customTargets.xml b/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
index 1655060885c..9812768ba1f 100644
--- a/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
+++ b/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
@@ -12,7 +12,7 @@
 <target name="allElements">
 	<ant antfile="${genericTargets}" target="${target}" >
 		<property name="type" value="feature" />
-		<property name="id" value="org.eclipse.cdt.source" />
+		<property name="id" value="org.eclipse.cdt.sdk" />
 	</ant>
 </target>
 
@@ -23,31 +23,31 @@
 <!-- Add one target for each root element and each configuration -->
 <!-- ===================================================================== -->
 
-<target name="assemble.org.eclipse.cdt.source.aix.motif.ppc">
+<target name="assemble.org.eclipse.cdt.sdk.aix.motif.ppc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 </target>
 
-<target name="assemble.org.eclipse.cdt.source.hpux.motif.PA_RISC">
+<target name="assemble.org.eclipse.cdt.sdk.hpux.motif.PA_RISC">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 </target>
 
-<target name="assemble.org.eclipse.cdt.source.linux.gtk.x86">
+<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.x86">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 </target>
 
-<target name="assemble.org.eclipse.cdt.source.linux.motif.x86">
+<target name="assemble.org.eclipse.cdt.sdk.linux.motif.x86">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 </target>
 
-<target name="assemble.org.eclipse.cdt.source.qnx.photon.x86">
+<target name="assemble.org.eclipse.cdt.sdk.qnx.photon.x86">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 </target>
 
-<target name="assemble.org.eclipse.cdt.source.solaris.motif.sparc">
+<target name="assemble.org.eclipse.cdt.sdk.solaris.motif.sparc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 </target>
 
-<target name="assemble.org.eclipse.cdt.source.win32.win32.x86">
+<target name="assemble.org.eclipse.cdt.sdk.win32.win32.x86">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 </target>
 
diff --git a/releng/org.eclipse.cdt.releng/site.in b/releng/org.eclipse.cdt.releng/site.in
index fa88eab4d39..5915efc4414 100644
--- a/releng/org.eclipse.cdt.releng/site.in
+++ b/releng/org.eclipse.cdt.releng/site.in
@@ -4,4 +4,7 @@
 	<feature id="org.eclipse.cdt" url="features/org.eclipse.cdt_2.0.0.jar" version="2.0.0">
 		<category name="cdt"/>
 	</feature>
+	<feature id="org.eclipse.cdt.sdk" url="features/org.eclipse.cdt.sdk_2.0.0.jar" version="2.0.0">
+		<category name="cdt"/>
+	</feature>
 </site>
diff --git a/releng/org.eclipse.cdt.releng/site.xsl b/releng/org.eclipse.cdt.releng/site.xsl
index 1f3deff4390..42318acfc37 100644
--- a/releng/org.eclipse.cdt.releng/site.xsl
+++ b/releng/org.eclipse.cdt.releng/site.xsl
@@ -33,6 +33,22 @@
 					</xsl:attribute>
 				</category>
 			</feature>
+			<feature id="org.eclipse.cdt.sdk">
+				<xsl:attribute name="url">
+					<xsl:text>features/org.eclipse.cdt.sdk_</xsl:text>
+					<xsl:value-of select="$version"/>
+					<xsl:text>.jar</xsl:text>
+				</xsl:attribute>
+				<xsl:attribute name="version">
+					<xsl:value-of select="$version"/>
+				</xsl:attribute>
+				<category>
+					<xsl:attribute name="name">
+						<xsl:text>cdt_</xsl:text>
+						<xsl:value-of select="$version"/>
+					</xsl:attribute>
+				</category>
+			</feature>
 		</site>
 	</xsl:template>