geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tki...@apache.org
Subject svn commit: r1005305 - /geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/InstallPluginDependenciesMojo.java
Date Thu, 07 Oct 2010 00:36:32 GMT
Author: tkirby
Date: Thu Oct  7 00:36:32 2010
New Revision: 1005305

URL: http://svn.apache.org/viewvc?rev=1005305&view=rev
Log:
GERONIMODEVTOOLS-674 Upgrade eclipse to Helios SR1, and make macos 32 and 64 bit aware like
win and linux

Modified:
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/InstallPluginDependenciesMojo.java

Modified: geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/InstallPluginDependenciesMojo.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/InstallPluginDependenciesMojo.java?rev=1005305&r1=1005304&r2=1005305&view=diff
==============================================================================
--- geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/InstallPluginDependenciesMojo.java
(original)
+++ geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/InstallPluginDependenciesMojo.java
Thu Oct  7 00:36:32 2010
@@ -170,8 +170,12 @@ public class InstallPluginDependenciesMo
 			else
 				fragment.setArtifactId(id.concat(".gtk.linux.x86"));
 		} else if (platform.startsWith("Mac")) {   
-		    //from eclipse 3.6, it only support mac cocoa, so here just use cocoa.macosx	    
-		    fragment.setArtifactId(id.concat(".cocoa.macosx"));
+		    //from eclipse 3.6, it only support mac cocoa, so here just use cocoa.macosx	
+                    if (arch.equalsIgnoreCase("x86_64")) {
+                        fragment.setArtifactId(id.concat(".cocoa.macosx.x86_64"));
+                    } else {
+                        fragment.setArtifactId(id.concat(".cocoa.macosx"));
+                    }
 		} else if (platform.startsWith("SunOS")) {
 			if (arch.startsWith("x86") || arch.startsWith("amd"))
 				fragment.setArtifactId(id.concat(".gtk.solaris.x86"));



Mime
View raw message