Bug 406825 - consolidate master-x features into one.

Bug 432776 - move and simplify eclipse.platform.repository

2 files changed, 1 insertions, 62 deletions

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/process-artifacts.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/process-artifacts.xml
index 4522baf26..6329e8f92 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/process-artifacts.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/process-artifacts.xml
@@ -32,12 +32,7 @@
             needed in final repo -->
 
         <!--
-           Note, we used to not remove
-           master-equinox.feature.group
-           but that technically makes the repo invalid since
-           it requires other things we removed. See bug 377314
-           https://bugs.eclipse.org/bugs/show_bug.cgi?id=377314
-           There should be only one category to remove, the "Uncategorized" one that Tycho 
+           Note: There should be only one category to remove, the "Uncategorized" one that Tycho 
            always creates (see bug 404103) so if there is ever any we want to leave, 
            we'll need to make the final iu query more exact.
            See bug 406389 for why we remove rcp.configuration.feature ... 
@@ -45,8 +40,6 @@
         -->
         <p2.remove.iu>
             <repository location="file://${siteDirOnBuildMachine}" />
-            <iu id="master.feature.group" />
-            <iu id="master.feature.jar" />
             <iu id="eclipse-junit-tests" />
             <iu query="property[@name='org.eclipse.equinox.p2.name' @value='Uncategorized']" />
         </p2.remove.iu>
@@ -101,17 +94,6 @@
                 comparator="org.eclipse.equinox.p2.repository.tools.jar.comparator"
                 comparatorLog="${buildlogs}/postbuild-comparatorlog.txt">
                 <repository location="${comparatorRepository}" />
-               <!-- eclude none, for now
-               <exclude>
-                   <artifact id="org.eclipse.jdt.doc.isv" />
-                   <artifact id="org.eclipse.jdt.doc.user" />
-                   <artifact id="org.eclipse.pde.doc.user" />
-                   <artifact id="org.eclipse.platform.doc.isv" />
-                   <artifact id="org.eclipse.platform.doc.user" />
-                   <artifact id="org.eclipse.equinox.executable" />
-                   <artifact id="master-equinox" />
-               </exclude>
-               -->
             </comparator>
         </p2.mirror>
     </target>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/buildConfiguration.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/buildConfiguration.xml
deleted file mode 100644
index 09e5955c0..000000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/buildConfiguration.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<project name="org.eclipse.rcp.configuration" default="main" basedir=".">
-
-	<target name="main" >
-        <property name="product" value="${basedir}/config.product" />
-        <property name="id" value="org.eclipse.pde.build.container.feature" />
-        <property name="type" value="feature" />
-		<property name="verify" value="false" />
-
-		<path id="launcher.paths">
-			<fileset dir="${reposource}" includes="plugins/org.eclipse.equinox.launcher*" />
-			<!-- the built version of the org.eclipse.equinox.executable feature -->
-			<dirset dir="${buildDirectory}" includes="features/org.eclipse.equinox.executable*" />  
-		</path>
-
-		<!-- generate a feature based on our .product file -->
-		<property file="${eclipse.build.configs}/master/build.properties" />
-		<ant antfile="${eclipse.pdebuild.scripts}/productBuild/productBuild.xml" target="generateFeature" >
-			<property name="nestedInclusions" value="false" />
-			<property name="buildDirectory" value="${basedir}/temp"/>
-		</ant>
-		<!-- generate product build scripts for the generated feature -->
-		<ant antfile="${eclipse.pdebuild.scripts}/genericTargets.xml" target="generateScript" >
-            <property name="buildDirectory" value="${basedir}/temp"/>
-			<property name="baseLocation" value="" />
-			<property name="transformedRepoLocation" value="" />
-			<property name="pluginPath" refid="launcher.paths" />
-			<property name="forceContextQualifier" value="${buildId}" />
-        </ant>
-
-		<!-- get the generate p2.inf that got generated with the above scripts --> 
-		<move file="${basedir}/temp/features/org.eclipse.pde.build.container.feature/product/p2.inf" tofile="${basedir}/p2.inf" overwrite="true" />
-		<replace file="${basedir}/p2.inf" token="@FLAVOR@" value="tooling" />
-		
-		<!-- publish the configuration feature with the generated p2.inf -->
-		<replace file="${basedir}/feature.xml" token="@qualifier@" value="${buildId}" />
-		<eclipse.gatherFeature
-			metadataRepository="file:${reposource}"
-			artifactRepository="file:${reposource}"
-			buildResultFolder="${basedir}"
-			baseDirectory="${basedir}"
-		/>
-	</target>
-</project>