incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r520142 - in /incubator/nmaven/branches/SI_IDE: assemblies/NMaven.Model/Pom/pom.xml assemblies/pom.xml bootstrap-build.bat plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java
Date Mon, 19 Mar 2007 22:39:45 GMT
Author: sisbell
Date: Mon Mar 19 15:39:43 2007
New Revision: 520142

URL: http://svn.apache.org/viewvc?view=rev&rev=520142
Log:
Fixed a couple of problems with the project building from bootstrap.

Modified:
    incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml
    incubator/nmaven/branches/SI_IDE/assemblies/pom.xml
    incubator/nmaven/branches/SI_IDE/bootstrap-build.bat
    incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java

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=520142&r1=520141&r2=520142
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml (original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml Mon Mar 19 15:39:43
2007
@@ -1,11 +1,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0">
+  <parent>
+    <groupId>org.apache.maven.dotnet</groupId>
+    <version>0.14</version>
+    <artifactId>nmaven-assemblies</artifactId>
+    <relativePath>..\..\pom.xml</relativePath>
+  </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>NMaven.Model</groupId>
   <artifactId>NMaven.Model.Pom</artifactId>
   <packaging>library</packaging>
   <version>0.14</version>
   <name>NMaven.Model.Pom</name>
-
   <build>
     <plugins>
       <plugin>

Modified: incubator/nmaven/branches/SI_IDE/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/pom.xml?view=diff&rev=520142&r1=520141&r2=520142
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/pom.xml (original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/pom.xml Mon Mar 19 15:39:43 2007
@@ -117,7 +117,6 @@
   <modules>
     <module>NMaven.Plugin.Resx</module>
     <module>NMaven.Plugin.Settings</module>
-    <module>NMaven.Service/Embedder</module>
   </modules>
   <build>
     <sourceDirectory>src/main/csharp</sourceDirectory>
@@ -143,7 +142,6 @@
         <module>NMaven.Plugin.Resx</module>
         <module>NMaven.Plugin.Settings</module>
         <module>NMaven.Plugin.Solution</module>
-        <module>NMaven.Service/Embedderr</module>
       </modules>
     </profile>
   </profiles>

Modified: incubator/nmaven/branches/SI_IDE/bootstrap-build.bat
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/bootstrap-build.bat?view=diff&rev=520142&r1=520141&r2=520142
==============================================================================
--- incubator/nmaven/branches/SI_IDE/bootstrap-build.bat (original)
+++ incubator/nmaven/branches/SI_IDE/bootstrap-build.bat Mon Mar 19 15:39:43 2007
@@ -1,6 +1,6 @@
 call mvn install:install-file -Dfile=./components/imports/xfire-jsr181/xfire-jsr181-api-1.0-M1.zip
-DgroupId=org.codehaus.xfire -DartifactId=javax.ws -Dpackaging=jar -Dversion=1.0.0
-#call mvn -f ./components/pom.xml install
-#call mvn -f ./plugins/pom-java-bootstrap.xml install
-#call mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file -Dfile=./plugins/imports/nunit-2.0/nunit.framework.dll
-DgroupId=org.nunit -DartifactId=nunit.framework -Dpackaging=dll -Dversion=2.2.8.0
-#call mvn -f ./assemblies/pom-net-bootstrap.xml -Dmaven.test.skip=true -Dbootstrap install
%*
+call mvn -f ./components/pom.xml install
+call mvn -f ./plugins/pom-java-bootstrap.xml install
+call mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file -Dfile=./plugins/imports/nunit-2.0/nunit.framework.dll
-DgroupId=org.nunit -DartifactId=nunit.framework -Dpackaging=dll -Dversion=2.2.8.0
+call mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap install %*
 #call mvn org.apache.maven.dotnet.plugins:maven-solution-plugin:solution

Modified: incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java?view=diff&rev=520142&r1=520141&r2=520142
==============================================================================
--- incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java
(original)
+++ incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java
Mon Mar 19 15:39:43 2007
@@ -105,11 +105,11 @@
         List<String> includeList = new ArrayList<String>();
         try
         {
-            includeList.add( "*" + assemblerContext.getClassExtensionFor( language));
+            includeList.add( "**/*." + assemblerContext.getClassExtensionFor( language )
);
         }
         catch ( PlatformUnsupportedException e )
         {
-            throw new MojoExecutionException("NMAVEN-904-003: Language is not supported:
Language = " + language, e);
+            throw new MojoExecutionException( "NMAVEN-904-003: Language is not supported:
Language = " + language, e );
         }
 
         directoryScanner.setIncludes( includeList.toArray( includes ) );
@@ -118,8 +118,8 @@
 
         directoryScanner.scan();
         String[] files = directoryScanner.getIncludedFiles();
-        getLog().info(
-            "NMAVEN-904-002: Copying source files: From = " + sourceDirectory + ",  To =
" + outputDirectory );
+        getLog().info( "NMAVEN-904-002: Copying source files: From = " + sourceDirectory
+ ",  To = " +
+            outputDirectory + ", File Count = " + files.length);
         for ( String file : files )
         {
             try



Mime
View raw message