From f5e98e2138dd919869c9665ba7269a7b02cbc0f7 Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Tue, 26 Sep 2017 13:58:10 +0300 Subject: [PATCH] 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 --- .mvn/extensions.xml | 2 +- .../simantics/r/fileimport/Activator.class | Bin 794 -> 0 bytes .../simantics/r/fileimport/RFileImport.class | Bin 1433 -> 0 bytes bundles/org.simantics.r.ontology/graph.tg | Bin 3665 -> 3665 bytes .../src/org/simantics/r/RResource.java | 224 +++---- features/pom.xml | 30 - ....simantics.r.build.targetdefinition.target | 552 +++++++++++------- ...org.simantics.r.build.targetdefinition.tpd | 5 + .../pom.xml | 9 +- 9 files changed, 450 insertions(+), 372 deletions(-) delete mode 100644 bundles/org.simantics.r.fileimport/bin/org/simantics/r/fileimport/Activator.class delete mode 100644 bundles/org.simantics.r.fileimport/bin/org/simantics/r/fileimport/RFileImport.class create mode 100644 releng/org.simantics.r.build.targetdefinition/org.simantics.r.build.targetdefinition.tpd diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index d0555d0..8359a6d 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,6 +3,6 @@ org.eclipse.tycho.extras tycho-pomless - 0.26.0 + 1.0.0 diff --git a/bundles/org.simantics.r.fileimport/bin/org/simantics/r/fileimport/Activator.class b/bundles/org.simantics.r.fileimport/bin/org/simantics/r/fileimport/Activator.class deleted file mode 100644 index 51895a1acc6116ee91639b2017192518f49f1c0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 794 zcmah`%T60H6g@YYWMBx-q_h-T1OgPOgg4!lRw}4nMRd`My)!t$Fd0W42l%W4i%MPe z1Nu=F*G?2zK(nxYALpF=@ZW#G{{VQ8^%y0>ma$z?=$_1-P77g0M`ud+`o=o(Id%F{ zI%8u*goSf?DMcppuK3nISE-9pC2V@WDY{y8tn8^PV=u(vAV1C2m`#XNlRI_o7~Xmo ze>B8=AXE=@uH7d>xw(5nh>pyuN>IjZ4bw;n^DUjL<3X>j><`(_6k(}lQkk7dtGz!8 zM(#`(gq=`w(uiC(=_)sBg7?zgo!sg)2rp`gF-52pPFkLDyE&QXr%JwDr>gI?$%`1T z3H68djx&VWcG%^(t*CIO&*blBU{m##|B5g--t@lLzy^0!=2PL5_~!V#Ber>We9y2a z_$7WTd%sY-VWWgOzN;Zv#XQ@!Api?lWN!*fsB^@Vw?c*`Z_)V4{$uV;;FdT_SjJ1v zy<*!JUkTigZ24^E-5nYag_97hGq4c^mWQBGafV}+Tkt)v{ZEvh5M5=_wF#nc!W3`s E0at*bfB*mh diff --git a/bundles/org.simantics.r.fileimport/bin/org/simantics/r/fileimport/RFileImport.class b/bundles/org.simantics.r.fileimport/bin/org/simantics/r/fileimport/RFileImport.class deleted file mode 100644 index a9919ae46db69997705144f853ba6d91beda63b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1433 zcmb_cTTc^F5dIDnwp~^(m5T~0c)=}~t{0GpHY5g%At|kC5qvY-awvzK?l!xp>d*4> zAo0N;;EyuS?zVJW#b{!awmWlXzWHY6JNx~|*KYteu%%&$VcGQ>mM@yNqeR`eJnKYA zE}AXZQ&we{p7+9M4GD&g{@7S#wF^+;zT5WdyqC$4epW1&j|$J<6kZ<`O4Yq`smd@> zJhR{0R$B>a?c1#!L#iqoj;-1rXV~mN%}1uRorYCao^TquUp?D|k<8bnaD>`s7&bG9 z42d20m?v?C?3JvS!~}y;Sr3>mn&imnn8H;JX@;2|pB-09URT0(d;`;%p&XxTO0Hao zxDq`xR=!+2qu@B9jwjRKL@ot}IRhgY4cZqDFSVOB?j6`QNiC;~ZrzrLwkHC+;~dS0 z-RKy`f`J>*sUvkNd$qlhH`Zyu5pE~}>!qzubMY3+ ztzaUyB*fbPz{wAE5a+U;({UH~HQZyEA8fR;Pdk;bNIA5gWjvtu)IDx19vv_g|D9fc zjW`t@8LVnpp$+vE(w&8YHLNq}?n$XFWwc21H{!Ttj-xHx0cvj2uUR9n}SZBG4iaEFZhh5jr90ACO>2LBbh_EM!!KCFple?Cj#px zT67kij;wsa{9uX^rWjEGZsHaNGTg=@0Y^NR!s;)`4p^pE*UoY09Oj3xQm=M81X_%O tIzSYTEQ0#M(?dKW5QfKiasj>(f@jGa#3Vjpb`WqTG7vHV delta 51 zcmca8b5Ul)4IW16$v=7IC;#9PnEZlAfKhO=B(FZB#pFs}`NqW#1Jw7 diff --git a/bundles/org.simantics.r.ontology/src/org/simantics/r/RResource.java b/bundles/org.simantics.r.ontology/src/org/simantics/r/RResource.java index 6401540..41664a8 100644 --- a/bundles/org.simantics.r.ontology/src/org/simantics/r/RResource.java +++ b/bundles/org.simantics.r.ontology/src/org/simantics/r/RResource.java @@ -1,112 +1,112 @@ -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() { - 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() { + 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; + } + +} + diff --git a/features/pom.xml b/features/pom.xml index 7eebcef..da6caad 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -15,36 +15,6 @@ - - org.eclipse.tycho.extras - tycho-source-feature-plugin - ${tycho.extras.version} - - - source-feature - package - - source-feature - - - - - - - - - - - - - - - - - - - - org.eclipse.tycho tycho-p2-plugin diff --git a/releng/org.simantics.r.build.targetdefinition/org.simantics.r.build.targetdefinition.target b/releng/org.simantics.r.build.targetdefinition/org.simantics.r.build.targetdefinition.target index a184f32..ee8583e 100644 --- a/releng/org.simantics.r.build.targetdefinition/org.simantics.r.build.targetdefinition.target +++ b/releng/org.simantics.r.build.targetdefinition/org.simantics.r.build.targetdefinition.target @@ -1,224 +1,332 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/org.simantics.r.build.targetdefinition/org.simantics.r.build.targetdefinition.tpd b/releng/org.simantics.r.build.targetdefinition/org.simantics.r.build.targetdefinition.tpd new file mode 100644 index 0000000..ad37f58 --- /dev/null +++ b/releng/org.simantics.r.build.targetdefinition/org.simantics.r.build.targetdefinition.tpd @@ -0,0 +1,5 @@ +target "Simupedia 1.31.0" + +with source allEnvironments + +include "http://www.simantics.org/download/master/simantics.tpd" diff --git a/releng/org.simantics.r.tycho.configuration/pom.xml b/releng/org.simantics.r.tycho.configuration/pom.xml index f8f1a62..96df243 100644 --- a/releng/org.simantics.r.tycho.configuration/pom.xml +++ b/releng/org.simantics.r.tycho.configuration/pom.xml @@ -8,8 +8,8 @@ pom - 0.26.0 - 0.26.0 + 1.0.0 + 1.0.0 UTF-8 @@ -45,11 +45,6 @@ - - linux - gtk - x86 - linux gtk -- 2.47.1