Revision: 865
Author: heuermh
Date: Thu Oct 29 19:47:33 2009
Log: Issue 126 ; adding separate profiles macosx_carbon_x86_64 for jdk 1.5
and macosx_cocoa_x86_64 for jdk 1.6+
http://code.google.com/p/piccolo2d/source/detail?r=865
Modified:
/piccolo2d.java/trunk/swt/pom.xml
=======================================
--- /piccolo2d.java/trunk/swt/pom.xml Wed Oct 28 22:19:17 2009
+++ /piccolo2d.java/trunk/swt/pom.xml Thu Oct 29 19:47:33 2009
@@ -257,10 +257,11 @@
</properties>
</profile>
<profile>
- <id>macosx_carbon</id>
+ <id>macosx_carbon_ppc</id>
<activation>
<os>
<name>mac os x</name>
+ <arch>ppc</arch>
</os>
</activation>
<properties>
@@ -268,28 +269,26 @@
<swt.artifactId>macosx</swt.artifactId>
</properties>
</profile>
-<!--
-
- must manually enable this profile to override macosx_carbon
<profile>
- <id>macosx_cocoa</id>
+ <id>macosx_carbon_x86_64</id>
<activation>
+ <jdk>1.5</jdk>
<os>
<name>mac os x</name>
+ <arch>x86_64</arch>
</os>
</activation>
<properties>
- <swt.groupId>org.eclipse.swt.cocoa</swt.groupId>
+ <swt.groupId>org.eclipse.swt.carbon</swt.groupId>
<swt.artifactId>macosx</swt.artifactId>
</properties>
</profile>
--->
-<!--
-
- this profile requires the user to set MAVEN_OPTS="-Dd64", or unit
tests will fail
+
+ <!-- this profile requires the user to set MAVEN_OPTS="-Dd64", or unit
tests will fail -->
<profile>
- <id>macosx_cocoa_intel</id>
+ <id>macosx_cocoa_x86_64</id>
<activation>
+ <jdk>[1.6,)</jdk>
<os>
<name>mac os x</name>
<arch>x86_64</arch>
@@ -300,6 +299,5 @@
<swt.artifactId>macosx</swt.artifactId>
</properties>
</profile>
--->
</profiles>
</project>
--~--~---------~--~----~------------~-------~--~----~
Piccolo2D Developers Group: http://groups.google.com/group/piccolo2d-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
