aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Daniel2013-02-15 10:57:24 (EST)
committerThanh Ha2013-02-27 13:14:12 (EST)
commit1ee473362f4eb96f212329f5ce37145978d1f348 (patch)
tree11e1567137cdc67f5f73b5cdd7a7a4465e1a7ca4
parent964e8c5a27c0944daafc6f355f7e00d819975f80 (diff)
downloadeclipse.platform.releng.aggregator-1ee473362f4eb96f212329f5ce37145978d1f348.zip
eclipse.platform.releng.aggregator-1ee473362f4eb96f212329f5ce37145978d1f348.tar.gz
eclipse.platform.releng.aggregator-1ee473362f4eb96f212329f5ce37145978d1f348.tar.bz2
Bug 381057 - CBI should be able to generate the API tools description
Always activate the eclipse-run profile, but skip it on projects with no API nature.
-rw-r--r--eclipse-platform-parent/pom.xml6
-rw-r--r--maven-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/GenerateAPIBuildXMLMojo.java3
2 files changed, 6 insertions, 3 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index b306c8d..fbf1d22 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -523,9 +523,9 @@
<profile>
<id>api-generation</id>
<activation>
- <file>
- <exists>.apibuild.xml</exists>
- </file>
+ <property>
+ <name>!longnotexistingproperty</name>
+ </property>
</activation>
<build>
<plugins>
diff --git a/maven-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/GenerateAPIBuildXMLMojo.java b/maven-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/GenerateAPIBuildXMLMojo.java
index 1ea1913..9cce2c3 100644
--- a/maven-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/GenerateAPIBuildXMLMojo.java
+++ b/maven-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/GenerateAPIBuildXMLMojo.java
@@ -89,10 +89,13 @@ public class GenerateAPIBuildXMLMojo extends AbstractMojo {
File dotProject = new File(project.getBasedir(), ".project");
if (!dotProject.exists()) {
// no .project
+ project.getProperties().setProperty("eclipserun.skip", "true");
return;
}
if (dotProjectContainsApiNature(dotProject)) {
generateBuildXML();
+ } else {
+ project.getProperties().setProperty("eclipserun.skip", "true");
}
}