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 7bc8c1e9fe08df868302b748c90bbc9746b72b11..8967dc9a29d9ee39e6c494422b00815b54921168 100644 (file)
--- a/features/org.simantics.sysdyn.internal.feature/feature.xml
+++ b/features/org.simantics.sysdyn.internal.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature\r
       id="org.simantics.sysdyn.internal"\r
       label="Simantics System Dynamics Internal Solver Feature"\r
-      version="1.10.0.qualifier"\r
+      version="1.28.0.qualifier"\r
       provider-name="VTT Technical Research Centre of Finland">\r
 \r
    <description>\r

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 b22abf0ecd7ab2787b85f3234f85670d56f5a541..8bceefeb9c863f5f0487bfdf349dc45021dc31a6 100644 (file)
--- 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"?>\r
 <?pde version="3.6"?>\r
 \r
-<target name="Simantics master branch head" sequenceNumber="100">\r
+<target name="Simantics SDK" sequenceNumber="100">\r
 <locations>\r
 <location includeAllPlatforms="true" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
-<unit id="org.simantics.sdk.feature.group" version="1.25.0"/>\r
+<unit id="org.simantics.sdk.feature.group" version="1.28.0"/>\r
 <repository location="http://www.simantics.org/download/master/sdk"/>\r
 </location>\r
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r

diff --git a/releng/org.simantics.sysdyn.rcp.product/.project b/releng/org.simantics.sysdyn.rcp.product/.project
new file mode 100644 (file)
index 0000000..f695481
--- /dev/null
+++ b/releng/org.simantics.sysdyn.rcp.product/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<projectDescription>\r
+       <name>org.simantics.sysdyn.rcp.product</name>\r
+       <comment></comment>\r
+       <projects>\r
+       </projects>\r
+       <buildSpec>\r
+       </buildSpec>\r
+       <natures>\r
+       </natures>\r
+</projectDescription>\r

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 480496731b6903e45bec4822fae0d05387aa4e90..375f36b566495e1c695ca71abe71c629effba5f0 100644 (file)
--- 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"?>\r
 <?pde version="3.5"?>\r
 \r
-<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">\r
+<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">\r
 \r
    <aboutInfo>\r
       <image path="/org.simantics.sysdyn.product/icons/simantics_sysdyn128.png"/>\r
@@ -18,7 +18,7 @@
 --launcher.XXMaxPermSize 192m
 -data @noDefault\r
       </programArgs>\r
-      <vmArgs>-ea  -Xmx768M -XX:MaxPermSize=192m -Xshare:off -Dorg.simantics.undo.enabled=true\r
+      <vmArgs>-ea -Xmx768M -Xshare:off -Dorg.simantics.undo.enabled=true -Djava.util.Arrays.useLegacyMergeSort=true -Declipse.workaround.bug467000=true\r
       </vmArgs>\r
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts\r
       </vmArgsMac>\r
@@ -123,8 +123,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
    </plugins>\r
 \r
    <features>\r
-      <feature id="org.simantics.sysdyn.internal" version="1.9.1.qualifier"/>\r
+      <feature id="org.simantics.sysdyn.internal" version="1.28.0.qualifier"/>\r
    </features>\r
 \r
-\r
 </product>\r

diff --git a/releng/org.simantics.sysdyn.rcp.product/pom.xml b/releng/org.simantics.sysdyn.rcp.product/pom.xml
new file mode 100644 (file)
index 0000000..d1b7004
--- /dev/null
+++ b/releng/org.simantics.sysdyn.rcp.product/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
+       <modelVersion>4.0.0</modelVersion>\r
+       <groupId>org.simantics</groupId>\r
+       <artifactId>org.simantics.sysdyn.rcp.product</artifactId>\r
+       <version>1.0.0-SNAPSHOT</version>\r
+       <packaging>eclipse-repository</packaging>\r
+       \r
+       <parent>\r
+               <groupId>org.simantics</groupId>\r
+               <artifactId>org.simantics.sysdyn.root.releng</artifactId>\r
+               <version>1.0.0-SNAPSHOT</version>\r
+       </parent>\r
+\r
+       <build>\r
+               <plugins>\r
+                       <plugin>\r
+                               <groupId>org.eclipse.tycho</groupId>\r
+                               <artifactId>tycho-p2-repository-plugin</artifactId>\r
+                               <version>${tycho.version}</version>\r
+                               <configuration>\r
+                                       <includeAllDependencies>true</includeAllDependencies>\r
+                               </configuration>\r
+                       </plugin>\r
+                       <plugin>\r
+                               <groupId>org.eclipse.tycho</groupId>\r
+                               <artifactId>tycho-p2-director-plugin</artifactId>\r
+                               <version>${tycho.version}</version>\r
+                               <executions>\r
+                                       <execution>\r
+                                               <id>materialize-products</id>\r
+                                               <goals>\r
+                                                       <goal>materialize-products</goal>\r
+                                               </goals>\r
+                                       </execution>\r
+                                       <execution>\r
+                                               <id>archive-products</id>\r
+                                               <goals>\r
+                                                       <goal>archive-products</goal>\r
+                                               </goals>\r
+                                       </execution>\r
+                               </executions>\r
+                       </plugin>\r
+               </plugins>\r
+       </build>\r
+\r
+</project>\r

diff --git a/releng/pom.xml b/releng/pom.xml
index 0ee9c26341f1c1e1fe399201ac67457caffc7654..dc067dd9eb961bb8978e26ccd54021681e02a96f 100644 (file)
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -16,5 +16,6 @@
        <modules>\r
                <module>org.simantics.sysdyn.build.targetdefinition</module>\r
                <module>org.simantics.sysdyn.repository</module>\r
+               <module>org.simantics.sysdyn.rcp.product</module>\r
        </modules>\r
 </project>\r