Bug 441691 - Remove Mac OS X 32-bit build

7 files changed, 16 insertions, 23 deletions

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 97b60b3ba..f9e23477a 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
@@ -5,14 +5,12 @@ org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux=\${basedir}/eclip
 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=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa.tar.gz
 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.4-linux-gtk.tar.gz
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.4-linux-gtk-x86_64.tar.gz
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=\${basedir}\\\\eclipse-platform-4.4-win32.zip
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.4-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx=\${basedir}/eclipse-platform-4.4-macosx-cocoa.tar.gz
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.4-macosx-cocoa-x86_64.tar.gz
 
 org.eclipse.equinox.p2.tests.current.build.repo=http\://download.eclipse.org/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
index 0df71b225..966bed1bf 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
@@ -237,17 +237,19 @@
         </or>
       </and>
     </condition>
+  <!--
     <condition
       property="platformArchive"
       value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx}">
       <and>
         <os family="mac" />
         <os family="unix" />
-        <!-- should not need, as long as x86_64 rules (above) comes first
+        <!- - should not need, as long as x86_64 rules (above) comes first
              <os arch="i386" />
-        -->
+        - ->
       </and>
     </condition>
+          -->
     <condition
       property="platformArchive"
       value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32}">
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
index e8b0962a5..fc99f39ed 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
@@ -147,17 +147,6 @@
                         value="cocoa" />
                     <param
                         name="arch"
-                        value="" />
-                </antcall>
-                <antcall target="packageSwtStandalone">
-                    <param
-                        name="os"
-                        value="macosx" />
-                    <param
-                        name="ws"
-                        value="cocoa" />
-                    <param
-                        name="arch"
                         value="x86_64" />
                 </antcall>
                 <antcall target="packageSwtStandalone">
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 2bc2ddfb3..4608063cb 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
@@ -30,8 +30,8 @@
 
     <buildRepos os="aix" ws="gtk" arch="ppc" archiveName="${archiveRoot}-aix.gtk.ppc.${buildId}.zip" />
     <buildRepos os="aix" ws="gtk" arch="ppc64" archiveName="${archiveRoot}-aix.gtk.ppc64.${buildId}.zip" />
-    <buildRepos os="macosx" ws="cocoa" arch="x86" archiveName="${archiveRoot}-macosx.cocoa.x86.${buildId}.tar.gz" />
-    <buildRepos os="macosx" ws="cocoa" arch="x86_64" archiveName="${archiveRoot}-macosx.cocoa.x86_64.${buildId}.tar.gz" />
+    <!-- <buildRepos os="macosx" ws="cocoa" arch="x86" archiveName="${archiveRoot}-macosx.cocoa.x86.${buildId}.tar.gz" />  -->
+        <buildRepos os="macosx" ws="cocoa" arch="x86_64" archiveName="${archiveRoot}-macosx.cocoa.x86_64.${buildId}.tar.gz" />
   </target>
 
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
index 12521b353..6cca0749a 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
@@ -15,8 +15,8 @@ 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
 
-root.macosx.cocoa.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/x86
-root.macosx.cocoa.x86.permissions.755=Eclipse.app/Contents/MacOS/eclipse
+#root.macosx.cocoa.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/x86
+#root.macosx.cocoa.x86.permissions.755=Eclipse.app/Contents/MacOS/eclipse
 root.macosx.cocoa.x86_64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/x86_64
 root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse
 
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 4615f5239..3383082ba 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -633,9 +633,9 @@ fn-gather-sdk ()
     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
     #tar cfz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz -C org.eclipse.sdk.ide/macosx/cocoa/x86_64 eclipse
-    cp org.eclipse.sdk.ide-macosx.cocoa.x86.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-macosx-cocoa.tar.gz
+    # cp org.eclipse.sdk.ide-macosx.cocoa.x86.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-macosx-cocoa.tar.gz
     #tar cfz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-macosx-cocoa.tar.gz -C org.eclipse.sdk.ide/macosx/cocoa/x86 eclipse
-    cp org.eclipse.sdk.ide-solaris.gtk.sparc.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-solaris-gtk.zip
+    #cp org.eclipse.sdk.ide-solaris.gtk.sparc.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-solaris-gtk.zip
     cp org.eclipse.sdk.ide-solaris.gtk.x86.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-solaris-gtk-x86.zip
     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
@@ -672,7 +672,7 @@ fn-gather-platform ()
     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
     #tar cfz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz -C org.eclipse.platform.ide/macosx/cocoa/x86_64 eclipse
-    cp org.eclipse.platform.ide-macosx.cocoa.x86.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa.tar.gz
+    # cp org.eclipse.platform.ide-macosx.cocoa.x86.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa.tar.gz
     #tar cfz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa.tar.gz -C org.eclipse.platform.ide/macosx/cocoa/x86 eclipse
     cp org.eclipse.platform.ide-solaris.gtk.sparc.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-solaris-gtk.zip
     cp org.eclipse.platform.ide-solaris.gtk.x86.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-solaris-gtk-x86.zip
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
index c2cbcdce8..d7638d8ca 100644
--- a/production/testScripts/runTests2.xml
+++ b/production/testScripts/runTests2.xml
@@ -133,6 +133,7 @@
       dest="${executionDir}/platformLocation/eclipse-platform-${previousReleaseVersion}-linux-gtk.tar.gz" />
   </target>
 
+  <!--
   <target
     name="getmaczips"
     depends="getPlatformIndependentZips"
@@ -147,7 +148,8 @@
       src="${stableDirectorLocation}/eclipse-platform-${previousReleaseVersion}-macosx-cocoa.tar.gz"
       dest="${executionDir}/platformLocation/eclipse-platform-${previousReleaseVersion}-macosx-cocoa.tar.gz" />
   </target>
-
+  -->
+  
   <target
     name="getmacosx"
     depends="getPlatformIndependentZips"
@@ -350,6 +352,7 @@
         arg1="${testPlatform}"
         arg2="linux32" />
     </condition>
+    <!--
     <condition
       property="getArtifacts"
       value="getmaczips">
@@ -357,6 +360,7 @@
         arg1="${testPlatform}"
         arg2="macmini" />
     </condition>
+    -->
     <condition
       property="getArtifacts"
       value="getmacosx">