Author: sisbell
Date: Fri Mar 23 10:18:52 2007
New Revision: 521817
URL: http://svn.apache.org/viewvc?view=rev&rev=521817
Log:
Fixed compiler error and a problem with the Compact Profile compiler plugin.
Modified:
incubator/nmaven/branches/SI_RUBY/bootstrap-build.bat
incubator/nmaven/branches/SI_RUBY/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/CSharpCompilerForProfile.java
incubator/nmaven/branches/SI_RUBY/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerPluginsRepository.java
Modified: incubator/nmaven/branches/SI_RUBY/bootstrap-build.bat
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_RUBY/bootstrap-build.bat?view=diff&rev=521817&r1=521816&r2=521817
==============================================================================
--- incubator/nmaven/branches/SI_RUBY/bootstrap-build.bat (original)
+++ incubator/nmaven/branches/SI_RUBY/bootstrap-build.bat Fri Mar 23 10:18:52
2007
@@ -1,5 +1,5 @@
+call mvn -f ./components/pom.xml install
call mvn -f ./plugins/pom.xml install
call mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file
-Dfile=./thirdparty/NUnit/NUnit.Framework.dll -DgroupId=NUnit
-DartifactId=NUnit.Framework -Dpackaging=dll -Dversion=2.2.8.0
call mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap install %*
-rem call mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file
-Dfile=./thirdparty/QUT/QUT.PERWAPI.dll -DgroupId=QUT -DartifactId=QUT.PERWAPI
-Dpackaging=dll -Dversion=2.2.8.0
rem call mvn org.apache.maven.dotnet.plugins:maven-solution-plugin:solution
Modified:
incubator/nmaven/branches/SI_RUBY/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/CSharpCompilerForProfile.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_RUBY/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/CSharpCompilerForProfile.java?view=diff&rev=521817&r1=521816&r2=521817
==============================================================================
---
incubator/nmaven/branches/SI_RUBY/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/CSharpCompilerForProfile.java
(original)
+++
incubator/nmaven/branches/SI_RUBY/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/CSharpCompilerForProfile.java
Fri Mar 23 10:18:52 2007
@@ -71,6 +71,7 @@
public void init( NMavenContext nmavenContext )
{
+ super.init( nmavenContext);
netCompiler.init( nmavenContext );
this.compilerContext = (CompilerContext) nmavenContext;
}
Modified:
incubator/nmaven/branches/SI_RUBY/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerPluginsRepository.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_RUBY/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerPluginsRepository.java?view=diff&rev=521817&r1=521816&r2=521817
==============================================================================
---
incubator/nmaven/branches/SI_RUBY/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerPluginsRepository.java
(original)
+++
incubator/nmaven/branches/SI_RUBY/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerPluginsRepository.java
Fri Mar 23 10:18:52 2007
@@ -113,7 +113,7 @@
CommandFilter filter = plugin.getCommandFilter();
platformCapability.setCoreAssemblies( coreAssemblies );
- platformCapability.setNetDependencyId(
plugin.getExecutableLocation() );
+ platformCapability.setNetDependencyId(
plugin.getNetDependencyId());
List<String> includes = ( filter != null ) ?
filter.getIncludes() : new ArrayList<String>();
List<String> excludes = ( filter != null ) ?
filter.getExcludes() : new ArrayList<String>();