352883 updated equinox and jdt to juno m1

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
sonatype · Aug 25, 2011 · 048054f · 048054f
1 parent 4393caf
commit 048054f
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 33 deletions.
diff --git a/bootstrap.sh b/bootstrap.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Location of Eclipse SDK with RCP Delta pack
-TYCHO_TEST_TARGET_PLATFORM="-Dtycho.testTargetPlatform=/opt/eclipse-3.7-rcp/eclipse"
+TYCHO_TEST_TARGET_PLATFORM="-Dtycho.testTargetPlatform=/opt/eclipse-3.8-rcp/eclipse"
 
 # location of maven used to build bootstrap tycho distribution
 TYCHO_M2_HOME=/opt/maven

diff --git a/pom.xml b/pom.xml
@@ -54,9 +54,9 @@
 		<maven-version>3.0</maven-version>
 
 		<!-- 
-			Version corresponds to the Eclipse 3.7
+			Version corresponds to the Eclipse 4.2M1
 
-			EQUINOX_VERSION=3.7.0.v20110613
+			EQUINOX_VERSION=3.8.0.v20110726-1606
 
 /opt/maven/bin/mvn install:install-file -Dfile=org.eclipse.osgi_$EQUINOX_VERSION.jar -Dsources=org.eclipse.osgi.source_$EQUINOX_VERSION.jar \
 	-DgroupId=org.eclipse.tycho -DartifactId=org.eclipse.osgi -Dversion=$EQUINOX_VERSION -Dpackaging=jar
@@ -71,12 +71,12 @@
 
 			Promote the staging repo to http://repository.sonatype.org/content/repositories/releases/
 		 -->
-		<equinoxVersion>3.7.0.v20110613</equinoxVersion>
+		<equinoxVersion>3.8.0.v20110726-1606</equinoxVersion>
 
 		<!-- 
-			Version corresponds to the Eclipse 3.7
+			Version corresponds to the Eclipse 4.2M1
 			
-			JDT_VERSION=3.7.0.v_B61
+			JDT_VERSION=3.8.0.v_C03
 			
 /opt/maven/bin/mvn install:install-file -Dfile=org.eclipse.jdt.core_$JDT_VERSION.jar -Dsources=org.eclipse.jdt.core.source_$JDT_VERSION.jar \
 	-DgroupId=org.eclipse.tycho -DartifactId=org.eclipse.jdt.core -Dversion=$JDT_VERSION -Dpackaging=jar
@@ -91,7 +91,7 @@
 
 			Promote the staging repo to http://repository.sonatype.org/content/repositories/releases/
 		 -->
-		<jdtVersion>3.7.0.v_B61</jdtVersion>
+		<jdtVersion>3.8.0.v_C03</jdtVersion>
 
 		<!-- version of tycho used by this build -->
 		<tychoBootstrapVersion>0.11.1</tychoBootstrapVersion>

diff --git a/tycho-its/projects/MNGECLIPSE1105rootfiles/MNGECLIPSE-1105.product b/tycho-its/projects/MNGECLIPSE1105rootfiles/MNGECLIPSE-1105.product
@@ -7,7 +7,7 @@
    </configIni>
 
    <launcherArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+      <vmArgsMac>-XstartOnFirstThread</vmArgsMac>
    </launcherArgs>
 
    <windowImages/>
@@ -38,7 +38,7 @@
       <plugin id="org.eclipse.equinox.app"/>
       <plugin id="org.eclipse.equinox.common"/>
       <plugin id="org.eclipse.equinox.launcher"/>
-      <plugin id="org.eclipse.equinox.launcher.carbon.macosx" fragment="true"/>
+      <plugin id="org.eclipse.equinox.launcher.cocoa.macosx" fragment="true"/>
       <plugin id="org.eclipse.equinox.preferences"/>
       <plugin id="org.eclipse.equinox.registry"/>
       <plugin id="org.eclipse.equinox.security"/>
@@ -50,12 +50,12 @@
       <plugin id="org.eclipse.osgi"/>
       <plugin id="org.eclipse.rcp"/>
       <plugin id="org.eclipse.swt"/>
-      <plugin id="org.eclipse.swt.carbon.macosx" fragment="true"/>
+      <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
       <plugin id="org.eclipse.text"/>
       <plugin id="org.eclipse.ui"/>
       <plugin id="org.eclipse.ui.browser"/>
       <plugin id="org.eclipse.ui.browser.source"/>
