incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r632171 - in /incubator/nmaven/trunk: components/maven-dotnet-compiler/ components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/ plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compi...
Date Thu, 28 Feb 2008 23:39:31 GMT
Author: sisbell
Date: Thu Feb 28 15:39:27 2008
New Revision: 632171

URL: http://svn.apache.org/viewvc?rev=632171&view=rev
Log:
Add toolchains to compiler configs.

Modified:
    incubator/nmaven/trunk/components/maven-dotnet-compiler/pom.xml
    incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java
    incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java
    incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java

Modified: incubator/nmaven/trunk/components/maven-dotnet-compiler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-compiler/pom.xml?rev=632171&r1=632170&r2=632171&view=diff
==============================================================================
--- incubator/nmaven/trunk/components/maven-dotnet-compiler/pom.xml (original)
+++ incubator/nmaven/trunk/components/maven-dotnet-compiler/pom.xml Thu Feb 28 15:39:27 2008
@@ -55,5 +55,10 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-toolchain</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>       
   </dependencies>
 </project>

Modified: incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java?rev=632171&r1=632170&r2=632171&view=diff
==============================================================================
--- incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java
(original)
+++ incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java
Thu Feb 28 15:39:27 2008
@@ -21,6 +21,7 @@
 import org.apache.maven.dotnet.ProgrammingLanguage;
 import org.apache.maven.dotnet.Vendor;
 import org.apache.maven.dotnet.ArtifactType;
+import org.apache.maven.toolchain.Toolchain;
 
 import java.io.File;
 
@@ -106,6 +107,10 @@
     String getArtifactFileName();
 
     void setArtifactFileName(String artifactFileName);
+
+    Toolchain getToolchain();
+
+    void setToolchain(Toolchain toolchain);
 
     /**
      * Verifies that the necessary parameters exist within the config exist and are valid.

Modified: incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java?rev=632171&r1=632170&r2=632171&view=diff
==============================================================================
--- incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java
(original)
+++ incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java
Thu Feb 28 15:39:27 2008
@@ -21,6 +21,7 @@
 import org.apache.maven.dotnet.ProgrammingLanguage;
 import org.apache.maven.dotnet.Vendor;
 import org.apache.maven.dotnet.ArtifactType;
+import org.apache.maven.toolchain.Toolchain;
 
 import java.io.File;
 
@@ -83,6 +84,18 @@
                 private Vendor vendor;
 
                 private String artifactFileName;
+
+                private Toolchain toolchain;
+
+                public Toolchain getToolchain()
+                {
+                    return toolchain;
+                }
+
+                public void setToolchain(Toolchain toolchain)
+                {
+                    this.toolchain = toolchain;
+                }
 
                 public String getArtifactFileName()
                 {

Modified: incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java?rev=632171&r1=632170&r2=632171&view=diff
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
(original)
+++ incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
Thu Feb 28 15:39:27 2008
@@ -176,7 +176,8 @@
         compilerConfig.setTargetDirectory( new File( project.getBuild().getDirectory() )
);
         compilerConfig.setArtifactFileName(
             project.getBuild().getFinalName() + "." + compilerConfig.getArtifactType().getExtension()
);
-
+        compilerConfig.setToolchain( dotnetToolchain );
+        
         try
         {
             dotnetCompilerContext.init( project, compilerConfig );



Mime
View raw message