Author: sisbell
Date: Mon Feb 26 13:38:45 2007
New Revision: 512021
URL: http://svn.apache.org/viewvc?view=rev&rev=512021
Log:
Changed library types to module types. Did this as a work-around to NMaven-9:
we can use the existing code that handles adding module dependencies to
executables both within the target directory and the local maven repo. Only
downside is that each plugin will have a copy of the .netmodules, resulting in
duplicate modules to download.
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
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/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=512021&r1=512020&r2=512021
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml (original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml Mon Feb 26
13:38:45 2007
@@ -2,14 +2,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Core</groupId>
<artifactId>NMaven.Core</artifactId>
- <packaging>library</packaging>
+ <packaging>module</packaging>
<version>0.14</version>
<name>NMaven.Core</name>
<dependencies>
<dependency>
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.Pom</artifactId>
- <type>library</type>
+ <type>module</type>
<version>0.14</version>
</dependency>
<dependency>
@@ -37,4 +37,29 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <activation>
+ <property>
+ <name>debug</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.dotnet.plugins</groupId>
+ <artifactId>maven-compile-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <parameters>
+ <parameter>/debug+</parameter>
+ <parameter></parameter>
+ </parameters>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
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=512021&r1=512020&r2=512021
==============================================================================
---
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
Mon Feb 26 13:38:45 2007
@@ -121,7 +121,18 @@
groupProject.AddNewProperty( "OutputPath", assemblyOutputPath,
false);
project.AddNewImport(@"$(MSBuildBinPath)\Microsoft.CSharp.Targets", null);
-
+ DirectoryInfo configDirectory = new
DirectoryInfo(Environment.CurrentDirectory + @"\src\main\config");
+ if(configDirectory.Exists)
+ {
+ BuildItemGroup configGroup = project.AddNewItemGroup();
+ foreach(FileInfo fileInfo in configDirectory.GetFiles())
+ {
+ if(fileInfo.Extension.Equals("exe.config"))
+ {
+ configGroup.AddNewItem("None",
@"src\main\config\" + fileInfo.Name);
+ }
+ }
+ }
addProjectDependencies(project, model, sourceFileDirectory);
addFoldersToProject(project, null, sourceFileDirectory,
sourceFileDirectory);
addClassFilesToProject(project, null, sourceFileDirectory,
sourceFileDirectory);
@@ -240,6 +251,7 @@
if (type.Equals("library")) return "Library";
else if (type.Equals("exe")) return "Exe";
else if (type.Equals("winexe")) return "WinExe";
+ else if (type.Equals("module")) return "Module";
return null;
}
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=512021&r1=512020&r2=512021
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml
(original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml Mon
Feb 26 13:38:45 2007
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.Pom</artifactId>
- <packaging>library</packaging>
+ <packaging>module</packaging>
<version>0.14</version>
<name>NMaven.Model.Pom</name>
Modified:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml?view=diff&rev=512021&r1=512020&r2=512021
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml
(original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml
Mon Feb 26 13:38:45 2007
@@ -16,14 +16,15 @@
<groupId>NMaven.Core</groupId>
<artifactId>NMaven.Core</artifactId>
<version>0.14</version>
- <type>library</type>
+ <type>module</type>
</dependency>
<dependency>
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.Pom</artifactId>
- <type>library</type>
+ <type>module</type>
<version>0.14</version>
</dependency>
+
</dependencies>
<build>
<sourceDirectory>src/main/csharp</sourceDirectory>
