From nmaven-commits-return-163-apmail-incubator-nmaven-commits-archive=incubator.apache.org@incubator.apache.org Tue Feb 27 21:34:48 2007 Return-Path: Delivered-To: apmail-incubator-nmaven-commits-archive@locus.apache.org Received: (qmail 56953 invoked from network); 27 Feb 2007 21:34:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Feb 2007 21:34:47 -0000 Received: (qmail 94174 invoked by uid 500); 27 Feb 2007 21:34:56 -0000 Delivered-To: apmail-incubator-nmaven-commits-archive@incubator.apache.org Received: (qmail 94151 invoked by uid 500); 27 Feb 2007 21:34:56 -0000 Mailing-List: contact nmaven-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: nmaven-dev@incubator.apache.org Delivered-To: mailing list nmaven-commits@incubator.apache.org Received: (qmail 94142 invoked by uid 99); 27 Feb 2007 21:34:56 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Feb 2007 13:34:56 -0800 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Feb 2007 13:34:46 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id B6CA71A981A; Tue, 27 Feb 2007 13:34:26 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r512424 - in /incubator/nmaven/branches/SI_IDE/assemblies: NMaven.Core/pom.xml NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs NMaven.Model/Pom/pom.xml Date: Tue, 27 Feb 2007 21:34:26 -0000 To: nmaven-commits@incubator.apache.org From: sisbell@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070227213426.B6CA71A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sisbell Date: Tue Feb 27 13:34:25 2007 New Revision: 512424 URL: http://svn.apache.org/viewvc?view=rev&rev=512424 Log: Added IDE support for reading the dll linked file (instead of the .netmodule). This solution works for SharpDevelop 2.0.0 (not 2.1 RC1) and for Visual Studio 2005. Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml?view=diff&rev=512424&r1=512423&r2=512424 ============================================================================== --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml Tue Feb 27 13:34:25 2007 @@ -35,6 +35,16 @@ maven-compile-plugin true + + org.apache.maven.dotnet.plugins + maven-link-plugin + + + ${basedir}/target/NMaven.Core.netmodule + + ${basedir}/target/NMaven.Core.dll + + Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs?view=diff&rev=512424&r1=512423&r2=512424 ============================================================================== --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs Tue Feb 27 13:34:25 2007 @@ -198,10 +198,16 @@ if(model.dependencies != null) { foreach(Dependency dependency in model.dependencies) { + String artifactExtension = (dependency.type == "module") ? "dll" : getExtension(dependency.type); + if(dependency.type == "module") + { + + } String repoPath = Environment.GetEnvironmentVariable("HOMEDRIVE") + Environment.GetEnvironmentVariable("HOMEPATH") + @"\.m2\repository\" + dependency.groupId.Replace(".", "\\") - + "\\" + dependency.artifactId + "\\" + dependency.version + "\\" + dependency.artifactId + ".dll"; + + "\\" + dependency.artifactId + "\\" + dependency.version + "\\" + dependency.artifactId + "." + + artifactExtension; BuildItem buildItem = group.AddNewItem("Reference", dependency.artifactId); if(!dependency.GetType().Equals("gac")) buildItem.SetMetadata("HintPath", repoPath, false); } @@ -253,7 +259,16 @@ else if (type.Equals("winexe")) return "WinExe"; else if (type.Equals("module")) return "Module"; return null; - } + } + + private string getExtension(String type) + { + if (type.Equals("library")) return "dll"; + else if (type.Equals("exe")) return "exe"; + else if (type.Equals("winexe")) return "exe"; + else if (type.Equals("module")) return "netmodule"; + return null; + } private class ClassParser { Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml?view=diff&rev=512424&r1=512423&r2=512424 ============================================================================== --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml Tue Feb 27 13:34:25 2007 @@ -30,6 +30,16 @@ ${basedir}/Pom.xsd + + org.apache.maven.dotnet.plugins + maven-link-plugin + + + ${basedir}/target/NMaven.Model.Pom.netmodule + + ${basedir}/target/NMaven.Model.Pom.dll + +