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 br...@apache.org on 2014/02/27 06:23:41 UTC
svn commit: r1572443 -
/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java
Author: brett
Date: Thu Feb 27 06:23:40 2014
New Revision: 1572443
URL: http://svn.apache.org/r1572443
Log:
[NPANDAY-609] add generated sources for XAML
make sure directory exists before trying to scan it
Modified:
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java
Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java?rev=1572443&r1=1572442&r2=1572443&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java (original)
+++ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java Thu Feb 27 06:23:40 2014
@@ -279,29 +279,31 @@ public class MsbuildMojo
resource.addInclude( "**/*.resources" );
project.addResource( resource );
- // Pick up generated source patterns to compile
- DirectoryScanner scanner = new DirectoryScanner();
- scanner.setBasedir( directory );
- scanner.setIncludes(new String[] { "**/*.g.cs", "**/*.g.vb" });
- scanner.scan();
+ if ( new File( directory ).exists() ) {
+ // Pick up generated source patterns to compile
+ DirectoryScanner scanner = new DirectoryScanner();
+ scanner.setBasedir( directory );
+ scanner.setIncludes(new String[] { "**/*.g.cs", "**/*.g.vb" });
+ scanner.scan();
- String[] files = scanner.getIncludedFiles();
- if ( files != null && files.length > 0 )
- {
- getLog().info( "Adding sources from " + directory + " generated by MSBuild" );
- File generatedSourcesDirectory = new File( project.getBuild().getDirectory(), "generated-sources/msbuild" );
- for ( String f : files )
+ String[] files = scanner.getIncludedFiles();
+ if ( files != null && files.length > 0 )
{
- File src = new File( directory, f );
- File dest = new File( generatedSourcesDirectory, f );
- dest.getParentFile().mkdirs();
- try {
- FileUtils.copyFile( src, dest );
- } catch (IOException e) {
- throw new MojoExecutionException("Unable to copy source file: " + e.getLocalizedMessage(), e);
+ getLog().info( "Adding sources from " + directory + " generated by MSBuild" );
+ File generatedSourcesDirectory = new File( project.getBuild().getDirectory(), "generated-sources/msbuild" );
+ for ( String f : files )
+ {
+ File src = new File( directory, f );
+ File dest = new File( generatedSourcesDirectory, f );
+ dest.getParentFile().mkdirs();
+ try {
+ FileUtils.copyFile( src, dest );
+ } catch (IOException e) {
+ throw new MojoExecutionException("Unable to copy source file: " + e.getLocalizedMessage(), e);
+ }
}
+ project.addCompileSourceRoot( generatedSourcesDirectory.getAbsolutePath() );
}
- project.addCompileSourceRoot( generatedSourcesDirectory.getAbsolutePath() );
}
if (attachXBAP) {