Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2020-11-11 15:36:54 +0000
committerAlexander Kurtakov2020-11-11 15:36:54 +0000
commit438f47d8415f490dcef5da297720f4f2c91c0a80 (patch)
tree3a09fe6afadd39ec53147176a9d265ef2cfc1933
parent7c31bc8c66cc330073edb2ae5f3aed3bd764f48e (diff)
downloadeclipse.platform.releng.aggregator-438f47d8415f490dcef5da297720f4f2c91c0a80.tar.gz
eclipse.platform.releng.aggregator-438f47d8415f490dcef5da297720f4f2c91c0a80.tar.xz
eclipse.platform.releng.aggregator-438f47d8415f490dcef5da297720f4f2c91c0a80.zip
Bug 568719 - Stop building and publishing pde zips
It's easier to use the p2 repo than these zips. It also simplifies the releng. Change-Id: I11020ec73b36c885c27cca0bb320f3646973e5ae Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--cje-production/Y-build/publish.xml2
-rw-r--r--cje-production/Y-build/publish2.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml141
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.html21
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_java16.php20
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_master.php20
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml18
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/repos/build.xml15
10 files changed, 4 insertions, 239 deletions
diff --git a/cje-production/Y-build/publish.xml b/cje-production/Y-build/publish.xml
index 4f94319f0..92beec05a 100644
--- a/cje-production/Y-build/publish.xml
+++ b/cje-production/Y-build/publish.xml
@@ -101,7 +101,7 @@
<!-- This list is for Eclipse. Equinox overrides and provides their own list -->
<property
name="dropTokenList"
- value="%sdk%,%tests%,%rcpruntime%,%rcpsdk%,%runtime%,%jdt%,%jdtsdk%,%jdtc%,%pde%,%pdesdk%,%swt%,%swtchromium%" />
+ value="%sdk%,%tests%,%rcpruntime%,%rcpsdk%,%runtime%,%jdt%,%jdtsdk%,%jdtc%,%swt%,%swtchromium%" />
<!-- xml results directory -->
<condition
diff --git a/cje-production/Y-build/publish2.xml b/cje-production/Y-build/publish2.xml
index 349fb05cc..81429e7b4 100644
--- a/cje-production/Y-build/publish2.xml
+++ b/cje-production/Y-build/publish2.xml
@@ -101,7 +101,7 @@
<!-- This list is for Eclipse. Equinox overrides and provides their own list -->
<property
name="dropTokenList"
- value="%sdk%,%tests%,%rcpruntime%,%rcpsdk%,%runtime%,%jdt%,%jdtsdk%,%jdtc%,%pde%,%pdesdk%,%swt%,%swtchromium%" />
+ value="%sdk%,%tests%,%rcpruntime%,%rcpsdk%,%runtime%,%jdt%,%jdtsdk%,%jdtc%,%swt%,%swtchromium%" />
<!-- xml results directory -->
<condition
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
index be715e228..fd4ff4b31 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
@@ -331,54 +331,6 @@
<append>true</append>
</configuration>
</execution>
-
-
- <execution>
- <id>mirror-org.eclipse.pde</id>
- <phase>package</phase>
- <goals>
- <goal>mirror</goal>
- </goals>
- <configuration>
- <source>
- <!-- source repositories to mirror from -->
- <repository>
- <url>${project.baseUri}/target/repository</url>
- <layout>p2</layout>
- <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
- </repository>
- </source>
- <!-- starting from here all configuration parameters are optional -->
- <!-- they are only shown here with default values for documentation purpose -->
- <!-- List of IUs to mirror. If omitted, allIUs will be mirrored. -->
- <!-- Omitted IU version element means latest version of the IU -->
- <ius>
- <iu>
- <id>org.eclipse.pde.feature.group</id>
- </iu>
- </ius>
- <!-- The destination directory to mirror to. -->
- <destination>${project.build.directory}/repos/org.eclipse.pde</destination>
- <!-- Whether only strict dependencies should be followed. -->
- <!-- "strict" means perfect version match -->
- <followStrictOnly>true</followStrictOnly>
- <!-- Whether or not to follow optional requirements. -->
- <includeOptional>false</includeOptional>
- <!-- Whether or not to follow non-greedy requirements. -->
- <includeNonGreedy>false</includeNonGreedy>
- <!-- Filter properties. E.g. filter only one platform -->
- <!-- Whether to filter the resulting set of IUs to only -->
- <!-- include the latest version of each IU -->
- <latestVersionOnly>true</latestVersionOnly>
- <!-- don't mirror artifacts, only metadata -->
- <mirrorMetadataOnly>false</mirrorMetadataOnly>
- <!-- whether to compress the content.xml/artifacts.xml -->
- <compress>true</compress>
- <!-- whether to append to the target repository content -->
- <append>true</append>
- <includePacked>false</includePacked>
- </configuration>
- </execution>
<execution>
<id>mirror-org.eclipse.jdt</id>
<phase>package</phase>
@@ -426,99 +378,6 @@
</configuration>
</execution>
<execution>
- <id>mirror-org.eclipse.pde.api.tools.ee.feature</id>
- <phase>package</phase>
- <goals>
- <goal>mirror</goal>
- </goals>
- <configuration>
- <source>
- <!-- source repositories to mirror from -->
- <repository>
- <url>${project.baseUri}/target/repository</url>
- <layout>p2</layout>
- <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
- </repository>
- </source>
- <!-- starting from here all configuration parameters are optional -->
- <!-- they are only shown here with default values for documentation purpose -->
- <!-- List of IUs to mirror. If omitted, allIUs will be mirrored. -->
- <!-- Omitted IU version element means latest version of the IU -->
- <ius>
- <iu>
- <id>org.eclipse.pde.api.tools.ee.feature.feature.group</id>
- </iu>
- </ius>
- <!-- The destination directory to mirror to. -->
- <destination>${project.build.directory}/repos/org.eclipse.pde.api.tools.ee.feature</destination>
- <!-- Whether only strict dependencies should be followed. -->
- <!-- "strict" means perfect version match -->
- <followStrictOnly>true</followStrictOnly>
- <!-- Whether or not to follow optional requirements. -->
- <includeOptional>false</includeOptional>
- <!-- Whether or not to follow non-greedy requirements. -->
- <includeNonGreedy>false</includeNonGreedy>
- <!-- Filter properties. E.g. filter only one platform -->
- <!-- Whether to filter the resulting set of IUs to only -->
- <!-- include the latest version of each IU -->
- <latestVersionOnly>true</latestVersionOnly>
- <!-- don't mirror artifacts, only metadata -->
- <mirrorMetadataOnly>false</mirrorMetadataOnly>
- <!-- whether to compress the content.xml/artifacts.xml -->
- <compress>true</compress>
- <!-- whether to append to the target repository content -->
- <append>true</append>
- <includePacked>false</includePacked>
- </configuration>
- </execution>
- <execution>
- <id>mirror-org.eclipse.pde.source</id>
- <phase>package</phase>
- <goals>
- <goal>mirror</goal>
- </goals>
- <configuration>
- <source>
- <!-- source repositories to mirror from -->
- <repository>
- <url>${project.baseUri}/target/repository</url>
- <layout>p2</layout>
- <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
- </repository>
- </source>
- <!-- starting from here all configuration parameters are optional -->
- <!-- they are only shown here with default values for documentation purpose -->
- <!-- List of IUs to mirror. If omitted, allIUs will be mirrored. -->
- <!-- Omitted IU version element means latest version of the IU -->
- <ius>
- <iu>
- <id>org.eclipse.pde.feature.group</id>
- <id>org.eclipse.pde.source.feature.group</id>
- </iu>
- </ius>
- <!-- The destination directory to mirror to. -->
- <destination>${project.build.directory}/repos/org.eclipse.pde.source</destination>
- <!-- Whether only strict dependencies should be followed. -->
- <!-- "strict" means perfect version match -->
- <followStrictOnly>true</followStrictOnly>
- <!-- Whether or not to follow optional requirements. -->
- <includeOptional>false</includeOptional>
- <!-- Whether or not to follow non-greedy requirements. -->
- <includeNonGreedy>false</includeNonGreedy>
- <!-- Filter properties. E.g. filter only one platform -->
- <!-- Whether to filter the resulting set of IUs to only -->
- <!-- include the latest version of each IU -->
- <latestVersionOnly>true</latestVersionOnly>
- <!-- don't mirror artifacts, only metadata -->
- <mirrorMetadataOnly>false</mirrorMetadataOnly>
- <!-- whether to compress the content.xml/artifacts.xml -->
- <compress>true</compress>
- <!-- whether to append to the target repository content -->
- <append>true</append>
- <includePacked>false</includePacked>
- </configuration>
- </execution>
- <execution>
<id>mirror-org.eclipse.jdt.source</id>
<phase>package</phase>
<goals>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
index 1fe1cc51a..2d1ab377f 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
@@ -101,7 +101,7 @@
<!-- This list is for Eclipse. Equinox overrides and provides their own list -->
<property
name="dropTokenList"
- value="%sdk%,%tests%,%rcpruntime%,%rcpsdk%,%runtime%,%jdt%,%jdtsdk%,%jdtc%,%pde%,%pdesdk%,%swt%,%swtchromium%" />
+ value="%sdk%,%tests%,%rcpruntime%,%rcpsdk%,%runtime%,%jdt%,%jdtsdk%,%jdtc%,%swt%,%swtchromium%" />
<!-- xml results directory -->
<condition
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml
index b9961df3c..e3b2a7fe2 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml
@@ -101,7 +101,7 @@
<!-- This list is for Eclipse. Equinox overrides and provides their own list -->
<property
name="dropTokenList"
- value="%sdk%,%tests%,%rcpruntime%,%rcpsdk%,%runtime%,%jdt%,%jdtsdk%,%jdtc%,%pde%,%pdesdk%,%swt%,%swtchromium%" />
+ value="%sdk%,%tests%,%rcpruntime%,%rcpsdk%,%runtime%,%jdt%,%jdtsdk%,%jdtc%,%swt%,%swtchromium%" />
<!-- xml results directory -->
<condition
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.html b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.html
index 13f53e8d4..604013d26 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.html
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.html
@@ -43,8 +43,6 @@
<li><a href="#JDTRuntime">JDT Runtime Binary</a></li>
<li><a href="#JDTSDK">JDT SDK</a></li>
<li><a href="#JDTCORE">JDT Core Batch Compiler</a></li>
- <li><a href="#PDERuntime">PDE Runtime Binary</a></li>
- <li><a href="#PDESDK">PDE SDK</a></li>
<li><a href="#SWT">SWT binary and Source</a></li>
</ul>
@@ -149,25 +147,6 @@
examples of usage, please refer to this help section: JDT Plug-in Developer Guide&gt;Programmer's Guide&gt;JDT
Core&gt;Compiling Java code.</li>
</ul></li>
- <li><a name="PDERuntime"> <b> PDE Runtime Binary </b>
- </a>
- <ul>
- <li>This p2 repository contains the Plug-in Development Enviroment bundles only, with user documentation. The
- Eclipse platform and Java development tools are NOT included. You can combine this with the Platform and JDT Runtime
- Binary or SDK if your tools rely on the PDE being present.</li>
- </ul></li>
- <li><a name="PDEProducts"> <b> PDE Build Products </b>
- </a>
- <ul>
- <li>The PDE Builders are self-contained, executable PDE Build configurations that can be used to build OSGi and
- Eclipse-based systems. They can also be used as the basis for more sophisticated build systems that run tests, do API
- scans, publish builds etc.</li>
- </ul></li>
- <li><a name="PDESDK"> <b> PDE SDK </b>
- </a>
- <ul>
- <li>These drops contain the PDE Runtime Binary with associated source.</li>
- </ul></li>
<li><a name="SWT"> <b> SWT Binary and Source </b>
</a>
<ul>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_java16.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_java16.php
index 9506a7008..69d835d12 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_java16.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_java16.php
@@ -75,8 +75,6 @@ require("DL.thin.header.php.html");
<li><a href="#JDTRuntime">JDT Runtime Binary</a></li>
<li><a href="#JDTSDK">JDT SDK</a></li>
<li><a href="#JDTCORE">JDT Core Batch Compiler</a></li>
- <li><a href="#PDERuntime">PDE Runtime Binary</a></li>
- <li><a href="#PDESDK">PDE SDK</a></li>
<li><a href="#SWT">SWT binary and Source</a></li>
<li><a href="#SWTChromium">SWT Chromium</a></li>
</ul>
@@ -450,24 +448,6 @@ else {
%jdtc%
</table>
-<h3 id="PDERuntime">PDE Runtime Binary&nbsp;<a href="details.html#PDERuntime"><i class="fa fa-info-circle">&nbsp;</i></a>
-</h3>
-<?php startTable(); ?>
-<tr>
- <?php columnHeads(); ?>
-</tr>
-%pde%
-</table>
-
-<h3 id="PDESDK">PDE SDK&nbsp;<a href="details.html#PDESDK"><i class="fa fa-info-circle">&nbsp;</i></a>
-</h3>
-<?php startTable(); ?>
-<tr>
- <?php columnHeads(); ?>
-</tr>
-%pdesdk%
-</table>
-
<h3 id="SWT">SWT Binary and Source&nbsp;<a href="details.html#SWT"><i class="fa fa-info-circle">&nbsp;</i></a>
</h3>
<?php startTable(); ?>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_master.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_master.php
index fcd8311c2..2d839f907 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_master.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_master.php
@@ -75,8 +75,6 @@ require("DL.thin.header.php.html");
<li><a href="#JDTRuntime">JDT Runtime Binary</a></li>
<li><a href="#JDTSDK">JDT SDK</a></li>
<li><a href="#JDTCORE">JDT Core Batch Compiler</a></li>
- <li><a href="#PDERuntime">PDE Runtime Binary</a></li>
- <li><a href="#PDESDK">PDE SDK</a></li>
<li><a href="#SWT">SWT binary and Source</a></li>
<li><a href="#SWTChromium">SWT Chromium</a></li>
</ul>
@@ -455,24 +453,6 @@ else {
%jdtc%
</table>
-<h3 id="PDERuntime">PDE Runtime Binary&nbsp;<a href="details.html#PDERuntime"><i class="fa fa-info-circle">&nbsp;</i></a>
-</h3>
-<?php startTable(); ?>
-<tr>
- <?php columnHeads(); ?>
-</tr>
-%pde%
-</table>
-
-<h3 id="PDESDK">PDE SDK&nbsp;<a href="details.html#PDESDK"><i class="fa fa-info-circle">&nbsp;</i></a>
-</h3>
-<?php startTable(); ?>
-<tr>
- <?php columnHeads(); ?>
-</tr>
-%pdesdk%
-</table>
-
<h3 id="SWT">SWT Binary and Source&nbsp;<a href="details.html#SWT"><i class="fa fa-info-circle">&nbsp;</i></a>
</h3>
<?php startTable(); ?>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
index 384dad2ec..21730d722 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
@@ -112,24 +112,6 @@
fileName="ecjsrc-${BUILD_ID}.jar"></platform>
</zipType>
- <zipType name="PDE Runtime">
- <platform
- id="PRR"
- name="&lt;img src = &quot;repo.gif&quot; alt=&quot;PDE Repo&quot; /> PDE Repo "
- fileName="org.eclipse.pde-${BUILD_ID}.zip"></platform>
- <platform
- id="PAR"
- name="&lt;img src = &quot;repo.gif&quot; alt=&quot;PDE API Tools&quot; /> PDE API Tools execution environment fragments repo"
- fileName="org.eclipse.pde.api.tools.ee.feature-${BUILD_ID}.zip"></platform>
- </zipType>
-
- <zipType name="PDE SDK">
- <platform
- id="PSR"
- name="&lt;img src = &quot;repo.gif&quot; alt=&quot;PDE Source Repo&quot; /> PDE Source Repo "
- fileName="org.eclipse.pde.source-${BUILD_ID}.zip"></platform>
- </zipType>
-
<zipType name="SWT">
<platform
id="SWTWX86_64"
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/repos/build.xml b/eclipse.platform.releng.tychoeclipsebuilder/repos/build.xml
index 333009a9f..79c03b927 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/repos/build.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/repos/build.xml
@@ -1,29 +1,14 @@
<project name="Build Repos" default="all" basedir=".">
<target name="all">
- <antcall target="pde" />
- <antcall target="pde-api" />
<antcall target="jdt" />
- <antcall target="pdesource" />
<antcall target="jdtsource" />
</target>
- <target name="pde">
- <buildRepos feature="org.eclipse.pde" />
- </target>
-
- <target name="pde-api">
- <buildRepos feature="org.eclipse.pde.api.tools.ee.feature" />
- </target>
-
<target name="jdt">
<buildRepos feature="org.eclipse.jdt" />
</target>
- <target name="pdesource">
- <buildReposSource feature="org.eclipse.pde" />
- </target>
-
<target name="jdtsource">
<buildReposSource feature="org.eclipse.jdt" />
</target>

Back to the top