Commit e8636f7f authored by Ferdie Reijnen's avatar Ferdie Reijnen
Browse files

Merge branch 'develop' into 227-allow-assigning-input-variables-via-SVG-integration

parents a3b4d3bd 78f59f43
Pipeline #1589 passed with stage
in 0 seconds
......@@ -13,6 +13,6 @@
<extension>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pomless</artifactId>
<version>2.3.0</version>
<version>2.5.0</version>
</extension>
</extensions>
......@@ -48,7 +48,7 @@
<type>10</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-products</arguments>
<arguments>1.0-name-matches-false-false-product</arguments>
</matcher>
</filter>
<filter>
......
......@@ -11,10 +11,10 @@ p2/orbit/p2.eclipse-plugin/com.ibm.icu/67.1.0.v20200706-1749, ICU AND Unicode-TO
p2/orbit/p2.eclipse-plugin/com.sun.jna.platform/5.8.0.v20210406-1004, Apache-2.0 OR LGPL-2.1-or-later, approved, CQ23218
p2/orbit/p2.eclipse-plugin/com.sun.jna/5.8.0.v20210503-0343, Apache-2.0 OR LGPL-2.1-or-later, approved, CQ23217
p2/orbit/p2.eclipse-plugin/io.github.java-diff-utils/4.8.0.v20201027-1614, Apache-2.0, approved, CQ22697
p2/orbit/p2.eclipse-plugin/javax.annotation/1.3.5.v20200909-1856, , approved, CQ22020
p2/orbit/p2.eclipse-plugin/javax.annotation/1.3.5.v20200909-1856, EPL-1.0, approved, orbit
p2/orbit/p2.eclipse-plugin/javax.inject/1.0.0.v20091030, Apache-2.0, approved, CQ3555
p2/orbit/p2.eclipse-plugin/org.apache.batik.anim/1.14.0.v20210324-0332, Apache-2.0, approved, #196
p2/orbit/p2.eclipse-plugin/org.apache.batik.awt.util/1.14.0.v20210324-0332, , approved, orbit
p2/orbit/p2.eclipse-plugin/org.apache.batik.awt.util/1.14.0.v20210324-0332, Apache-2.0, approved, orbit
p2/orbit/p2.eclipse-plugin/org.apache.batik.bridge/1.14.0.v20210324-0332, Apache-2.0, approved, #196
p2/orbit/p2.eclipse-plugin/org.apache.batik.constants/1.14.0.v20210324-0332, Apache-2.0, approved, #196
p2/orbit/p2.eclipse-plugin/org.apache.batik.css/1.14.0.v20210324-0332, Apache-2.0, approved, #196
......@@ -33,8 +33,8 @@ p2/orbit/p2.eclipse-plugin/org.apache.commons.jxpath/1.3.0.v200911051830, Apache
p2/orbit/p2.eclipse-plugin/org.apache.commons.lang/2.6.0.v201404270220, Apache-2.0, approved, CQ6183
p2/orbit/p2.eclipse-plugin/org.apache.commons.lang3/3.1.0.v201403281430, Apache-2.0, approved, CQ5902
p2/orbit/p2.eclipse-plugin/org.apache.commons.logging/1.2.0.v20180409-1502, Apache-2.0, approved, CQ10162
p2/orbit/p2.eclipse-plugin/org.apache.commons.math3/3.6.1.v20200817-1830, , approved, orbit
p2/orbit/p2.eclipse-plugin/org.apache.felix.scr/2.1.24.v20200924-1939, , approved, CQ22609
p2/orbit/p2.eclipse-plugin/org.apache.commons.math3/3.6.1.v20200817-1830, Apache-2.0, approved, orbit
p2/orbit/p2.eclipse-plugin/org.apache.felix.scr/2.1.24.v20200924-1939, Apache-2.0, approved, CQ22609
p2/orbit/p2.eclipse-plugin/org.apache.xalan/2.7.2.v20201124-1837, Apache-2.0, approved, CQ9587
p2/orbit/p2.eclipse-plugin/org.apache.xerces/2.12.1.v20210115-0812, Apache-2.0 AND W3C-19980720, approved, CQ16951
p2/orbit/p2.eclipse-plugin/org.apache.xml.resolver/1.2.0.v201005080400, Apache-2.0, approved, CQ1441
......@@ -81,43 +81,43 @@ p2/orbit/p2.eclipse-plugin/org.eclipse.e4.ui.workbench.renderers.swt/0.15.100.v2
p2/orbit/p2.eclipse-plugin/org.eclipse.e4.ui.workbench.swt/0.16.100.v20210315-1604, EPL-2.0, approved, eclipse.platform
p2/orbit/p2.eclipse-plugin/org.eclipse.e4.ui.workbench/1.13.0.v20210521-0741, EPL-2.0, approved, eclipse.platform
p2/orbit/p2.eclipse-plugin/org.eclipse.e4.ui.workbench3/0.15.500.v20201021-1339, EPL-2.0, approved, eclipse.platform
p2/orbit/p2.eclipse-plugin/org.eclipse.emf.common/2.22.0.v20210319-0732, EPL-2.0, approved, modeling.emf.emf
p2/orbit/p2.eclipse-plugin/org.eclipse.emf.ecore.change/2.14.0.v20190528-0725, EPL-2.0, approved, modeling.emf.emf
p2/orbit/p2.eclipse-plugin/org.eclipse.emf.ecore.xmi/2.16.0.v20190528-0725, EPL-2.0, approved, modeling.emf.emf
p2/orbit/p2.eclipse-plugin/org.eclipse.emf.ecore/2.24.0.v20210405-0628, EPL-2.0, approved, modeling.emf.emf
p2/orbit/p2.eclipse-plugin/org.eclipse.emf.edit/2.16.0.v20190920-0401, EPL-2.0, approved, modeling.emf.emf
p2/orbit/p2.eclipse-plugin/org.eclipse.emf.validation/1.8.0.202008210805, EPL-2.0, approved, modeling.emf.emf
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.app/1.5.100.v20210212-1143, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.bidi/1.3.100.v20210212-1143, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.common/3.15.0.v20210518-0604, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.event/1.6.0.v20210212-1143, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.frameworkadmin.equinox/1.2.0.v20210315-2042, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.frameworkadmin/2.2.0.v20210315-2042, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.launcher/1.6.200.v20210416-2027, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.artifact.repository/1.4.100.v20210418-1636, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.core/2.7.0.v20210315-2042, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.director.app/1.2.0.v20210315-2042, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.director/2.5.0.v20210325-0750, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.engine/2.7.0.v20210328-0514, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.garbagecollector/1.2.0.v20210316-1209, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.jarprocessor/1.2.0.v20210507-0825, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.metadata.repository/1.4.0.v20210315-2228, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.metadata/2.6.0.v20210331-1610, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.publisher.eclipse/1.4.0.v20210421-1159, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.publisher/1.6.0.v20210322-0909, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.repository.tools/2.3.0.v20210325-0750, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.repository/2.5.100.v20210329-1206, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.touchpoint.eclipse/2.3.0.v20210315-2228, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.preferences/3.8.200.v20210212-1143, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.registry/3.10.200.v20210503-1606, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.security/1.3.600.v20210126-1005, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.simpleconfigurator.manipulator/2.2.0.v20210315-2228, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.simpleconfigurator/1.4.0.v20210315-2228, EPL-2.0, approved, eclipse.equinox
p2/orbit/p2.eclipse-plugin/org.eclipse.emf.common/2.22.0.v20210319-0732, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.emf.ecore.change/2.14.0.v20190528-0725, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.emf.ecore.xmi/2.16.0.v20190528-0725, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.emf.ecore/2.24.0.v20210405-0628, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.emf.edit/2.16.0.v20190920-0401, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.emf.validation/1.8.0.202008210805, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.app/1.5.100.v20210212-1143, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.bidi/1.3.100.v20210212-1143, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.common/3.15.0.v20210518-0604, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.event/1.6.0.v20210212-1143, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.frameworkadmin.equinox/1.2.0.v20210315-2042, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.frameworkadmin/2.2.0.v20210315-2042, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.launcher/1.6.200.v20210416-2027, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.artifact.repository/1.4.100.v20210418-1636, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.core/2.7.0.v20210315-2042, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.director.app/1.2.0.v20210315-2042, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.director/2.5.0.v20210325-0750, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.engine/2.7.0.v20210328-0514, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.garbagecollector/1.2.0.v20210316-1209, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.jarprocessor/1.2.0.v20210507-0825, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.metadata.repository/1.4.0.v20210315-2228, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.metadata/2.6.0.v20210331-1610, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.publisher.eclipse/1.4.0.v20210421-1159, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.publisher/1.6.0.v20210322-0909, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.repository.tools/2.3.0.v20210325-0750, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.repository/2.5.100.v20210329-1206, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.p2.touchpoint.eclipse/2.3.0.v20210315-2228, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.preferences/3.8.200.v20210212-1143, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.registry/3.10.200.v20210503-1606, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.security/1.3.600.v20210126-1005, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.simpleconfigurator.manipulator/2.2.0.v20210315-2228, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.equinox.simpleconfigurator/1.4.0.v20210315-2228, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.help/3.9.0.v20210507-0822, EPL-2.0, approved, eclipse.platform
p2/orbit/p2.eclipse-plugin/org.eclipse.jdt.compiler.tool/1.2.1200.v20210521-0550, EPL-2.0, approved, eclipse.jdt
p2/orbit/p2.eclipse-plugin/org.eclipse.jdt.core/3.26.0.v20210609-0549, EPL-2.0, approved, eclipse.jdt
p2/orbit/p2.eclipse-plugin/org.eclipse.jdt.debug/3.17.200.v20210513-1223, EPL-2.0, approved, eclipse.jdt
p2/orbit/p2.eclipse-plugin/org.eclipse.jdt.launching/3.19.200.v20210326-1452, EPL-2.0, approved, eclipse.jdt
p2/orbit/p2.eclipse-plugin/org.eclipse.jdt.compiler.tool/1.2.1200.v20210521-0550, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.jdt.core/3.26.0.v20210609-0549, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.jdt.debug/3.17.200.v20210513-1223, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.jdt.launching/3.19.200.v20210326-1452, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.jface.databinding/1.12.200.v20210111-0911, EPL-2.0, approved, eclipse.platform
p2/orbit/p2.eclipse-plugin/org.eclipse.jface.notifications/0.3.0.v20210218-1820, EPL-2.0, approved, eclipse.platform
p2/orbit/p2.eclipse-plugin/org.eclipse.jface.text/3.18.0.v20210512-1640, EPL-2.0, approved, eclipse.platform
......@@ -127,8 +127,8 @@ p2/orbit/p2.eclipse-plugin/org.eclipse.ltk.ui.refactoring/3.11.400.v20210320-113
p2/orbit/p2.eclipse-plugin/org.eclipse.osgi.services/3.10.100.v20210324-0936, EPL-2.0, approved, eclipse.platform
p2/orbit/p2.eclipse-plugin/org.eclipse.osgi.util/3.6.0.v20210212-1137, EPL-2.0, approved, eclipse.platform
p2/orbit/p2.eclipse-plugin/org.eclipse.osgi/3.16.300.v20210525-1715, EPL-2.0, approved, eclipse.platform
p2/orbit/p2.eclipse-plugin/org.eclipse.pde.build/3.11.0.v20210429-0618, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.pde.core/3.14.300.v20210515-0638, , approved, eclipse
p2/orbit/p2.eclipse-plugin/org.eclipse.pde.build/3.11.0.v20210429-0618, EPL-2.0, approved, eclipse.pde
p2/orbit/p2.eclipse-plugin/org.eclipse.pde.core/3.14.300.v20210515-0638, EPL-2.0, approved, eclipse.pde
p2/orbit/p2.eclipse-plugin/org.eclipse.swt.cocoa.macosx.x86_64/3.116.100.v20210602-2209, EPL-2.0, approved, eclipse.platform
p2/orbit/p2.eclipse-plugin/org.eclipse.swt.gtk.linux.x86_64/3.116.100.v20210602-2209, EPL-2.0, approved, eclipse.platform
p2/orbit/p2.eclipse-plugin/org.eclipse.swt.win32.win32.x86_64/3.116.100.v20210602-2209, EPL-2.0, approved, eclipse.platform
......
......@@ -106,12 +106,12 @@ pipeline {
archiveArtifacts 'releng/org.eclipse.escet.releng.website/target/eclipse-escet-*-website.zip'
// Update site.
archiveArtifacts 'products/org.eclipse.escet.product/target/*-updatesite.zip'
archiveArtifacts 'product/org.eclipse.escet.product/target/*-updatesite.zip'
// Product.
archiveArtifacts 'products/org.eclipse.escet.product/target/products/*-linux*.tar.gz'
archiveArtifacts 'products/org.eclipse.escet.product/target/products/*-mac*.dmg'
archiveArtifacts 'products/org.eclipse.escet.product/target/products/*-win*.zip'
archiveArtifacts 'product/org.eclipse.escet.product/target/products/*-linux*.tar.gz'
archiveArtifacts 'product/org.eclipse.escet.product/target/products/*-mac*.dmg'
archiveArtifacts 'product/org.eclipse.escet.product/target/products/*-win*.zip'
// Code coverage.
archiveArtifacts 'releng/org.eclipse.escet.releng.tests/target/eclipse-escet-jacoco-aggregate.zip'
......@@ -133,7 +133,7 @@ pipeline {
// Deploy downloads.
sh '''
mkdir -p deploy/update-site/
unzip -q products/org.eclipse.escet.product/target/*-updatesite.zip -d deploy/update-site/
unzip -q product/org.eclipse.escet.product/target/*-updatesite.zip -d deploy/update-site/
'''
sshagent (['projects-storage.eclipse.org-bot-ssh']) {
// Remove any existing directory for this release.
......@@ -146,16 +146,16 @@ pipeline {
sh 'scp -r releng/org.eclipse.escet.releng.website/target/eclipse-escet-*-website.zip ${DOWNLOADS_URL}/${RELEASE_VERSION}/'
// Update site (archive).
sh 'scp -r products/org.eclipse.escet.product/target/*-updatesite.zip ${DOWNLOADS_URL}/${RELEASE_VERSION}/'
sh 'scp -r product/org.eclipse.escet.product/target/*-updatesite.zip ${DOWNLOADS_URL}/${RELEASE_VERSION}/'
// Update site (extracted).
sh 'ssh genie.escet@projects-storage.eclipse.org mkdir -p ${DOWNLOADS_PATH}/${RELEASE_VERSION}/update-site/'
sh 'scp -r deploy/update-site/* ${DOWNLOADS_URL}/${RELEASE_VERSION}/update-site/'
// Product.
sh 'scp -r products/org.eclipse.escet.product/target/products/*-linux*.tar.gz ${DOWNLOADS_URL}/${RELEASE_VERSION}/'
sh 'scp -r products/org.eclipse.escet.product/target/products/*-mac*.dmg ${DOWNLOADS_URL}/${RELEASE_VERSION}/'
sh 'scp -r products/org.eclipse.escet.product/target/products/*-win*.zip ${DOWNLOADS_URL}/${RELEASE_VERSION}/'
sh 'scp -r product/org.eclipse.escet.product/target/products/*-linux*.tar.gz ${DOWNLOADS_URL}/${RELEASE_VERSION}/'
sh 'scp -r product/org.eclipse.escet.product/target/products/*-mac*.dmg ${DOWNLOADS_URL}/${RELEASE_VERSION}/'
sh 'scp -r product/org.eclipse.escet.product/target/products/*-win*.zip ${DOWNLOADS_URL}/${RELEASE_VERSION}/'
}
// Deploy websites.
......@@ -166,7 +166,7 @@ pipeline {
rm -rf deploy/www/${RELEASE_VERSION}
mkdir -p deploy/www/${RELEASE_VERSION}
unzip -q releng/org.eclipse.escet.releng.website/target/eclipse-escet-*-website.zip -d deploy/www/${RELEASE_VERSION}/escet/
unzip -q releng/org.eclipse.escet.releng.website/target/eclipse-escet-*-website.zip -d deploy/www/${RELEASE_VERSION}/
'''
dir('deploy/www') {
sh '''
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
<stringAttribute key="M2_GOALS" value="clean package --projects releng/org.eclipse.escet.target,chi/org.eclipse.escet.chi.documentation,cif/org.eclipse.escet.cif.documentation,releng/org.eclipse.escet.releng.dev.documentation,releng/org.eclipse.escet.releng.project.documentation,tooldef/org.eclipse.escet.tooldef.documentation --also-make"/>
<stringAttribute key="M2_GOALS" value="clean package --projects releng/org.eclipse.escet.releng.target,chi/org.eclipse.escet.chi.documentation,cif/org.eclipse.escet.cif.documentation,releng/org.eclipse.escet.releng.dev.documentation,releng/org.eclipse.escet.releng.project.documentation,tooldef/org.eclipse.escet.tooldef.documentation --also-make"/>
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
<booleanAttribute key="M2_OFFLINE" value="false"/>
<stringAttribute key="M2_PROFILES" value=""/>
<listAttribute key="M2_PROPERTIES">
<listEntry value="tycho.pomless.aggregator.names=releng,chi,cif,common,setext,thirdparty,tooldef,products"/>
<listEntry value="tycho.pomless.aggregator.names=releng,chi,cif,common,setext,thirdparty,tooldef,product"/>
</listAttribute>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
......
......@@ -6,7 +6,7 @@
<booleanAttribute key="M2_OFFLINE" value="false"/>
<stringAttribute key="M2_PROFILES" value=""/>
<listAttribute key="M2_PROPERTIES">
<listEntry value="tycho.pomless.aggregator.names=releng,chi,cif,common,setext,thirdparty,tooldef,products"/>
<listEntry value="tycho.pomless.aggregator.names=releng,chi,cif,common,setext,thirdparty,tooldef,product"/>
</listAttribute>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.escet.chi.codegen.tests</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
</projectDescription>
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ESCET Chi Java Code Generator Tests (Incubation)
Bundle-SymbolicName: org.eclipse.escet.chi.codegen.tests;singleton:=true
Bundle-Version: 0.4.0.qualifier
Bundle-Vendor: Eclipse ESCET
Require-Bundle: org.junit;bundle-version="4.12.0",
org.eclipse.escet.chi.metamodel.java;bundle-version="0.4.0",
org.eclipse.escet.common.box;bundle-version="0.4.0",
org.eclipse.escet.common.java;bundle-version="0.4.0",
org.eclipse.escet.chi.typecheck;bundle-version="0.4.0",
org.eclipse.escet.common.position.metamodel;bundle-version="0.4.0",
org.eclipse.escet.chi.runtime;bundle-version="0.4.0",
org.eclipse.escet.common.position.common;bundle-version="0.4.0",
org.eclipse.escet.chi.codegen;bundle-version="0.4.0",
org.eclipse.escet.chi.metamodel;bundle-version="0.4.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: org.eclipse.escet.chi.codegen.tests
Export-Package: org.eclipse.escet.chi.codegen.statements.seq.tests;x-internal:=true
###############################################################################
# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
#
# This program and the accompanying materials are made available under the terms
# of the MIT License which is available at https://opensource.org/licenses/MIT
#
# SPDX-License-Identifier: MIT
###############################################################################
source.. = src/
output.. = target/classes
bin.includes = META-INF/,\
.
<?xml version="1.0" encoding="UTF-8"?>
<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
<local-check-config name="Eclipse ESCET Checkstyle" location="/org.eclipse.escet.configuration/checkstyle.xml" type="project" description="Eclipse ESCET Checkstyle.&#10;&#10;Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation&#10;&#10;See the NOTICE file(s) distributed with this work for additional&#10;information regarding copyright ownership.&#10;&#10;This program and the accompanying materials are made available under the terms&#10;of the MIT License which is available at https://opensource.org/licenses/MIT&#10;&#10;SPDX-License-Identifier: MIT">
<local-check-config name="Eclipse ESCET Checkstyle" location="/org.eclipse.escet.releng.configuration/checkstyle.xml" type="project" description="Eclipse ESCET Checkstyle.&#10;&#10;Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation&#10;&#10;See the NOTICE file(s) distributed with this work for additional&#10;information regarding copyright ownership.&#10;&#10;This program and the accompanying materials are made available under the terms&#10;of the MIT License which is available at https://opensource.org/licenses/MIT&#10;&#10;SPDX-License-Identifier: MIT">
<additional-data name="protect-config-file" value="false"/>
</local-check-config>
<fileset name="all" enabled="true" check-config-name="Eclipse ESCET Checkstyle" local="true">
<file-match-pattern match-pattern="." include-pattern="true"/>
<file-match-pattern match-pattern="src|asciidoc" include-pattern="true"/>
</fileset>
<filter name="NonSrcDirs" enabled="false"/>
</fileset-config>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="target/test-classes" path="src-test">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
......@@ -11,7 +11,7 @@
// SPDX-License-Identifier: MIT
//////////////////////////////////////////////////////////////////////////////
package org.eclipse.escet.chi.codegen.statements.seq.tests;
package org.eclipse.escet.chi.codegen.statements.seq;
import static org.eclipse.escet.chi.codegen.statements.seq.Seq.convertStatements;
import static org.eclipse.escet.common.java.Lists.listc;
......@@ -21,7 +21,6 @@ import java.util.List;
import org.eclipse.escet.chi.codegen.CodeGeneratorContext;
import org.eclipse.escet.chi.codegen.java.JavaClass;
import org.eclipse.escet.chi.codegen.statements.seq.Seq;
import org.eclipse.escet.chi.metamodel.chi.ChiFactory;
import org.eclipse.escet.chi.metamodel.chi.Statement;
import org.eclipse.escet.common.box.VBox;
......
......@@ -223,7 +223,6 @@ public abstract class TypeID {
* @param box Code box to store the assignment in.
* @param ctxt Code generation context.
* @param javaFile Java file used as target for the code generation.
*
*/
public void assignInitialValue(String name, Type tp, VBox box, CodeGeneratorContext ctxt, JavaFile javaFile) {
String line = fmt("%s = %s;", name, getEmptyValue(javaFile));
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/org.eclipse.escet.chi.codegen.tests"/>
<listEntry value="/org.eclipse.escet.chi.codegen"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.escet.chi.codegen.tests"/>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.escet.chi.codegen"/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.escet.chi.codegen.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.escet.chi.codegen"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
</launchConfiguration>
<?xml version="1.0" encoding="UTF-8"?>
<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
<local-check-config name="Eclipse ESCET Checkstyle" location="/org.eclipse.escet.configuration/checkstyle.xml" type="project" description="Eclipse ESCET Checkstyle.&#10;&#10;Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation&#10;&#10;See the NOTICE file(s) distributed with this work for additional&#10;information regarding copyright ownership.&#10;&#10;This program and the accompanying materials are made available under the terms&#10;of the MIT License which is available at https://opensource.org/licenses/MIT&#10;&#10;SPDX-License-Identifier: MIT">
<local-check-config name="Eclipse ESCET Checkstyle" location="/org.eclipse.escet.releng.configuration/checkstyle.xml" type="project" description="Eclipse ESCET Checkstyle.&#10;&#10;Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation&#10;&#10;See the NOTICE file(s) distributed with this work for additional&#10;information regarding copyright ownership.&#10;&#10;This program and the accompanying materials are made available under the terms&#10;of the MIT License which is available at https://opensource.org/licenses/MIT&#10;&#10;SPDX-License-Identifier: MIT">
<additional-data name="protect-config-file" value="false"/>
</local-check-config>
<fileset name="all" enabled="true" check-config-name="Eclipse ESCET Checkstyle" local="true">
<file-match-pattern match-pattern="." include-pattern="true"/>
<file-match-pattern match-pattern="src|asciidoc" include-pattern="true"/>
</fileset>
<filter name="NonSrcDirs" enabled="false"/>
</fileset-config>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
<local-check-config name="Eclipse ESCET Checkstyle" location="/org.eclipse.escet.configuration/checkstyle.xml" type="project" description="Eclipse ESCET Checkstyle.&#10;&#10;Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation&#10;&#10;See the NOTICE file(s) distributed with this work for additional&#10;information regarding copyright ownership.&#10;&#10;This program and the accompanying materials are made available under the terms&#10;of the MIT License which is available at https://opensource.org/licenses/MIT&#10;&#10;SPDX-License-Identifier: MIT">
<local-check-config name="Eclipse ESCET Checkstyle" location="/org.eclipse.escet.releng.configuration/checkstyle.xml" type="project" description="Eclipse ESCET Checkstyle.&#10;&#10;Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation&#10;&#10;See the NOTICE file(s) distributed with this work for additional&#10;information regarding copyright ownership.&#10;&#10;This program and the accompanying materials are made available under the terms&#10;of the MIT License which is available at https://opensource.org/licenses/MIT&#10;&#10;SPDX-License-Identifier: MIT">
<additional-data name="protect-config-file" value="false"/>
</local-check-config>
<fileset name="all" enabled="true" check-config-name="Eclipse ESCET Checkstyle" local="true">
<file-match-pattern match-pattern="." include-pattern="true"/>
<file-match-pattern match-pattern="src|asciidoc" include-pattern="true"/>
</fileset>
<filter name="NonSrcDirs" enabled="false"/>
</fileset-config>
......@@ -15,8 +15,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
</projectDescription>
/////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
//
// See the NOTICE file(s) distributed with this work for additional
// information regarding copyright ownership.
//
// This program and the accompanying materials are made available under the terms
// of the MIT License which is available at https://opensource.org/licenses/MIT
// This program and the accompanying materials are made available
// under the terms of the MIT License which is available at
// https://opensource.org/licenses/MIT
//
// SPDX-License-Identifier: MIT
/////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
// Common attributes to set for all documents within this directory.
......
Markdown is supported
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