Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2018-09-11 07:48:11 -0400
committerSravan Kumar Lakkimsetti2018-09-14 01:46:34 -0400
commit7fc4b01e8620a7f4f093f0446c67b27363057ba1 (patch)
treeb26ac9a2388a34104771951e6399a3d7d709602a /eclipse.platform.releng.tychoeclipsebuilder
parent9955559f67486558041b407e2e0c983746ddbcbb (diff)
downloadeclipse.platform.releng.aggregator-7fc4b01e8620a7f4f093f0446c67b27363057ba1.tar.gz
eclipse.platform.releng.aggregator-7fc4b01e8620a7f4f093f0446c67b27363057ba1.tar.xz
eclipse.platform.releng.aggregator-7fc4b01e8620a7f4f093f0446c67b27363057ba1.zip
Bug 536766 - Drop 32 bit support in 4.10
Change-Id: I6e6fc4480cc605861291d7edb2bf223629b92b36 Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Diffstat (limited to 'eclipse.platform.releng.tychoeclipsebuilder')
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml10
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties4
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml24
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml10
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml20
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties4
8 files changed, 1 insertions, 75 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
index dbdb9eb1..e04b64a1 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
@@ -140,21 +140,11 @@
<environment>
<os>linux</os>
<ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
index c7868db8..791c8300 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
@@ -1,15 +1,11 @@
#Properties required by equinox p2 tests
# Version from .../eclipse-junit-tests/src/main/resources/
-org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux=\${basedir}/eclipse-platform-${buildId}-linux-gtk.tar.gz
org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-${buildId}-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32=\${basedir}\\\\eclipse-platform-${buildId}-win32.zip
org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip
org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux=\${basedir}/eclipse-platform-4.8-linux-gtk.tar.gz
org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.8-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=\${basedir}\\\\eclipse-platform-4.8-win32.zip
org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.8-win32-x86_64.zip
org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.8-macosx-cocoa-x86_64.tar.gz
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml
index e1037f44..de4ec101 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml
@@ -200,7 +200,7 @@
<!-- grab the currently built + zipped build -->
<property
name="current_location"
- value="${buildDirectory}/eclipse-SDK-${buildLabel}-win32.zip" />
+ value="${buildDirectory}/eclipse-SDK-${buildLabel}-win32-x86_64.zip" />
<!--
If not available, build failed, for other reasons, so we'll prevent
errors from occuring here, which might be confusing in debugging.
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
index c3e0b170..8f18625c 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
@@ -3,18 +3,10 @@
<zipTypes>
<zipType name="Eclipse SDK">
<platform
- id="SW"
- name="Windows (32 bit version)"
- fileName="eclipse-SDK-${BUILD_ID}-win32.zip"></platform>
- <platform
id="SWX8664"
name="Windows (64 bit version)"
fileName="eclipse-SDK-${BUILD_ID}-win32-x86_64.zip"></platform>
<platform
- id="SLG2"
- name="Linux (32 bit version)"
- fileName="eclipse-SDK-${BUILD_ID}-linux-gtk.tar.gz"></platform>
- <platform
id="SLG264"
name="Linux (64 bit version)"
fileName="eclipse-SDK-${BUILD_ID}-linux-gtk-x86_64.tar.gz"></platform>
@@ -73,18 +65,10 @@
<zipType name="Platform Runtime Binary">
<platform
- id="PW"
- name="Windows (32 bit version)"
- fileName="eclipse-platform-${BUILD_ID}-win32.zip"></platform>
- <platform
id="PWX8664"
name="Windows (64 bit version)"
fileName="eclipse-platform-${BUILD_ID}-win32-x86_64.zip"></platform>
<platform
- id="PLG2"
- name="Linux (32 bit version)"
- fileName="eclipse-platform-${BUILD_ID}-linux-gtk.tar.gz"></platform>
- <platform
id="PLG264"
name="Linux (64 bit version)"
fileName="eclipse-platform-${BUILD_ID}-linux-gtk-x86_64.tar.gz"></platform>
@@ -161,18 +145,10 @@
<zipType name="SWT">
<platform
- id="SWTW"
- name="Windows (32 bit version)"
- fileName="swt-${BUILD_ID}-win32-win32-x86.zip"></platform>
- <platform
id="SWTWX86_64"
name="Windows (64 bit version)"
fileName="swt-${BUILD_ID}-win32-win32-x86_64.zip"></platform>
<platform
- id="SWTLG2"
- name="Linux (32 bit version)"
- fileName="swt-${BUILD_ID}-gtk-linux-x86.zip"></platform>
- <platform
id="SWTLG64"
name="Linux (64 bit version)"
fileName="swt-${BUILD_ID}-gtk-linux-x86_64.zip"></platform>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
index 15639209..d6350399 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
@@ -46,21 +46,11 @@
<environment>
<os>linux</os>
<ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
index 9cc39647..da6739c6 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
@@ -13,9 +13,7 @@
<target name="equinoxlaunchers">
<property name="archiveRoot" value="launchers" />
- <buildRepos os="win32" ws="win32" arch="x86" archiveName="${archiveRoot}-win32.win32.x86.${buildId}.zip" />
<buildRepos os="win32" ws="win32" arch="x86_64" archiveName="${archiveRoot}-win32.win32.x86_64.${buildId}.zip" />
- <buildRepos os="linux" ws="gtk" arch="x86" archiveName="${archiveRoot}-linux.gtk.x86.${buildId}.tar.gz" />
<buildRepos os="linux" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-linux.gtk.x86_64.${buildId}.tar.gz" />
<buildRepos os="linux" ws="gtk" arch="ppc64le" archiveName="${archiveRoot}-linux.gtk.ppc64le.${buildId}.tar.gz" />
<buildRepos os="macosx" ws="cocoa" arch="x86_64" archiveName="${archiveRoot}-macosx.cocoa.x86_64.${buildId}.tar.gz" />
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
index e0ee7c2a..7cda2665 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
@@ -263,21 +263,11 @@
<zipType name="Launchers">
<platform
format="equinox"
- id="SW"
- name="Windows"
- fileName="launchers-win32.win32.x86.${BUILD_ID}.zip" />
- <platform
- format="equinox"
id="SW64"
name="Windows (x86_64)"
fileName="launchers-win32.win32.x86_64.${BUILD_ID}.zip" />
<platform
format="equinox"
- id="SLG2"
- name="Linux (x86/GTK+)"
- fileName="launchers-linux.gtk.x86.${BUILD_ID}.tar.gz" />
- <platform
- format="equinox"
id="SLG264"
name="Linux (x86_64/GTK+)"
fileName="launchers-linux.gtk.x86_64.${BUILD_ID}.tar.gz" />
@@ -296,21 +286,11 @@
<zipType name="OSGiStarterKits">
<platform
format="equinox"
- id="ESW"
- name="Windows"
- fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86.zip" />
- <platform
- format="equinox"
id="ESW64"
name="Windows (x86_64)"
fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86_64.zip" />
<platform
format="equinox"
- id="ESLG2"
- name="Linux (x86/GTK+)"
- fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-x86.tar.gz" />
- <platform
- format="equinox"
id="ESLG264"
name="Linux (x86_64/GTK+)"
fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-x86_64.tar.gz" />
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
index ac800b0b..259a9a02 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
@@ -13,8 +13,6 @@
###############################################################################
#root.permissions.755=eclipse
-root.win32.win32.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/win32/win32/x86
-root.win32.win32.x86.permissions.755=eclipse.exe
root.win32.win32.x86_64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/win32/win32/x86_64
root.win32.win32.x86_64.permissions.755=eclipse.exe
@@ -34,8 +32,6 @@ root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse
root.linux.gtk.ppc64le=rootfiles/linux.gtk.ppc64le,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64le
root.linux.gtk.ppc64le.permissions.755=eclipse
-root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86
-root.linux.gtk.x86.permissions.755=eclipse
root.linux.gtk.x86_64=rootfiles/linux.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86_64
root.linux.gtk.x86_64.permissions.755=eclipse

Back to the top