From 1f2634fd8522bb00406c5c24d879ad954881a8bf Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Sat, 29 Feb 2020 00:53:16 +0200 Subject: [PATCH] Mirrored CBI TPD tool and eclipse collections to simantics.org Also added a maven pom for running the tpd to target converter from command line at releng/org.simantics.sdk.build.targetdefinition/build. gitlab #486 Change-Id: Ic30c685556797249c28f50936727dccb58484bd9 --- .../org.simantics.sdk.build.p2.site/pom.xml | 17 ----- .../README.md | 13 +++- .../build/.gitignore | 2 + .../build/pom.xml | 69 +++++++++++++++++++ ...imantics.sdk.build.targetdefinition.target | 4 +- ...g.simantics.sdk.build.targetdefinition.tpd | 2 +- .../pom.xml | 2 +- .../simantics.target | 4 +- 8 files changed, 88 insertions(+), 25 deletions(-) create mode 100644 releng/org.simantics.sdk.build.targetdefinition/build/.gitignore create mode 100644 releng/org.simantics.sdk.build.targetdefinition/build/pom.xml diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml index 54628d58a..9c3e9fae3 100644 --- a/releng/org.simantics.sdk.build.p2.site/pom.xml +++ b/releng/org.simantics.sdk.build.p2.site/pom.xml @@ -34,7 +34,6 @@ 1.27.2 3.11.4 1.11 - 10.2.0 2.8.1 1.5.0 2.4.0 @@ -329,22 +328,6 @@ it.unimi.dsi:fastutil:${fastutil.version} true - - org.eclipse.collections:eclipse-collections-api:${eclipse.collections.version} - true - true - - org.eclipse.collections.* - - - - org.eclipse.collections:eclipse-collections:${eclipse.collections.version} - true - - org.eclipse.collections.eclipse-collections-api;bundle-version="${eclipse.collections.version}" - !org.eclipse.*,!sun.misc.*,*;resolution:=optional - - net.sf.trove4j:trove4j:${trove4j.version} true diff --git a/releng/org.simantics.sdk.build.targetdefinition/README.md b/releng/org.simantics.sdk.build.targetdefinition/README.md index f5b19fd73..4b1730d71 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/README.md +++ b/releng/org.simantics.sdk.build.targetdefinition/README.md @@ -3,7 +3,9 @@ Simantics 1.31.0 migrated to Eclipse 4.7 Oxygen platform. At the same time [Obeo's Target Platform Definition DSL and Generator tool](https://github.com/mbarbero/fr.obeo.releng.targetplatform) -was taken into use for target platform definition. +was taken into use for target platform definition. Later on the tool was moved to Eclipse +CBI (Common Build Infrastructure) as [Target Platform Definition DSL and Generator](https://github.com/eclipse-cbi/targetplatform-dsl) +which is what we are using right now. Please read the detailed installation and basic use instructions from the tool's website. @@ -47,4 +49,11 @@ This greatly simplifies target definition by removing duplication from the their publishing them online per platform branch is also highly useful. On the other hand legacy Buckminster builds can source `.target` files from a URL, which is why publishing them online -per platform branch is useful. \ No newline at end of file +per platform branch is useful. + +## Building .target files from the command line + +There is an example of how to do this with Maven at [build/pom.xml)(build/pom.xml). +Essentially it sources the TPD tool and its required Eclipse parts from public P2 +repositories and uses `tycho-eclipserun-plugin` to run the *tpd converter application* +to convert the `.tpd` file given as argument via `-Dtpd=tpd-path`. diff --git a/releng/org.simantics.sdk.build.targetdefinition/build/.gitignore b/releng/org.simantics.sdk.build.targetdefinition/build/.gitignore new file mode 100644 index 000000000..ebfaccf3c --- /dev/null +++ b/releng/org.simantics.sdk.build.targetdefinition/build/.gitignore @@ -0,0 +1,2 @@ +target +workspace \ No newline at end of file diff --git a/releng/org.simantics.sdk.build.targetdefinition/build/pom.xml b/releng/org.simantics.sdk.build.targetdefinition/build/pom.xml new file mode 100644 index 000000000..cc70d3556 --- /dev/null +++ b/releng/org.simantics.sdk.build.targetdefinition/build/pom.xml @@ -0,0 +1,69 @@ + + + 4.0.0 + + org.simantics + org.simantics.sdk.build.targetdefinition.build + 1.0.0-SNAPSHOT + pom + + + 1.5.0 + 1.5.0 + 2019-12 + http://www.simantics.org/update/${platform-version-name} + http://www.simantics.org/update/cbi/tpd/3.0.0-SNAPSHOT/ + org.eclipse.cbi.targetplatform.tpd.converter + org.eclipse.cbi.targetplatform-feature + + ../simantics.tpd + + + + + + org.eclipse.tycho.extras + tycho-eclipserun-plugin + ${tycho-extras-version} + + + + ${platform-version-name} + p2 + ${platform.repository.p2} + + + targetplatform + p2 + ${targetPlatform.repository.p2} + + + -consoleLog -application ${targetPlatform.application.name} ${tpd} + + + + ${targetPlatform.application.feature} + eclipse-feature + + + org.eclipse.equinox.p2.sdk + eclipse-feature + + + + + + + eclipse-run + + + validate + + + + + + + \ No newline at end of file diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target index 1c82f03d7..2386f897f 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target +++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target @@ -1,7 +1,7 @@ - + @@ -170,7 +170,7 @@ - + diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd index cdd287b66..8f52a3571 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd +++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd @@ -168,7 +168,7 @@ location "http://www.simantics.org/update/nebula/releases/2.2.0/incubation/" { org.eclipse.nebula.examples.incubation.feature.feature.group } -location "https://download.eclipse.org/collections/10.2.0/repository/" { +location "http://www.simantics.org/update/collections/10.2.0/repository/" { org.eclipse.collections.feature.feature.group org.eclipse.collections.feature.source.feature.group } diff --git a/releng/org.simantics.sdk.build.targetdefinition/pom.xml b/releng/org.simantics.sdk.build.targetdefinition/pom.xml index de8c9bb70..dddbfc2ea 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/pom.xml +++ b/releng/org.simantics.sdk.build.targetdefinition/pom.xml @@ -13,4 +13,4 @@ org.simantics.root.releng 1.0.0-SNAPSHOT - \ No newline at end of file + \ No newline at end of file diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target index 1e660204b..f06dc5e47 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target +++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target @@ -1,7 +1,7 @@ - + @@ -170,7 +170,7 @@ - + -- 2.47.1