Attachment 227124 Details for Bug 381057 – Fix incorporating Jan's suggestions

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix incorporating Jan's suggestions

0001-Bug-381057-CBI-should-be-able-to-generate-the-API-to.patch (text/plain), 1.99 KB, created by Krzysztof Daniel

on 2013-02-15 06:02:27 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Daniel

Created: 2013-02-15 06:02:27 EST

Size: 1.99 KB

patch

obsolete

>From 4e555443f6836f3faebae44403b7c03bc0948294 Mon Sep 17 00:00:00 2001
>From: Krzysztof Daniel <kdaniel@redhat.com>
>Date: Fri, 15 Feb 2013 11:34:32 +0100
>Subject: [PATCH] Bug 381057 - CBI should be able to generate the API tools
> description
>
>It turned out that maven profiles really cannot be enabled by generated files.
>The build script generation plugin profile runs always now, but the real api generation task is suprsessed if there is no pdeapinature.
>Hack, but works.
>
>https://bugs.eclipse.org/bugs/show_bug.cgi?id=381057
>---
> eclipse-parent/pom.xml                                              | 6 +++---
> .../src/main/java/org/eclipse/cbi/mojo/GenerateAPIBuildXMLMojo.java | 3 +++
> 2 files changed, 6 insertions(+), 3 deletions(-)
>
>diff --git a/eclipse-parent/pom.xml b/eclipse-parent/pom.xml
>index 4cd68d6..9d8842e 100644
>--- a/eclipse-parent/pom.xml
>+++ b/eclipse-parent/pom.xml
>@@ -508,9 +508,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");
> 		}
> 	}
> 	
>-- 
>1.8.1.2
>

Actions: View | Diff

Attachments on bug 381057: 221047 | 221048 | 225435 | 225436 | 225884 | 225885 | 225994 | 227124 | 227935 | 227936