diff options
author | Sravan Kumar Lakkimsetti | 2018-09-11 11:48:11 +0000 |
---|---|---|
committer | Sravan Kumar Lakkimsetti | 2018-09-14 05:46:34 +0000 |
commit | 7fc4b01e8620a7f4f093f0446c67b27363057ba1 (patch) | |
tree | b26ac9a2388a34104771951e6399a3d7d709602a | |
parent | 9955559f67486558041b407e2e0c983746ddbcbb (diff) | |
download | eclipse.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>
14 files changed, 5 insertions, 196 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index ccc3627b1..bcbdb6374 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -282,11 +282,6 @@ <environment> <os>linux</os> <ws>gtk</ws> - <arch>x86</arch> - </environment> - <environment> - <os>linux</os> - <ws>gtk</ws> <arch>x86_64</arch> </environment> <environment> @@ -297,11 +292,6 @@ <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/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml index dbdb9eb1c..e04b64a19 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 c7868db85..791c83003 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 e1037f44e..de4ec1011 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 c3e0b1705..8f18625c0 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 156392095..d63503997 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 9cc39647e..da6739c62 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 e0ee7c2a6..7cda26652 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 ac800b0b1..259a9a022 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 diff --git a/production/build-functions.shsource b/production/build-functions.shsource index ed4322887..4d1fc99fe 100755 --- a/production/build-functions.shsource +++ b/production/build-functions.shsource @@ -694,11 +694,9 @@ fn-gather-sdk () pushd "$TARGET_PRODUCTS" cp org.eclipse.sdk.ide-linux.gtk.ppc64le.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-linux-gtk-ppc64le.tar.gz cp org.eclipse.sdk.ide-linux.gtk.x86_64.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-linux-gtk-x86_64.tar.gz - cp org.eclipse.sdk.ide-linux.gtk.x86.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-linux-gtk.tar.gz cp org.eclipse.sdk.ide-macosx.cocoa.x86_64.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz cp org.eclipse.sdk.ide-macosx.cocoa.x86_64.dmg "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.dmg cp org.eclipse.sdk.ide-win32.win32.x86_64.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-win32-x86_64.zip - cp org.eclipse.sdk.ide-win32.win32.x86.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-win32.zip popd else echo " ERROR: $TARGET_PRODUCTS did not exist in fn-gather-sdks" @@ -732,11 +730,9 @@ fn-gather-platform () pushd "$TARGET_PRODUCTS" cp org.eclipse.platform.ide-linux.gtk.ppc64le.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk-ppc64le.tar.gz cp org.eclipse.platform.ide-linux.gtk.x86_64.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk-x86_64.tar.gz - cp org.eclipse.platform.ide-linux.gtk.x86.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk.tar.gz cp org.eclipse.platform.ide-macosx.cocoa.x86_64.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz cp org.eclipse.platform.ide-macosx.cocoa.x86_64.dmg "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.dmg cp org.eclipse.platform.ide-win32.win32.x86_64.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-win32-x86_64.zip - cp org.eclipse.platform.ide-win32.win32.x86.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-win32.zip popd else echo " ERROR: $TARGET_PRODUCTS did not exist in fn-gather-platform" @@ -1147,9 +1143,9 @@ fn-summarize-apitooling () # Make sure FREEZE_PARAMS is defined, but empty space, if not using freeze reports. FREEZE_PARAMS=" " # When no "freeze" in effect for a release comment these out. Uncomment after M6, changing to appropriate versions. - #FREEZE_PARAMS="-DfreezeBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.10M3-201803080630/eclipse-SDK-4.10M3-win32.zip \ + #FREEZE_PARAMS="-DfreezeBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.10M3-201803080630/eclipse-SDK-4.10M3-win32-x86_64.zip \ # -DfreezeName=Eclipse-SDK-4.10M3 \ - # -DfreezeFilename=eclipse-SDK-4.10M3-win32.zip " + # -DfreezeFilename=eclipse-SDK-4.10M3-win32-x86_64.zip " # this API_PREV_REF_LABEL variable should be changed any time the version used # by previousBaseURL changes. Its purpose is just to localize changes to this one # place, and not have to make further, hard-coded changes to php files. @@ -1169,9 +1165,9 @@ fn-summarize-apitooling () -DbuildId="$BUILD_ID" \ -DbuildLabel="$BUILD_ID" \ -DbuildWorkingArea="${BUILD_HOME}/4${BUILD_TYPE}/gitCache/eclipse.platform.releng.aggregator" \ - -DpreviousBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-SDK-4.8-win32.zip \ + -DpreviousBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-SDK-4.8-win32-x86_64.zip \ -DpreviousBaselineName=Eclipse-SDK-4.8 \ - -DpreviousBaselineFilename=eclipse-SDK-4.8-win32.zip \ + -DpreviousBaselineFilename=eclipse-SDK-4.8-win32-x86_64.zip \ -Djava.io.tmpdir=$TMP_DIR \ ${FREEZE_PARAMS} \ apiToolsReports diff --git a/production/checkConfigIIUs.sh b/production/checkConfigIIUs.sh index a0a03688e..49628913c 100755 --- a/production/checkConfigIIUs.sh +++ b/production/checkConfigIIUs.sh @@ -40,9 +40,7 @@ ECLIPSE_BUILD_DIR="${AGGR_DIR}/eclipse.platform.releng.tychoeclipsebuilder" declare -a PLATFORMS=( \ cocoa.macosx.x86_64 \ gtk.linux.ppc64le \ -gtk.linux.x86 \ gtk.linux.x86_64 \ -win32.win32.x86 \ win32.win32.x86_64 \ ) NPLATFORMS=${#PLATFORMS[@]} diff --git a/production/publish-equinox.sh b/production/publish-equinox.sh index 8b9ea2c01..3d11b41fc 100755 --- a/production/publish-equinox.sh +++ b/production/publish-equinox.sh @@ -84,14 +84,11 @@ fn-eq-gather-starterkit () pushd "$TARGET_PRODUCTS" cp -v org.eclipse.rt.osgistarterkit.product-linux.gtk.x86_64.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-x86_64.tar.gz - cp -v org.eclipse.rt.osgistarterkit.product-linux.gtk.x86.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-x86.tar.gz cp -v org.eclipse.rt.osgistarterkit.product-macosx.cocoa.x86_64.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz cp -v org.eclipse.rt.osgistarterkit.product-macosx.cocoa.x86_64.dmg "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-macosx-cocoa-x86_64.dmg - cp -v org.eclipse.rt.osgistarterkit.product-win32.win32.x86_64.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86_64.zip - cp -v org.eclipse.rt.osgistarterkit.product-win32.win32.x86.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86.zip popd else diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml index 766584736..4da25aea2 100644 --- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml +++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml @@ -187,22 +187,6 @@ <condition property="platformArchive" - value="eclipse-platform-${previousReleaseVersion}-linux-gtk.tar.gz"> - <and> - <os family="unix" /> - <not> - <or> - <or> - <os arch="x86_64" /> - <os arch="amd64" /> - </or> - <os family="mac" /> - </or> - </not> - </and> - </condition> - <condition - property="platformArchive" value="eclipse-platform-${previousReleaseVersion}-macosx-cocoa-x86_64.tar.gz"> <and> <os family="mac" /> @@ -226,14 +210,6 @@ </condition> <condition property="platformArchive" - value="eclipse-platform-${previousReleaseVersion}-win32.zip"> - <and> - <os family="windows" /> - <os arch="x86" /> - </and> - </condition> - <condition - property="platformArchive" value="eclipse-platform-${previousReleaseVersion}-win32-x86_64.zip"> <and> <os family="windows" /> @@ -949,21 +925,6 @@ <echo message="build id of runtimeArchive ${buildIdToUse}" /> <condition property="runtimeArchive" - value="eclipse-SDK-${buildIdToUse}-win32.zip"> - <and> - <equals - arg1="${os}" - arg2="win32" /> - <equals - arg1="${ws}" - arg2="win32" /> - <equals - arg1="${arch}" - arg2="x86" /> - </and> - </condition> - <condition - property="runtimeArchive" value="eclipse-SDK-${buildIdToUse}-win32-x86_64.zip"> <and> <equals @@ -979,21 +940,6 @@ </condition> <condition property="runtimeArchive" - value="eclipse-SDK-${buildIdToUse}-linux-gtk.tar.gz"> - <and> - <equals - arg1="${os}" - arg2="linux" /> - <equals - arg1="${ws}" - arg2="gtk" /> - <equals - arg1="${arch}" - arg2="x86" /> - </and> - </condition> - <condition - property="runtimeArchive" value="eclipse-SDK-${buildIdToUse}-linux-gtk-x86_64.tar.gz"> <and> <equals @@ -2641,15 +2587,6 @@ <os arch="amd64" /> </or> </condition> - <condition - property="guessed.arch" - value="x86"> - <or> - <os arch="x86" /> - <os arch="i386" /> - <os arch="i586" /> - </or> - </condition> <!-- if not set above, set to a ridiculous value, that will at least give hint of action to take once it causes a failure --> <property name="guessed.ws" diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml index 23e367275..02dfa16ea 100644 --- a/production/testScripts/runTests2.xml +++ b/production/testScripts/runTests2.xml @@ -138,23 +138,6 @@ </target> <target - name="getwinzips" - depends="init, getPlatformIndependentZips" - unless="skipInstall"> - <get - verbose="${selectiveVerbose}" - src="${archiveLocation}/eclipse-SDK-${buildIdToUse}-win32.zip" - dest="${executionDir}/eclipse-SDK-${buildIdToUse}-win32.zip" /> - <get - verbose="${selectiveVerbose}" - src="${archiveLocation}/eclipse-platform-${buildIdToUse}-win32.zip" - dest="${executionDir}/eclipse-platform-${buildIdToUse}-win32.zip" /> - <get - verbose="${selectiveVerbose}" - src="${previousReleaseLocation}/eclipse-platform-${previousReleaseVersion}-win32.zip" - dest="${platformLocation}/eclipse-platform-${previousReleaseVersion}-win32.zip" /> - </target> - <target name="getwinzips64" depends="init, getPlatformIndependentZips" unless="skipInstall"> @@ -190,24 +173,6 @@ </target> <target - name="getlinzips32" - depends="init, getPlatformIndependentZips" - unless="skipInstall"> - <get - verbose="${selectiveVerbose}" - src="${archiveLocation}/eclipse-SDK-${buildIdToUse}-linux-gtk.tar.gz" - dest="${executionDir}/eclipse-SDK-${buildIdToUse}-linux-gtk.tar.gz" /> - <get - verbose="${selectiveVerbose}" - src="${archiveLocation}/eclipse-platform-${buildIdToUse}-linux-gtk.tar.gz" - dest="${executionDir}/eclipse-platform-${buildIdToUse}-linux-gtk.tar.gz" /> - <get - verbose="${selectiveVerbose}" - src="${previousReleaseLocation}/eclipse-platform-${previousReleaseVersion}-linux-gtk.tar.gz" - dest="${platformLocation}/eclipse-platform-${previousReleaseVersion}-linux-gtk.tar.gz" /> - </target> - - <target name="getmacosx" depends="init, getPlatformIndependentZips" unless="skipInstall"> |