aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Daniel2013-02-15 10:57:24 (EST)
committerPaul Webster2013-02-15 16:26:23 (EST)
commit18467502f7c7b200ee11b5eff7ad1c014061507c (patch)
tree69d9f7a44f14dd617934cb1009c420d420bdc1a2
parentb292ad863abaeeea6c2aff6a8a9ed2bd8d813948 (diff)
downloadeclipse.platform.releng.aggregator-18467502f7c7b200ee11b5eff7ad1c014061507c.zip
eclipse.platform.releng.aggregator-18467502f7c7b200ee11b5eff7ad1c014061507c.tar.gz
eclipse.platform.releng.aggregator-18467502f7c7b200ee11b5eff7ad1c014061507c.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-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-parent/pom.xml b/eclipse-parent/pom.xml
index 2529e5b..948090e 100644
--- a/eclipse-parent/pom.xml
+++ b/eclipse-parent/pom.xml
@@ -510,9 +510,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");
}
}