[jbosstools-commits] JBoss Tools SVN: r31219 - in trunk: vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF and 2 other directories.
Author: nickboldt
Date: 2011-05-11 13:41:25 -0400 (Wed, 11 May 2011)
New Revision: 31219
Modified:
trunk/build/parent/pom.xml
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
trunk/xulrunner/plugins/pom.xml
Log:
remove carbon.macosx.x86 as it's not supported anymore and we've moved to XR
1.9.2
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-05-11 17:40:30 UTC (rev 31218)
+++ trunk/build/parent/pom.xml 2011-05-11 17:41:25 UTC (rev 31219)
@@ -69,11 +69,6 @@
<arch>x86</arch>
</environment>
<environment>
- <os>macosx</os>
- <ws>carbon</ws>
- <arch>x86</arch>
- </environment>
- <environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
@@ -113,11 +108,6 @@
<arch>x86</arch>
</environment>
<environment>
- <os>macosx</os>
- <ws>carbon</ws>
- <arch>x86</arch>
- </environment>
- <environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF 2011-05-11
17:40:30 UTC (rev 31218)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF 2011-05-11
17:41:25 UTC (rev 31219)
@@ -8,7 +8,6 @@
org.eclipse.core.runtime,
org.mozilla.xpcom,
org.jboss.tools.common,
- org.mozilla.xulrunner.carbon.macosx;resolution:=optional,
org.mozilla.xulrunner.cocoa.macosx;resolution:=optional,
org.mozilla.xulrunner.gtk.linux.x86;resolution:=optional,
org.mozilla.xulrunner.gtk.linux.x86_64;resolution:=optional,
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2011-05-11
17:40:30 UTC (rev 31218)
+++
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2011-05-11
17:41:25 UTC (rev 31219)
@@ -78,7 +78,6 @@
private static final Set<String> OFFICIALLY_SUPPORTED_PLATFORM_IDS = new
HashSet<String>();
static {
Collections.addAll(OFFICIALLY_SUPPORTED_PLATFORM_IDS,
- "carbon.macosx.x86", //$NON-NLS-1$
"cocoa.macosx.x86", //$NON-NLS-1$
"gtk.linux.x86", //$NON-NLS-1$
"gtk.linux.x86_64", //$NON-NLS-1$
Modified: trunk/xulrunner/plugins/pom.xml
===================================================================
--- trunk/xulrunner/plugins/pom.xml 2011-05-11 17:40:30 UTC (rev 31218)
+++ trunk/xulrunner/plugins/pom.xml 2011-05-11 17:41:25 UTC (rev 31219)
@@ -18,4 +18,4 @@
<module>org.mozilla.xulrunner.gtk.linux.x86_64</module>
<module>org.mozilla.xulrunner.win32.win32.x86</module>
</modules>
-</project>
\ No newline at end of file
+</project>