-      <plugin id="org.eclipse.ui.carbon" fragment="true"/>
+      <plugin id="org.eclipse.ui.cocoa" fragment="true"/>
       <plugin id="org.eclipse.ui.forms"/>
       <plugin id="org.eclipse.ui.ide"/>
       <plugin id="org.eclipse.ui.intro"/>

diff --git a/tycho-its/projects/MNGECLIPSE1105rootfiles/root.properties b/tycho-its/projects/MNGECLIPSE1105rootfiles/root.properties
@@ -3,6 +3,6 @@ root=file:rootfiles/license.txt
 root.folder.jre=file:rootfiles/jre
 
 ## specific folder "configuration" for a specific platform (mac), relative
-root.macosx.carbon.x86.folder.configuration=rootfiles/macosx.carbon.x86/configuration
+root.macosx.cocoa.x86_64.folder.configuration=rootfiles/macosx.cocoa.x86_64/configuration
 root.linux.gtk.x86.folder.configuration=rootfiles/linux.gtk.x86/configuration
 root.win32.win32.win32.folder.configuration=rootfiles/win32.win32.x86/configuration
diff --git a/...arbon.x86/configuration/config.macosx.txt → ...oa.x86_64/configuration/config.macosx.txt b/...arbon.x86/configuration/config.macosx.txt → ...oa.x86_64/configuration/config.macosx.txt
diff --git a/tycho-its/projects/TYCHO0294ProductP2TargetPlatformResolver/pom.xml b/tycho-its/projects/TYCHO0294ProductP2TargetPlatformResolver/pom.xml
@@ -52,18 +52,11 @@
               <ws>win32</ws>
               <arch>x86</arch>
             </environment>
-            <environment>
-              <os>macosx</os>
-              <ws>carbon</ws>
-              <arch>x86</arch>
-            </environment>
-            <!--
             <environment>
               <os>macosx</os>
               <ws>cocoa</ws>
               <arch>x86_64</arch>
             </environment>
-             -->
           </environments>
         </configuration>
       </plugin>

diff --git a/tycho-its/projects/TYCHO232multiplatformProduct/tycho.demo.feature/feature.xml b/tycho-its/projects/TYCHO232multiplatformProduct/tycho.demo.feature/feature.xml
@@ -69,9 +69,10 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.swt.carbon.macosx"
+         id="org.eclipse.swt.cocoa.macosx.x86_64"
          os="macosx"
-         ws="carbon"
+         ws="cocoa"
+         arch="x86_64"
          download-size="0"
          install-size="0"
          version="0.0.0"

diff --git a/tycho-its/projects/TYCHO232multiplatformProduct/tycho.demo.rcp/pom.xml b/tycho-its/projects/TYCHO232multiplatformProduct/tycho.demo.rcp/pom.xml
@@ -30,8 +30,8 @@
             </environment>
             <environment>
               <os>macosx</os>
-              <ws>carbon</ws>
-              <arch>x86</arch>
+              <ws>cocoa</ws>
+              <arch>x86_64</arch>
             </environment>
           </environments>
         </configuration>

diff --git a/tycho-its/projects/TYCHO232multiplatformProduct/tycho.demo.rcp/tycho.demo.rcp.product b/tycho-its/projects/TYCHO232multiplatformProduct/tycho.demo.rcp/tycho.demo.rcp.product
@@ -19,7 +19,7 @@
 
    <launcherArgs>
       <vmArgsLin>-Xmx1500m</vmArgsLin>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Xmx1500m</vmArgsMac>
+      <vmArgsMac>-XstartOnFirstThread -Xmx1500m</vmArgsMac>
       <vmArgsWin>-Xmx640m -Dsun.java2d.noddraw=true</vmArgsWin>
    </launcherArgs>
 
@@ -58,7 +58,7 @@
       <plugin id="org.eclipse.jface.databinding"/>
       <plugin id="org.eclipse.osgi"/>
       <plugin id="org.eclipse.swt"/>
-      <plugin id="org.eclipse.swt.carbon.macosx" fragment="true"/>
+      <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
       <plugin id="org.eclipse.swt.gtk.linux.ppc" fragment="true"/>
       <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
       <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
