From: Alexandre Montplaisir <alexmonthy@efficios.com>
Date: Mon, 17 Oct 2016 21:14:35 +0000 (-0400)
Subject: releng: Change the "-Pbuild-rcp" directive to a "-Dskip-rcp" property
X-Git-Url: http://git.efficios.com/?p=deliverable%2Ftracecompass.git;a=commitdiff_plain;h=1268a470e77c0992585b89de713a4645e8b152e5

releng: Change the "-Pbuild-rcp" directive to a "-Dskip-rcp" property

<activeByDefault>true</activeByDefault> is very bad and
should not be used. Among other things, it effectively prevents
from defining more than one profile in a given pom.xml.

Change-Id: Id30897025a7df37d14014ef605122416e0b33dc7
Signed-off-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Reviewed-on: https://git.eclipse.org/r/83402
Reviewed-by: Hudson CI
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
---

diff --git a/README.md b/README.md
index 04a1ced64d..01a8364ad1 100644
--- a/README.md
+++ b/README.md
@@ -70,15 +70,15 @@ the build system. You can set them by using `-P[profile name]` and
   stable platform. To use the staging target for example, use
   `-Dtarget-platform=tracecompass-eStaging`.
 
+* `-Dskip-rcp`
+
+  Skips building the RCP archives and related deployment targets.
+
 * `-Pctf-grammar`
 
   Re-compiles the CTF grammar files. This should be enabled if you modify the
   `.g` files in the `ctf.parser` plugin.
 
-* `-P -build-rcp`
-
-  Disables the "build-rcp" profile to skip building the RCP archives.
-
 * `-Prun-custom-test-suite`
 
   Runs a test suite present in `releng/org.eclipse.tracecompass.alltests`. The
@@ -91,7 +91,6 @@ the build system. You can set them by using `-P[profile name]` and
   the RCP-specific update site, to the paths specified by
   `-DrcpDestination=/absolute/path/to/destination` and
   `-DrcpSiteDestination=/absolute/path/to/destination`, respectively.
-  Must be used with `-Pbuild-rcp`!
 
 * `-Pdeploy-update-site`
 
diff --git a/rcp/pom.xml b/rcp/pom.xml
index 5d334484bf..dca5b235e8 100644
--- a/rcp/pom.xml
+++ b/rcp/pom.xml
@@ -35,7 +35,9 @@
     <profile>
       <id>build-rcp</id>
       <activation>
-        <activeByDefault>true</activeByDefault>
+        <property>
+          <name>!skip-rcp</name>
+        </property>
       </activation>
       <modules>
         <module>org.eclipse.tracecompass.rcp.product</module>