diff --git a/bootstrap.sh b/bootstrap.sh
index 792db4af..1b154c5e 100755
--- 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
index e4e437b4..60ef9d04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,9 +54,9 @@
3.0
- 3.7.0.v20110613
+ 3.8.0.v20110726-1606
- 3.7.0.v_B61
+ 3.8.0.v_C03
0.11.1
diff --git a/tycho-its/projects/MNGECLIPSE1105rootfiles/MNGECLIPSE-1105.product b/tycho-its/projects/MNGECLIPSE1105rootfiles/MNGECLIPSE-1105.product
index bb0545a6..932dca53 100644
--- a/tycho-its/projects/MNGECLIPSE1105rootfiles/MNGECLIPSE-1105.product
+++ b/tycho-its/projects/MNGECLIPSE1105rootfiles/MNGECLIPSE-1105.product
@@ -7,7 +7,7 @@
- -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+ -XstartOnFirstThread
@@ -38,7 +38,7 @@
-
+
@@ -50,12 +50,12 @@
-
+
-
+
diff --git a/tycho-its/projects/MNGECLIPSE1105rootfiles/root.properties b/tycho-its/projects/MNGECLIPSE1105rootfiles/root.properties
index 5fb8145a..1774fcbd 100644
--- 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/tycho-its/projects/MNGECLIPSE1105rootfiles/rootfiles/macosx.carbon.x86/configuration/config.macosx.txt b/tycho-its/projects/MNGECLIPSE1105rootfiles/rootfiles/macosx.cocoa.x86_64/configuration/config.macosx.txt
similarity index 100%
rename from tycho-its/projects/MNGECLIPSE1105rootfiles/rootfiles/macosx.carbon.x86/configuration/config.macosx.txt
rename to tycho-its/projects/MNGECLIPSE1105rootfiles/rootfiles/macosx.cocoa.x86_64/configuration/config.macosx.txt
diff --git a/tycho-its/projects/TYCHO0294ProductP2TargetPlatformResolver/pom.xml b/tycho-its/projects/TYCHO0294ProductP2TargetPlatformResolver/pom.xml
index a54dfd63..618da978 100644
--- a/tycho-its/projects/TYCHO0294ProductP2TargetPlatformResolver/pom.xml
+++ b/tycho-its/projects/TYCHO0294ProductP2TargetPlatformResolver/pom.xml
@@ -52,18 +52,11 @@
win32
x86
-
- macosx
- carbon
- x86
-
-
diff --git a/tycho-its/projects/TYCHO232multiplatformProduct/tycho.demo.feature/feature.xml b/tycho-its/projects/TYCHO232multiplatformProduct/tycho.demo.feature/feature.xml
index 86018648..944095d2 100644
--- 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"/>
macosx
- carbon
- x86
+ cocoa
+ x86_64
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
index 775928e0..bbbd30be 100644
--- 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 @@
-Xmx1500m
- -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Xmx1500m
+ -XstartOnFirstThread -Xmx1500m
-Xmx640m -Dsun.java2d.noddraw=true
@@ -58,7 +58,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
diff --git a/tycho-its/projects/TYCHO300launcherIcons/product/pom.xml b/tycho-its/projects/TYCHO300launcherIcons/product/pom.xml
index 4db0d1f8..6710ff63 100644
--- a/tycho-its/projects/TYCHO300launcherIcons/product/pom.xml
+++ b/tycho-its/projects/TYCHO300launcherIcons/product/pom.xml
@@ -34,8 +34,8 @@
macosx
- carbon
- x86
+ cocoa
+ x86_64
diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0294ProductP2TargetPlatformResolver/ProductP2TargetPlatformResolverTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0294ProductP2TargetPlatformResolver/ProductP2TargetPlatformResolverTest.java
index 56d45444..b4da2aae 100644
--- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0294ProductP2TargetPlatformResolver/ProductP2TargetPlatformResolverTest.java
+++ b/tycho-its/src/test/java/org/eclipse/tycho/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/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO232multiplatformProduct/MultiplatformProductTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO232multiplatformProduct/MultiplatformProductTest.java
index caf4c0fd..472072ea 100644
--- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO232multiplatformProduct/MultiplatformProductTest.java
+++ b/tycho-its/src/test/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/tycho-its/src/test/java/org/eclipse/tycho/test/mngeclipse1105PackageRootFiles/PackageRootFilesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/mngeclipse1105PackageRootFiles/PackageRootFilesTest.java
index 5ba07b5f..5ee1f1c0 100644
--- a/tycho-its/src/test/java/org/eclipse/tycho/test/mngeclipse1105PackageRootFiles/PackageRootFilesTest.java
+++ b/tycho-its/src/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;
}