incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
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 GMT
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 @@
         <artifactId>maven-compile-plugin</artifactId>
         <extensions>true</extensions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.dotnet.plugins</groupId>
+        <artifactId>maven-link-plugin</artifactId>
+        <configuration>
+          <netModules>
+            <netModule>${basedir}/target/NMaven.Core.netmodule</netModule>
+          </netModules>
+          <outputFile>${basedir}/target/NMaven.Core.dll</outputFile>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

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 @@
           <xsdFile>${basedir}/Pom.xsd</xsdFile>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.dotnet.plugins</groupId>
+        <artifactId>maven-link-plugin</artifactId>
+        <configuration>
+          <netModules>
+            <netModule>${basedir}/target/NMaven.Model.Pom.netmodule</netModule>
+          </netModules>
+          <outputFile>${basedir}/target/NMaven.Model.Pom.dll</outputFile>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>



Mime
View raw message