You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nmaven-commits@incubator.apache.org by si...@apache.org on 2007/02/21 23:55:01 UTC
svn commit: r510317 - in
/incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile:
SourceProcessorMojo.java TestSourceProcessorMojo.java
Author: sisbell
Date: Wed Feb 21 15:55:01 2007
New Revision: 510317
URL: http://svn.apache.org/viewvc?view=rev&rev=510317
Log:
IDE project files need to reside in same folder as the source files. Need to filter the IDE project files during source copy so maven won't try to compile.
Modified:
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java
incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestSourceProcessorMojo.java
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=510317&r1=510316&r2=510317
==============================================================================
--- 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 Wed Feb 21 15:55:01 2007
@@ -25,6 +25,9 @@
import java.io.File;
import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ArrayList;
/**
* Copies source files to target directory.
@@ -70,8 +73,14 @@
DirectoryScanner directoryScanner = new DirectoryScanner();
directoryScanner.setBasedir(sourceDirectory);
+ List<String> excludeList = new ArrayList<String>();
+ excludeList.add( "*.suo");
+ excludeList.add( "*.csproj");
+ excludeList.add( "*.sln");
+ excludeList.add( "obj/**");
+
if(includes != null && includes.length > 0 ) directoryScanner.setIncludes(includes);
- if(excludes != null && excludes.length > 0) directoryScanner.setExcludes(excludes);
+ directoryScanner.setExcludes(excludeList.toArray(excludes));
directoryScanner.addDefaultExcludes();
directoryScanner.scan();
String[] files = directoryScanner.getIncludedFiles();
@@ -79,7 +88,7 @@
for (String file : files) {
try {
FileUtils.copyFile(new File(sourceDirectory + File.separator + file),
- new File(outputDirectory + File.separator + file));
+ new File(outputDirectory + File.separator + file));
} catch (IOException e) {
throw new MojoExecutionException("NMAVEN-904-000: Unable to process sources", e);
}
Modified: incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestSourceProcessorMojo.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/TestSourceProcessorMojo.java?view=diff&rev=510317&r1=510316&r2=510317
==============================================================================
--- incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestSourceProcessorMojo.java (original)
+++ incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestSourceProcessorMojo.java Wed Feb 21 15:55:01 2007
@@ -25,6 +25,8 @@
import java.io.File;
import java.io.IOException;
+import java.util.List;
+import java.util.ArrayList;
/**
* Copies source files to target directory.
@@ -58,6 +60,14 @@
}
DirectoryScanner directoryScanner = new DirectoryScanner();
directoryScanner.setBasedir(sourceDirectory);
+
+ List<String> excludeList = new ArrayList<String>();
+ excludeList.add( "*.suo");
+ excludeList.add( "*.csproj");
+ excludeList.add( "*.sln");
+ excludeList.add( "obj/**");
+ directoryScanner.setExcludes(excludeList.toArray(new String[excludeList.size()]));
+
directoryScanner.addDefaultExcludes();
directoryScanner.scan();
String[] files = directoryScanner.getIncludedFiles();
@@ -65,7 +75,7 @@
for (String file : files) {
try {
FileUtils.copyFile(new File(sourceDirectory + File.separator + file),
- new File(outputDirectory + File.separator + file));
+ new File(outputDirectory + File.separator + file));
} catch (IOException e) {
throw new MojoExecutionException("NMAVEN-905-000: Unable to process test sources", e);
}