Commit f5e98e21 authored by Tuukka Lehtonen's avatar Tuukka Lehtonen
Browse files

Fixes for Simantics R before branching 1.31.0.

* Removed bin directory unnecessarily put in the repository
* Switched from Tycho 0.26 to 1.0.0
* Added TPD file to generate the target platform for the build
* Removed 32-bit linux build from the build configurations
* Removed unnecessary configuration from features/pom.xml

refs #7398

Change-Id: Id7a16f4edfc9743c3a55937b3e8cafc0070aa225
parent 408600ef
......@@ -3,6 +3,6 @@
<extension>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pomless</artifactId>
<version>0.26.0</version>
<version>1.0.0</version>
</extension>
</extensions>
package org.simantics.r;
import org.simantics.db.RequestProcessor;
import org.simantics.db.Resource;
import org.simantics.db.ReadGraph;
import org.simantics.db.request.Read;
import org.simantics.db.Session;
import org.simantics.db.exception.DatabaseException;
import org.simantics.db.service.QueryControl;
public class RResource {
public final Resource Model;
public final Resource RProperty;
public final Resource Script;
public final Resource Script_text;
public final Resource Script_text_Inverse;
public final Resource Session;
public final Resource SessionConfiguration;
public final Resource SessionConfiguration_hasScript;
public final Resource SessionConfiguration_host;
public final Resource SessionConfiguration_host_Inverse;
public final Resource SessionConfiguration_password;
public final Resource SessionConfiguration_password_Inverse;
public final Resource SessionConfiguration_port;
public final Resource SessionConfiguration_port_Inverse;
public final Resource SessionConfiguration_username;
public final Resource SessionConfiguration_username_Inverse;
public final Resource Session_hasValue;
public final Resource Session_hasValue_Inverse;
public final Resource TabContribution;
public static class URIs {
public static final String Model = "http://www.simantics.org/R-1.0/Model";
public static final String RProperty = "http://www.simantics.org/R-1.0/RProperty";
public static final String Script = "http://www.simantics.org/R-1.0/Script";
public static final String Script_text = "http://www.simantics.org/R-1.0/Script/text";
public static final String Script_text_Inverse = "http://www.simantics.org/R-1.0/Script/text/Inverse";
public static final String Session = "http://www.simantics.org/R-1.0/Session";
public static final String SessionConfiguration = "http://www.simantics.org/R-1.0/SessionConfiguration";
public static final String SessionConfiguration_hasScript = "http://www.simantics.org/R-1.0/SessionConfiguration/hasScript";
public static final String SessionConfiguration_host = "http://www.simantics.org/R-1.0/SessionConfiguration/host";
public static final String SessionConfiguration_host_Inverse = "http://www.simantics.org/R-1.0/SessionConfiguration/host/Inverse";
public static final String SessionConfiguration_password = "http://www.simantics.org/R-1.0/SessionConfiguration/password";
public static final String SessionConfiguration_password_Inverse = "http://www.simantics.org/R-1.0/SessionConfiguration/password/Inverse";
public static final String SessionConfiguration_port = "http://www.simantics.org/R-1.0/SessionConfiguration/port";
public static final String SessionConfiguration_port_Inverse = "http://www.simantics.org/R-1.0/SessionConfiguration/port/Inverse";
public static final String SessionConfiguration_username = "http://www.simantics.org/R-1.0/SessionConfiguration/username";
public static final String SessionConfiguration_username_Inverse = "http://www.simantics.org/R-1.0/SessionConfiguration/username/Inverse";
public static final String Session_hasValue = "http://www.simantics.org/R-1.0/Session/hasValue";
public static final String Session_hasValue_Inverse = "http://www.simantics.org/R-1.0/Session/hasValue/Inverse";
public static final String TabContribution = "http://www.simantics.org/R-1.0/TabContribution";
}
public static Resource getResourceOrNull(ReadGraph graph, String uri) {
try {
return graph.getResource(uri);
} catch(DatabaseException e) {
System.err.println(e.getMessage());
return null;
}
}
public RResource(ReadGraph graph) {
Model = getResourceOrNull(graph, URIs.Model);
RProperty = getResourceOrNull(graph, URIs.RProperty);
Script = getResourceOrNull(graph, URIs.Script);
Script_text = getResourceOrNull(graph, URIs.Script_text);
Script_text_Inverse = getResourceOrNull(graph, URIs.Script_text_Inverse);
Session = getResourceOrNull(graph, URIs.Session);
SessionConfiguration = getResourceOrNull(graph, URIs.SessionConfiguration);
SessionConfiguration_hasScript = getResourceOrNull(graph, URIs.SessionConfiguration_hasScript);
SessionConfiguration_host = getResourceOrNull(graph, URIs.SessionConfiguration_host);
SessionConfiguration_host_Inverse = getResourceOrNull(graph, URIs.SessionConfiguration_host_Inverse);
SessionConfiguration_password = getResourceOrNull(graph, URIs.SessionConfiguration_password);
SessionConfiguration_password_Inverse = getResourceOrNull(graph, URIs.SessionConfiguration_password_Inverse);
SessionConfiguration_port = getResourceOrNull(graph, URIs.SessionConfiguration_port);
SessionConfiguration_port_Inverse = getResourceOrNull(graph, URIs.SessionConfiguration_port_Inverse);
SessionConfiguration_username = getResourceOrNull(graph, URIs.SessionConfiguration_username);
SessionConfiguration_username_Inverse = getResourceOrNull(graph, URIs.SessionConfiguration_username_Inverse);
Session_hasValue = getResourceOrNull(graph, URIs.Session_hasValue);
Session_hasValue_Inverse = getResourceOrNull(graph, URIs.Session_hasValue_Inverse);
TabContribution = getResourceOrNull(graph, URIs.TabContribution);
}
public static RResource getInstance(ReadGraph graph) {
Session session = graph.getSession();
RResource ret = session.peekService(RResource.class);
if(ret == null) {
QueryControl qc = graph.getService(QueryControl.class);
ret = new RResource(qc.getIndependentGraph(graph));
session.registerService(RResource.class, ret);
}
return ret;
}
public static RResource getInstance(RequestProcessor session) throws DatabaseException {
RResource ret = session.peekService(RResource.class);
if(ret == null) {
ret = session.syncRequest(new Read<RResource>() {
public RResource perform(ReadGraph graph) throws DatabaseException {
QueryControl qc = graph.getService(QueryControl.class);
return new RResource(qc.getIndependentGraph(graph));
}
});
session.registerService(RResource.class, ret);
}
return ret;
}
}
package org.simantics.r;
import org.simantics.db.RequestProcessor;
import org.simantics.db.Resource;
import org.simantics.db.ReadGraph;
import org.simantics.db.request.Read;
import org.simantics.db.Session;
import org.simantics.db.exception.DatabaseException;
import org.simantics.db.service.QueryControl;
public class RResource {
public final Resource Model;
public final Resource RProperty;
public final Resource Script;
public final Resource Script_text;
public final Resource Script_text_Inverse;
public final Resource Session;
public final Resource SessionConfiguration;
public final Resource SessionConfiguration_hasScript;
public final Resource SessionConfiguration_host;
public final Resource SessionConfiguration_host_Inverse;
public final Resource SessionConfiguration_password;
public final Resource SessionConfiguration_password_Inverse;
public final Resource SessionConfiguration_port;
public final Resource SessionConfiguration_port_Inverse;
public final Resource SessionConfiguration_username;
public final Resource SessionConfiguration_username_Inverse;
public final Resource Session_hasValue;
public final Resource Session_hasValue_Inverse;
public final Resource TabContribution;
public static class URIs {
public static final String Model = "http://www.simantics.org/R-1.0/Model";
public static final String RProperty = "http://www.simantics.org/R-1.0/RProperty";
public static final String Script = "http://www.simantics.org/R-1.0/Script";
public static final String Script_text = "http://www.simantics.org/R-1.0/Script/text";
public static final String Script_text_Inverse = "http://www.simantics.org/R-1.0/Script/text/Inverse";
public static final String Session = "http://www.simantics.org/R-1.0/Session";
public static final String SessionConfiguration = "http://www.simantics.org/R-1.0/SessionConfiguration";
public static final String SessionConfiguration_hasScript = "http://www.simantics.org/R-1.0/SessionConfiguration/hasScript";
public static final String SessionConfiguration_host = "http://www.simantics.org/R-1.0/SessionConfiguration/host";
public static final String SessionConfiguration_host_Inverse = "http://www.simantics.org/R-1.0/SessionConfiguration/host/Inverse";
public static final String SessionConfiguration_password = "http://www.simantics.org/R-1.0/SessionConfiguration/password";
public static final String SessionConfiguration_password_Inverse = "http://www.simantics.org/R-1.0/SessionConfiguration/password/Inverse";
public static final String SessionConfiguration_port = "http://www.simantics.org/R-1.0/SessionConfiguration/port";
public static final String SessionConfiguration_port_Inverse = "http://www.simantics.org/R-1.0/SessionConfiguration/port/Inverse";
public static final String SessionConfiguration_username = "http://www.simantics.org/R-1.0/SessionConfiguration/username";
public static final String SessionConfiguration_username_Inverse = "http://www.simantics.org/R-1.0/SessionConfiguration/username/Inverse";
public static final String Session_hasValue = "http://www.simantics.org/R-1.0/Session/hasValue";
public static final String Session_hasValue_Inverse = "http://www.simantics.org/R-1.0/Session/hasValue/Inverse";
public static final String TabContribution = "http://www.simantics.org/R-1.0/TabContribution";
}
public static Resource getResourceOrNull(ReadGraph graph, String uri) {
try {
return graph.getResource(uri);
} catch(DatabaseException e) {
System.err.println(e.getMessage());
return null;
}
}
public RResource(ReadGraph graph) {
Model = getResourceOrNull(graph, URIs.Model);
RProperty = getResourceOrNull(graph, URIs.RProperty);
Script = getResourceOrNull(graph, URIs.Script);
Script_text = getResourceOrNull(graph, URIs.Script_text);
Script_text_Inverse = getResourceOrNull(graph, URIs.Script_text_Inverse);
Session = getResourceOrNull(graph, URIs.Session);
SessionConfiguration = getResourceOrNull(graph, URIs.SessionConfiguration);
SessionConfiguration_hasScript = getResourceOrNull(graph, URIs.SessionConfiguration_hasScript);
SessionConfiguration_host = getResourceOrNull(graph, URIs.SessionConfiguration_host);
SessionConfiguration_host_Inverse = getResourceOrNull(graph, URIs.SessionConfiguration_host_Inverse);
SessionConfiguration_password = getResourceOrNull(graph, URIs.SessionConfiguration_password);
SessionConfiguration_password_Inverse = getResourceOrNull(graph, URIs.SessionConfiguration_password_Inverse);
SessionConfiguration_port = getResourceOrNull(graph, URIs.SessionConfiguration_port);
SessionConfiguration_port_Inverse = getResourceOrNull(graph, URIs.SessionConfiguration_port_Inverse);
SessionConfiguration_username = getResourceOrNull(graph, URIs.SessionConfiguration_username);
SessionConfiguration_username_Inverse = getResourceOrNull(graph, URIs.SessionConfiguration_username_Inverse);
Session_hasValue = getResourceOrNull(graph, URIs.Session_hasValue);
Session_hasValue_Inverse = getResourceOrNull(graph, URIs.Session_hasValue_Inverse);
TabContribution = getResourceOrNull(graph, URIs.TabContribution);
}
public static RResource getInstance(ReadGraph graph) {
Session session = graph.getSession();
RResource ret = session.peekService(RResource.class);
if(ret == null) {
QueryControl qc = graph.getService(QueryControl.class);
ret = new RResource(qc.getIndependentGraph(graph));
session.registerService(RResource.class, ret);
}
return ret;
}
public static RResource getInstance(RequestProcessor session) throws DatabaseException {
RResource ret = session.peekService(RResource.class);
if(ret == null) {
ret = session.syncRequest(new Read<RResource>() {
public RResource perform(ReadGraph graph) throws DatabaseException {
QueryControl qc = graph.getService(QueryControl.class);
return new RResource(qc.getIndependentGraph(graph));
}
});
session.registerService(RResource.class, ret);
}
return ret;
}
}
......@@ -15,36 +15,6 @@
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<version>${tycho.extras.version}</version>
<executions>
<execution>
<id>source-feature</id>
<phase>package</phase>
<goals>
<goal>source-feature</goal>
</goals>
<configuration>
<excludes>
<!-- ID of the non-source bundle(s) to exclude from the generated source feature -->
<plugin id="org.simantics.fileimport"/>
<plugin id="org.simantics.fmu.me.win32"/>
<plugin id="org.simantics.fmu.me.win64"/>
<plugin id="org.simantics.sysdyn.product"/>
<feature id="org.eclipse.equinox.executable"/>
<feature id="org.simantics.eclipsec.launcher"/>
<feature id="org.simantics.help"/>
<feature id="org.simantics.issues.feature"/>
<feature id="org.simantics.issues.ui.feature"/>
<feature id="org.simantics.modeling"/>
<feature id="org.simantics.workbench"/>
</excludes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
......
target "Simupedia 1.31.0"
with source allEnvironments
include "http://www.simantics.org/download/master/simantics.tpd"
......@@ -8,8 +8,8 @@
<packaging>pom</packaging>
<properties>
<tycho.version>0.26.0</tycho.version>
<tycho.extras.version>0.26.0</tycho.extras.version>
<tycho.version>1.0.0</tycho.version>
<tycho.extras.version>1.0.0</tycho.extras.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
......@@ -45,11 +45,6 @@
</artifact>
</target>
<environments>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment