From 9f40667eab1a4a60c68d54ceb502965fb11fe230 Mon Sep 17 00:00:00 2001
From: Camille Letavernier
Date: Mon, 4 Jan 2016 18:04:17 +0100
Subject: [Releng - Extra] Restore the proper build configuration (Reverted by
 the previous commit)

- Partially reverts commit baf2ea7 to restore a valid build
configuration

Change-Id: I906f8ea547b3d0df0db3528e302d1a42e50a3ca7
Signed-off-by: Camille Letavernier <camille.letavernier@cea.fr>---
 releng/extra/pom.xml | 67 +++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 56 insertions(+), 11 deletions(-)

diff --git a/releng/extra/pom.xml b/releng/extra/pom.xml
index c7fee17abef..1a0ee130c45 100644
--- a/releng/extra/pom.xml
+++ b/releng/extra/pom.xml
@@ -245,11 +245,6 @@
 		<!-- <repository> <id>org.eclipse.epf.richtext_1.5.1.6-update-site</id> 
 			<layout>p2</layout> <url>http://download.eclipse.org/modeling/mdt/papyrus/updates/epf/main</url> 
 			</repository> -->
-		<repository>
-			<id>papyrus-main</id>
-			<layout>p2</layout>
-			<url>${papyrus.repo.main}</url>
-		</repository>
 		<repository>
 			<id>cdt</id>
 			<layout>p2</layout>
@@ -292,12 +287,6 @@
 			<!-- manualUpdate -->
 			<url>${rmf.repo.url}</url>
 		</repository>
-		<repository>
-			<id>PapyrusRT</id>
-			<layout>p2</layout>
-			<!-- manualUpdate -->
-			<url>${papyrusrt.repo.url}</url>
-		</repository>
 	</repositories>
 	<build>
 
@@ -430,6 +419,13 @@
 
 		<profile>
 			<id>defaultProfile</id>
+			<repositories>
+				<repository>
+					<id>papyrus-main</id>
+					<layout>p2</layout>
+					<url>${papyrus.repo.main}</url>
+				</repository>
+			</repositories>
 			<build>
 				<plugins>
 					<plugin>
@@ -570,6 +566,55 @@
 			</activation>
 		</profile>
 
+		<!-- Used with pack and packAndSign -->
+		<profile>
+			<id>buildExtra</id>
+				<repositories>
+					<repository>
+						<id>papyrus-main</id>
+						<layout>p2</layout>
+						<url>${papyrus.repo.main}</url>
+					</repository>
+			</repositories>
+			<activation>
+				<property>
+					<name>SIGN</name> <!-- Either true or false -->
+				</property>
+			</activation>
+		</profile>
+		
+		
+		<profile>
+			<id>buildAll</id>
+			<!-- Papyrus Update sites not included (They are included in the same build) -->
+			
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-p2-plugin</artifactId>
+						<version>${tycho-version}</version>
+						<executions>
+							<execution>
+								<id>attach-p2-metadata</id>
+								<phase>package</phase>
+								<goals>
+									<goal>p2-metadata</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+			
+			<activation>
+				<property>
+					<name>buildAll</name>
+					<value>true</value>
+				</property>
+			</activation>
+		</profile>
+
 		<!-- profile dedicated to activate the repository linked to nightly artifacts, 
 			useful for daily life of developers -->
 		<profile>
-- 
cgit v1.2.3