Included Simantics-Desktop product into the platform build.

refs #6879

(cherry picked from commit bbfe1e9397f60e9d31b3c3fc363c0866a3cf8a79)

diff --git a/features/org.simantics.desktop.product.feature/feature.xml b/features/org.simantics.desktop.product.feature/feature.xml
index 48a5e13a5519e21139d2ca1e92bd24b2b9722dbb..9bd6f1eda661db7ee46421d7914ad21322f29b5a 100644 (file)
--- a/features/org.simantics.desktop.product.feature/feature.xml
+++ b/features/org.simantics.desktop.product.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
 <?xml version="1.0" encoding="UTF-8"?>
 <feature

-      id="org.simantics.desktop.product"
+      id="org.simantics.desktop.product.feature"

       label="Simantics Desktop Product Feature"
       version="1.0.0.qualifier"
       provider-name="Semantum Oy">
       label="Simantics Desktop Product Feature"
       version="1.0.0.qualifier"
       provider-name="Semantum Oy">

diff --git a/features/pom.xml b/features/pom.xml
index 6f2597dbf2e69cb4b249690ef4436625ea941bd1..e9b0252675badcee6796bf71e82f0947d8321810 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -109,6 +109,7 @@
         <module>org.simantics.db.client.feature</module>
         <module>org.simantics.db.services.feature</module>
         <module>org.simantics.desktop.feature</module>
         <module>org.simantics.db.client.feature</module>
         <module>org.simantics.db.services.feature</module>
         <module>org.simantics.desktop.feature</module>

+        <module>org.simantics.desktop.product.feature</module>

         <module>org.simantics.document.base.feature</module>
         <module>org.simantics.document.linking.feature</module>
         <module>org.simantics.document.swt.feature</module>
         <module>org.simantics.document.base.feature</module>
         <module>org.simantics.document.linking.feature</module>
         <module>org.simantics.document.swt.feature</module>

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

diff --git a/releng/org.simantics.desktop.rcp.product/pom.xml b/releng/org.simantics.desktop.rcp.product/pom.xml
new file mode 100644 (file)
index 0000000..ccee592
--- /dev/null
+++ b/releng/org.simantics.desktop.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.desktop.rcp.product</artifactId>
+       <version>1.0.0-SNAPSHOT</version>
+       <packaging>eclipse-repository</packaging>
+       
+       <parent>
+               <groupId>org.simantics</groupId>
+               <artifactId>org.simantics.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/bundles/org.simantics.desktop.product/simantics-desktop.product b/releng/org.simantics.desktop.rcp.product/simantics-desktop.product
similarity index 82%
rename from bundles/org.simantics.desktop.product/simantics-desktop.product
rename to releng/org.simantics.desktop.rcp.product/simantics-desktop.product
index 892730d370c9364a37d21186d05abbd87110bf31..d45d8da1f4412d21e81f479d8f41cb34de6a3570 100644 (file)
--- a/bundles/org.simantics.desktop.product/simantics-desktop.product
+++ b/releng/org.simantics.desktop.rcp.product/simantics-desktop.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 

-<product name="Simantics Desktop" uid="org.simantics.desktop.product.desktopProduct" id="org.simantics.desktop.product.desktopProduct" application="org.simantics.workbench.application" version="1.21.0" useFeatures="true" includeLaunchers="true">
+<product name="Simantics Desktop" uid="Simantics-Desktop" id="org.simantics.desktop.product.desktopProduct" application="org.simantics.workbench.application" version="1.27.0" useFeatures="true" includeLaunchers="true">

 
    <aboutInfo>
       <image path="/org.simantics.desktop.ui/icons/simantics256.png"/>
 
    <aboutInfo>
       <image path="/org.simantics.desktop.ui/icons/simantics256.png"/>


@@ -57,7 +57,7 @@ org.eclipse.e4.ui.css.theme.e4_classic
    </plugins>
 
    <features>
    </plugins>
 
    <features>

-      <feature id="org.simantics.desktop.product" version="1.0.0.qualifier"/>
+      <feature id="org.simantics.desktop.product.feature" version="1.0.0.qualifier"/>

    </features>
 
 
    </features>
 
 

diff --git a/releng/pom.xml b/releng/pom.xml
index 31243d1e9ee17dbe1e980c7d3f882ca72790cdb6..dd0a01205f9448a55a27fcf973ee3940cb33324c 100644 (file)
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -16,5 +16,6 @@
        <modules>
                <module>org.simantics.sdk.build.targetdefinition</module>
                <module>org.simantics.sdk.repository</module>
        <modules>
                <module>org.simantics.sdk.build.targetdefinition</module>
                <module>org.simantics.sdk.repository</module>

+               <module>org.simantics.desktop.rcp.product</module>

        </modules>
        </modules>

-</project>
\ No newline at end of file
+</project>