From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Thu, 2 Feb 2017 12:07:54 +0000 (+0200)
Subject: Merge "Added module header feature to SCL language."
X-Git-Tag: v1.28.0~88
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=90b5d2ee1cfe82a75a097116f2f34ddb1cdff067;hp=66ced93f835205135a84fea73b2fbb8e9d610f7e;p=simantics%2Fplatform.git

Merge "Added module header feature to SCL language."
---

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/scl/CompileSCLMonitorRequest.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/scl/CompileSCLMonitorRequest.java
index 10eeb6ac6..dfea83931 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/scl/CompileSCLMonitorRequest.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/scl/CompileSCLMonitorRequest.java
@@ -29,10 +29,14 @@ import org.simantics.scl.compiler.types.Type;
 import org.simantics.scl.runtime.SCLContext;
 import org.simantics.scl.runtime.function.Function1;
 import org.simantics.utils.datastructures.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class CompileSCLMonitorRequest extends AbstractExpressionCompilationRequest<CompilationContext, Variable> {
-    
+
+    private static Logger LOGGER = LoggerFactory.getLogger(CompileSCLMonitorRequest.class);
+
     protected static Name BROWSE = Name.create("Simantics/Variables", "browse");
     protected static Name VALUE = Name.create("Simantics/Variables", "value");
     
@@ -72,10 +76,8 @@ public class CompileSCLMonitorRequest extends AbstractExpressionCompilationReque
             sclContext.put("graph", graph);
             return exp.apply(context.getParent(graph));
         } catch (DatabaseException e) {
-            e.printStackTrace();
             throw (DatabaseException)e;
         } catch (Throwable t) {
-            t.printStackTrace();
             throw new DatabaseException(t);
         } finally {
             sclContext.put("graph", oldGraph);
@@ -98,7 +100,7 @@ public class CompileSCLMonitorRequest extends AbstractExpressionCompilationReque
             try {
                 return Environments.getType(context.runtimeEnvironment.getEnvironment(), valueType);
             } catch (SCLExpressionCompilationException e) {
-                e.printStackTrace();
+                LOGGER.warn("getExpectedType failed for valueType: " + valueType, e);
             }
         }
         return super.getExpectedType(graph, context);
diff --git a/features/org.simantics.desktop.product.feature/feature.xml b/features/org.simantics.desktop.product.feature/feature.xml
index 48a5e13a5..9bd6f1eda 100644
--- 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
-      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">
diff --git a/features/pom.xml b/features/pom.xml
index 6f2597dbf..e9b025267 100644
--- 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.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>
diff --git a/releng/org.simantics.desktop.rcp.product/.project b/releng/org.simantics.desktop.rcp.product/.project
new file mode 100644
index 000000000..2ff298bc4
--- /dev/null
+++ b/releng/org.simantics.desktop.rcp.product/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.simantics.desktop.rcp.product</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/releng/org.simantics.desktop.rcp.product/pom.xml b/releng/org.simantics.desktop.rcp.product/pom.xml
new file mode 100644
index 000000000..ccee59257
--- /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 892730d37..804eb9dac 100644
--- 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"?>
 
-<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.28.0" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.simantics.desktop.ui/icons/simantics256.png"/>
@@ -57,7 +57,7 @@ org.eclipse.e4.ui.css.theme.e4_classic
    </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>
 
 
diff --git a/releng/pom.xml b/releng/pom.xml
index 31243d1e9..dd0a01205 100644
--- 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>
+		<module>org.simantics.desktop.rcp.product</module>
 	</modules>
-</project>
\ No newline at end of file
+</project>