diff options
Diffstat (limited to 'production')
-rwxr-xr-x | production/build-functions.shsource | 12 | ||||
-rwxr-xr-x | production/checkConfigIIUs.sh | 2 | ||||
-rwxr-xr-x | production/publish-equinox.sh | 3 | ||||
-rw-r--r-- | production/testScripts/configuration/sdk.tests/testScripts/test.xml | 63 | ||||
-rw-r--r-- | production/testScripts/runTests2.xml | 35 |
5 files changed, 4 insertions, 111 deletions
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"> |