You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ha...@apache.org on 2011/05/03 11:07:32 UTC
svn commit: r1098975 -
/geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/InstallPluginDependenciesMojo.java
Author: hanhongfang
Date: Tue May 3 09:07:31 2011
New Revision: 1098975
URL: http://svn.apache.org/viewvc?rev=1098975&view=rev
Log:
GERONIMODEVTOOLS-737 Could not build GEP3.0 under win7-64bit. Thank you Yi Xiao for the patch.
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=1098975&r1=1098974&r2=1098975&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 Tue May 3 09:07:31 2011
@@ -160,7 +160,11 @@ public class InstallPluginDependenciesMo
String platform = System.getProperty("os.name");
String arch = System.getProperty("os.arch");
if (platform.startsWith("Windows")) {
- fragment.setArtifactId(id.concat(".win32.win32.x86"));
+ if (arch.equalsIgnoreCase("x86_64") || arch.equalsIgnoreCase("amd64")) {
+ fragment.setArtifactId(id.concat(".win32.win32.x86_64"));
+ } else {
+ fragment.setArtifactId(id.concat(".win32.win32.x86"));
+ }
} else if (platform.startsWith("Linux")) {
if (arch.equalsIgnoreCase("x86_64")
|| arch.equalsIgnoreCase("amd64"))