@@ -69,7 +69,7 @@
       <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
       <plugin id="org.eclipse.swt.wpf.win32.x86" fragment="true"/>
       <plugin id="org.eclipse.ui"/>
-      <plugin id="org.eclipse.ui.carbon" fragment="true"/>
+      <plugin id="org.eclipse.ui.cocoa" fragment="true"/>
       <plugin id="org.eclipse.ui.workbench"/>
       <plugin id="org.junit"/>
       <plugin id="tycho.demo" fragment=""/>

diff --git a/tycho-its/projects/TYCHO300launcherIcons/product/pom.xml b/tycho-its/projects/TYCHO300launcherIcons/product/pom.xml
@@ -34,8 +34,8 @@
             </environment>
             <environment>
               <os>macosx</os>
-              <ws>carbon</ws>
-              <arch>x86</arch>
+              <ws>cocoa</ws>
+              <arch>x86_64</arch>
             </environment>
           </environments>
         </configuration>

diff --git a/...ho/test/TYCHO0294ProductP2TargetPlatformResolver/ProductP2TargetPlatformResolverTest.java b/...ho/test/TYCHO0294ProductP2TargetPlatformResolver/ProductP2TargetPlatformResolverTest.java
@@ -29,7 +29,8 @@ public void testBasic() throws Exception {
 
         assertDirectoryExists(target,
                 "linux.gtk.x86_64/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_*");
-        assertDirectoryExists(target, "macosx.carbon.x86/eclipse/plugins/org.eclipse.equinox.launcher.carbon.macosx_*");
+        assertDirectoryExists(target,
+                "macosx.cocoa.x86_64/eclipse/plugins/org.eclipse.equinox.launcher.cocoa.macosx.x86_64_*");
         assertDirectoryExists(target, "win32.win32.x86/eclipse/plugins/org.eclipse.equinox.launcher.win32.win32.x86_*");
     }
 

diff --git a/...st/java/org/eclipse/tycho/test/TYCHO232multiplatformProduct/MultiplatformProductTest.java b/...st/java/org/eclipse/tycho/test/TYCHO232multiplatformProduct/MultiplatformProductTest.java
@@ -28,7 +28,7 @@ public void exportProduct() throws Exception {
 
         // assert expanded product folders have proper swt fragments
         assertFileExists(targetdir, "linux.gtk.x86_64/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64_*.jar");
-        assertFileExists(targetdir, "macosx.carbon.x86/eclipse/plugins/org.eclipse.swt.carbon.macosx_*.jar");
+        assertFileExists(targetdir, "macosx.cocoa.x86_64/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64_*.jar");
         assertFileExists(targetdir, "win32.win32.x86/eclipse/plugins/org.eclipse.swt.win32.win32.x86_*.jar");
 
         // assert native launchers
@@ -39,7 +39,7 @@ public void exportProduct() throws Exception {
 
         // assert product zip was created for each target environment
         Assert.assertTrue(new File(targetdir, "tycho.demo.rcp-1.0.0-linux.gtk.x86_64.zip").canRead());
-        Assert.assertTrue(new File(targetdir, "tycho.demo.rcp-1.0.0-macosx.carbon.x86.zip").canRead());
+        Assert.assertTrue(new File(targetdir, "tycho.demo.rcp-1.0.0-macosx.cocoa.x86_64.zip").canRead());
         Assert.assertTrue(new File(targetdir, "tycho.demo.rcp-1.0.0-win32.win32.x86.zip").canRead());
     }
 

diff --git a/...test/java/org/eclipse/tycho/test/mngeclipse1105PackageRootFiles/PackageRootFilesTest.java b/...test/java/org/eclipse/tycho/test/mngeclipse1105PackageRootFiles/PackageRootFilesTest.java
@@ -20,9 +20,10 @@ public class PackageRootFilesTest extends AbstractTychoIntegrationTest {
     protected Verifier getVerifier(String test) throws Exception {
         Verifier verifier = super.getVerifier(test);
 
+        // lock build environment to something specific
         verifier.getSystemProperties().setProperty("osgi.os", "macosx");
-        verifier.getSystemProperties().setProperty("osgi.ws", "carbon");
-        verifier.getSystemProperties().setProperty("osgi.arch", "x86");
+        verifier.getSystemProperties().setProperty("osgi.ws", "cocoa");
+        verifier.getSystemProperties().setProperty("osgi.arch", "x86_64");
 
         return verifier;
     }