You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by br...@apache.org on 2012/02/09 11:13:18 UTC
svn commit: r1242280 -
/incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java
Author: brett
Date: Thu Feb 9 11:13:17 2012
New Revision: 1242280
URL: http://svn.apache.org/viewvc?rev=1242280&view=rev
Log:
[NPANDAY-541] make COM reference lookup work on amd64 to fix failures in integration tests on Jenkins
Modified:
incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java
Modified: incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java?rev=1242280&r1=1242279&r2=1242280&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java (original)
+++ incubator/npanday/trunk/components/dotnet-dao-project/src/main/java/npanday/dao/impl/ProjectDaoImpl.java Thu Feb 9 11:13:17 2012
@@ -36,6 +36,7 @@ import org.apache.maven.artifact.version
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.Os;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
@@ -994,7 +995,8 @@ public final class ProjectDaoImpl
String newClassifier = classTokens[0] + "}" + classTokens[1];
- String registryPath = "HKEY_CLASSES_ROOT\\TypeLib\\" + newClassifier + "\\win32\\";
+ String registryPath = "HKEY_CLASSES_ROOT\\TypeLib\\" + newClassifier;
+ registryPath += Os.isArch( "x86" ) ? "\\win32\\" : "\\win64\\";
int lineNoOfPath = 1;
List<String> parameters = new ArrayList<String>();