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 ap...@apache.org on 2011/01/05 10:54:38 UTC
svn commit: r1055407 - in /incubator/npanday/trunk:
components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/
plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/
Author: apadilla
Date: Wed Jan 5 10:54:37 2011
New Revision: 1055407
URL: http://svn.apache.org/viewvc?rev=1055407&view=rev
Log:
[NPANDAY-d326]
- applied patch submitted by Henrik Bie
- misc improvements
Modified:
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/AspxCompiler.java
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/CompilerMojo.java
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestCompilerMojo.java
Modified: incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/AspxCompiler.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/AspxCompiler.java?rev=1055407&r1=1055406&r2=1055407&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/AspxCompiler.java (original)
+++ incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/AspxCompiler.java Wed Jan 5 10:54:37 2011
@@ -66,7 +66,7 @@ public class AspxCompiler
{
logger.info( "NPANDAY-068-003: Compiling Artifact: Vendor = "
+ compilerContext.getCompilerRequirement().getVendor() + ", Language = "
- + compilerContext.getCompilerRequirement().getVendor() + ", Assembly Name = "
+ + compilerContext.getCompilerRequirement().getLanguage() + ", Assembly Name = "
+ compilerContext.getArtifact().getAbsolutePath() );
CommandExecutor commandExecutor = CommandExecutor.Factory.createDefaultCommmandExecutor();
Modified: incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java?rev=1055407&r1=1055406&r2=1055407&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java (original)
+++ incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java Wed Jan 5 10:54:37 2011
@@ -512,12 +512,16 @@ public abstract class AbstractCompilerMo
/**
* Allow 'unsafe' code
+ *
+ * @parameter
*/
protected boolean unsafe;
/**
* Allow 'unsafe' code
+ *
+ * @parameter
*/
protected boolean testUnsafe;
@@ -665,8 +669,35 @@ public abstract class AbstractCompilerMo
* @parameter expression = "${outputDirectory}"
*/
protected File outputDirectory;
+
+ /**
+ * warn
+ *
+ * @parameter expression = "${warn}"
+ */
+ protected Integer warn;
+ /**
+ * testWarn
+ *
+ * @parameter expression = "${testWarn}"
+ */
+ protected Integer testWarn;
+
+ /**
+ * nowarn
+ *
+ * @parameter expression = "${nowarn}"
+ */
+ protected String nowarn;
+
+ /**
+ * testNowarn
+ *
+ * @parameter expression = "${testNowarn}"
+ */
+ protected String testNowarn;
@@ -784,7 +815,6 @@ public abstract class AbstractCompilerMo
//returns if assemblyInfoFile does not exist
if(!FileUtils.fileExists(assemblyInfoFile))
{
- System.out.println("[INFO] No Assembly Info File found");
return;
}
String contents = getContents(new File(assemblyInfoFile));
Modified: incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/CompilerMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/CompilerMojo.java?rev=1055407&r1=1055406&r2=1055407&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/CompilerMojo.java (original)
+++ incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/CompilerMojo.java Wed Jan 5 10:54:37 2011
@@ -320,6 +320,15 @@ public final class CompilerMojo
params.add("/define:" + define);
}
+ if (warn != null)
+ {
+ params.add("/warn:" + warn);
+ }
+
+ if (nowarn != null)
+ {
+ params.add("/nowarn:" + nowarn);
+ }
return params;
}
Modified: incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestCompilerMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestCompilerMojo.java?rev=1055407&r1=1055406&r2=1055407&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestCompilerMojo.java (original)
+++ incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestCompilerMojo.java Wed Jan 5 10:54:37 2011
@@ -319,6 +319,15 @@ public final class TestCompilerMojo
params.add("/define:" + testDefine);
}
+ if (testWarn != null)
+ {
+ params.add("/warn:" + testWarn);
+ }
+
+ if (testNowarn != null)
+ {
+ params.add("/nowarn:" + testNowarn);
+ }
return params;
}