From e8c35d105cf227a9a781ac4aac79dcd0c5024a6b Mon Sep 17 00:00:00 2001 From: Vikas Rangarajan Date: Mon, 22 Mar 2010 15:48:57 -0700 Subject: Initial merge of local changes with master, main changes : - New mojo for vcproj generation - Fixed aol to be url-friendly for maven deployments (g++->gpp) - Fail build early if specified include paths do not exist - Only add "include" subdirs of sourcedirs if they exist, to the include path - Removed duplication of source dirs in source path --- src/main/resources/META-INF/plexus/components.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/resources/META-INF') diff --git a/src/main/resources/META-INF/plexus/components.xml b/src/main/resources/META-INF/plexus/components.xml index aa6d8b2..80850e4 100644 --- a/src/main/resources/META-INF/plexus/components.xml +++ b/src/main/resources/META-INF/plexus/components.xml @@ -35,7 +35,8 @@ org.apache.maven.plugins:maven-resources-plugin:resources, org.apache.maven.plugins:maven-nar-plugin:nar-resources, - org.apache.maven.plugins:maven-nar-plugin:nar-gnu-resources + org.apache.maven.plugins:maven-nar-plugin:nar-gnu-resources, + org.apache.maven.plugins:maven-nar-plugin:nar-vcproj org.apache.maven.plugins:maven-compiler-plugin:compile, org.apache.maven.plugins:maven-nar-plugin:nar-javah, -- cgit v1.2.3