From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Sun, 18 Dec 2016 19:25:07 +0000 (+0200)
Subject: Include source features in generated SDK P2 repository
X-Git-Tag: v1.25.0~5
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=0e8233d31b221655110ee9b9ac9b87229ab7ed2e;ds=sidebyside

Include source features in generated SDK P2 repository

The problem was that the generated org.simantics.sdk.source feature was
missing from org.simantics.sdk.repository/category.xml and thus the
build would not include any sources.

Also bumped used tycho version to 0.26.0 from 0.25.0.

refs #6621

Change-Id: I10e63a77b414f67bb32168d93d0c612ac1bc0b56
---

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index 2d97f0e0d..19c1651ea 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
   <extension>
     <groupId>org.eclipse.tycho.extras</groupId>
     <artifactId>tycho-pomless</artifactId>
-    <version>0.25.0</version>
+    <version>0.26.0</version>
   </extension>
 </extensions> 
\ No newline at end of file
diff --git a/releng/org.simantics.sdk.repository/category.xml b/releng/org.simantics.sdk.repository/category.xml
index f97fc7574..64051231a 100644
--- a/releng/org.simantics.sdk.repository/category.xml
+++ b/releng/org.simantics.sdk.repository/category.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.simantics.sdk_1.25.0.jar" id="org.simantics.sdk" version="1.25.0">
+   <feature id="org.simantics.sdk">
+      <category name="org.simantics.target"/>
+   </feature>
+   <feature id="org.simantics.sdk.source">
       <category name="org.simantics.target"/>
    </feature>
    <category-def name="org.simantics.target" label="Simantics Target">
diff --git a/releng/org.simantics.tycho.configuration/pom.xml b/releng/org.simantics.tycho.configuration/pom.xml
index 5e874e6a6..a6b0ce2fa 100644
--- a/releng/org.simantics.tycho.configuration/pom.xml
+++ b/releng/org.simantics.tycho.configuration/pom.xml
@@ -8,8 +8,8 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<tycho.version>0.25.0</tycho.version>
-		<tycho.extras.version>0.25.0</tycho.extras.version>
+		<tycho.version>0.26.0</tycho.version>
+		<tycho.extras.version>0.26.0</tycho.extras.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<mars-repo.url>http://download.eclipse.org/releases/mars</mars-repo.url>
 	</properties>
@@ -32,6 +32,11 @@
 				<version>${tycho.version}</version>
 				<extensions>true</extensions>
 			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-versions-plugin</artifactId>
+				<version>${tycho.version}</version>
+			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-packaging-plugin</artifactId>
@@ -85,6 +90,11 @@
 					</environments>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<version>${tycho.extras.version}</version>
+			</plugin>
 		</plugins>
 	</build>
 </project>