From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Tue, 31 Jan 2017 13:31:45 +0000 (+0200)
Subject: Introduced Simantics-Sysdyn product build with Tycho
X-Git-Tag: v1.29.0~8
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=6bee8f5629964d5de2b0fde51986caadf1a5e201;p=simantics%2Fsysdyn.git

Introduced Simantics-Sysdyn product build with Tycho

Done according to the instructions given at
http://www.vogella.com/tutorials/EclipseTycho/article.html#exercise-tycho-build-for-products

refs #6879
---

diff --git a/features/org.simantics.sysdyn.internal.feature/feature.xml b/features/org.simantics.sysdyn.internal.feature/feature.xml
index 7bc8c1e9..8967dc9a 100644
--- a/features/org.simantics.sysdyn.internal.feature/feature.xml
+++ b/features/org.simantics.sysdyn.internal.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.simantics.sysdyn.internal"
       label="Simantics System Dynamics Internal Solver Feature"
-      version="1.10.0.qualifier"
+      version="1.28.0.qualifier"
       provider-name="VTT Technical Research Centre of Finland">
 
    <description>
diff --git a/releng/org.simantics.sysdyn.build.targetdefinition/org.simantics.sysdyn.build.targetdefinition.target b/releng/org.simantics.sysdyn.build.targetdefinition/org.simantics.sysdyn.build.targetdefinition.target
index b22abf0e..8bceefeb 100644
--- a/releng/org.simantics.sysdyn.build.targetdefinition/org.simantics.sysdyn.build.targetdefinition.target
+++ b/releng/org.simantics.sysdyn.build.targetdefinition/org.simantics.sysdyn.build.targetdefinition.target
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.6"?>
 
-<target name="Simantics master branch head" sequenceNumber="100">
+<target name="Simantics SDK" sequenceNumber="100">
 <locations>
 <location includeAllPlatforms="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.simantics.sdk.feature.group" version="1.25.0"/>
+<unit id="org.simantics.sdk.feature.group" version="1.28.0"/>
 <repository location="http://www.simantics.org/download/master/sdk"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
diff --git a/releng/org.simantics.sysdyn.rcp.product/.project b/releng/org.simantics.sysdyn.rcp.product/.project
new file mode 100644
index 00000000..f6954819
--- /dev/null
+++ b/releng/org.simantics.sysdyn.rcp.product/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.simantics.sysdyn.rcp.product</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.simantics.sysdyn.product/sysdyn.product b/releng/org.simantics.sysdyn.rcp.product/org.simantics.sysdyn.product.product
similarity index 96%
rename from bundles/org.simantics.sysdyn.product/sysdyn.product
rename to releng/org.simantics.sysdyn.rcp.product/org.simantics.sysdyn.product.product
index 48049673..375f36b5 100644
--- a/bundles/org.simantics.sysdyn.product/sysdyn.product
+++ b/releng/org.simantics.sysdyn.rcp.product/org.simantics.sysdyn.product.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Simantics System Dynamic Tool" uid="org.simantics.sysdyn.product.Sysdyn" id="org.simantics.sysdyn.product.product" application="org.simantics.workbench.application" version="1.9.1" useFeatures="true" includeLaunchers="true">
+<product name="Simantics System Dynamic Tool" uid="Simantics-Sysdyn" id="org.simantics.sysdyn.product.product" application="org.simantics.workbench.application" version="1.28.0" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.simantics.sysdyn.product/icons/simantics_sysdyn128.png"/>
@@ -18,7 +18,7 @@
 --launcher.XXMaxPermSize 192m
 -data @noDefault
       </programArgs>
-      <vmArgs>-ea  -Xmx768M -XX:MaxPermSize=192m -Xshare:off -Dorg.simantics.undo.enabled=true
+      <vmArgs>-ea -Xmx768M -Xshare:off -Dorg.simantics.undo.enabled=true -Djava.util.Arrays.useLegacyMergeSort=true -Declipse.workaround.bug467000=true
       </vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
@@ -123,8 +123,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
    </plugins>
 
    <features>
-      <feature id="org.simantics.sysdyn.internal" version="1.9.1.qualifier"/>
+      <feature id="org.simantics.sysdyn.internal" version="1.28.0.qualifier"/>
    </features>
 
-
 </product>
diff --git a/releng/org.simantics.sysdyn.rcp.product/pom.xml b/releng/org.simantics.sysdyn.rcp.product/pom.xml
new file mode 100644
index 00000000..d1b70044
--- /dev/null
+++ b/releng/org.simantics.sysdyn.rcp.product/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.simantics</groupId>
+	<artifactId>org.simantics.sysdyn.rcp.product</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-repository</packaging>
+	
+	<parent>
+		<groupId>org.simantics</groupId>
+		<artifactId>org.simantics.sysdyn.root.releng</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-repository-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<includeAllDependencies>true</includeAllDependencies>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-director-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<executions>
+					<execution>
+						<id>materialize-products</id>
+						<goals>
+							<goal>materialize-products</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>archive-products</id>
+						<goals>
+							<goal>archive-products</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/releng/pom.xml b/releng/pom.xml
index 0ee9c263..dc067dd9 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -16,5 +16,6 @@
 	<modules>
 		<module>org.simantics.sysdyn.build.targetdefinition</module>
 		<module>org.simantics.sysdyn.repository</module>
+		<module>org.simantics.sysdyn.rcp.product</module>
 	</modules>
 </project>