diff options
100 files changed, 467 insertions, 2410 deletions
diff --git a/build.gradle b/build.gradle index ad62af5de..b52ba603f 100644 --- a/build.gradle +++ b/build.gradle @@ -3,10 +3,6 @@ ext { core_resources_version = '3.11.1' xtext_version = '2.12.0' commons_io_version = '2.5' - - etUnitConverter = "$rootDir/plugins/org.eclipse.etrice.etunit.converter/etUnitConverter.gradle" - etGenerator = "$rootDir/plugins/org.eclipse.etrice.generator/etGenerator.gradle" - etTest = "$rootDir/tests/org.eclipse.etrice.generator.common.tests/etTest.gradle" } allprojects { diff --git a/features/org.eclipse.etrice.feature/build_local.xml b/features/org.eclipse.etrice.feature/build_local.xml deleted file mode 100644 index 6d1758762..000000000 --- a/features/org.eclipse.etrice.feature/build_local.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Prerequiste: Install org.eclipse.license - http://download.eclipse.org/cbi/updates/license ---> -<project default="export" basedir="." name="org.eclipse.etrice.feature"> - <target name="export"> - <delete dir="./export" quiet="true" /> - <mkdir dir="./export" /> - <!-- is asynchronous and requires eclipse UI, thus cannot be integrated in other ant jobs (https://bugs.eclipse.org/bugs/show_bug.cgi?id=58413) --> - <pde.exportFeatures destination="./export" useworkspacecompiledclasses="true" exportSource="false" exportType="directory" features="org.eclipse.etrice.feature" useJARFormat="true" /> - </target> -</project> diff --git a/features/org.eclipse.etrice.feature/org.eclipse.etrice.feature build_local.xml.launch b/features/org.eclipse.etrice.feature/org.eclipse.etrice.feature build_local.xml.launch deleted file mode 100644 index d8fbfae19..000000000 --- a/features/org.eclipse.etrice.feature/org.eclipse.etrice.feature build_local.xml.launch +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType"> -<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.etrice.feature/build_local.xml"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> -<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.feature"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.etrice.feature/build_local.xml}"/> -<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> -</launchConfiguration> diff --git a/features/pom.xml b/features/pom.xml index 70f4af747..01951fa06 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -6,11 +6,10 @@ <parent> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../releng/org.eclipse.etrice.parent</relativePath> </parent> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.features</artifactId> - <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> </project>
\ No newline at end of file diff --git a/plugins/org.eclipse.etrice.generator/etGenerator.gradle b/gradle/etGenerator.gradle index 399088d2f..399088d2f 100644 --- a/plugins/org.eclipse.etrice.generator/etGenerator.gradle +++ b/gradle/etGenerator.gradle diff --git a/tests/org.eclipse.etrice.generator.common.tests/etTest.gradle b/gradle/etTest.gradle index 544b6f8f0..2112b083f 100644 --- a/tests/org.eclipse.etrice.generator.common.tests/etTest.gradle +++ b/gradle/etTest.gradle @@ -1,7 +1,7 @@ import static org.apache.tools.ant.taskdefs.condition.Os.* -apply from: etGenerator -apply from: etUnitConverter +apply from: "$rootDir/gradle/etGenerator.gradle" +apply from: "$rootDir/gradle/etUnitConverter.gradle" def outputDir = 'log' def srcGenDir = 'src-gen' diff --git a/plugins/org.eclipse.etrice.etunit.converter/etUnitConverter.gradle b/gradle/etUnitConverter.gradle index 0c38bedbc..cd1369bde 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/etUnitConverter.gradle +++ b/gradle/etUnitConverter.gradle @@ -18,7 +18,5 @@ ext.createEtUnitConverterTask = { name, etuFiles, options = [] -> args etuFiles inputs.files etuFiles outputs.files xmlFiles - inputs.files.each { println it } - outputs.files.each { println it } } }
\ No newline at end of file diff --git a/gradle/publish.gradle b/gradle/publish.gradle new file mode 100644 index 000000000..1bcf65198 --- /dev/null +++ b/gradle/publish.gradle @@ -0,0 +1,27 @@ +apply plugin: 'maven-publish' + +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } + repositories { + maven { + name 'snapshots' + url 'https://repo.eclipse.org/content/repositories/etrice-snapshots' + credentials { + username project.properties.eclipseRepoUsername + password project.properties.eclipseRepoPassword + } + } + maven { + name 'releases' + url 'https://repo.eclipse.org/content/repositories/etrice-releases' + credentials { + username project.properties.eclipseRepoUsername + password project.properties.eclipseRepoPassword + } + } + } +}
\ No newline at end of file diff --git a/plugins/build.gradle b/plugins/build.gradle deleted file mode 100644 index 8eea3b54b..000000000 --- a/plugins/build.gradle +++ /dev/null @@ -1,29 +0,0 @@ -subprojects { - apply plugin: 'maven-publish' - - publishing { - publications { - mavenJava(MavenPublication) { - from components.java - } - } - repositories { - maven { - name 'snapshots' - url 'https://repo.eclipse.org/content/repositories/etrice-snapshots' - credentials { - username project.properties.eclipseRepoUsername - password project.properties.eclipseRepoPassword - } - } - maven { - name 'releases' - url 'https://repo.eclipse.org/content/repositories/etrice-releases' - credentials { - username project.properties.eclipseRepoUsername - password project.properties.eclipseRepoPassword - } - } - } - } -}
\ No newline at end of file diff --git a/plugins/org.eclipse.etrice.etunit.converter/buildEtUnitConverter.xml b/plugins/org.eclipse.etrice.etunit.converter/buildEtUnitConverter.xml deleted file mode 100644 index 08a01f0f5..000000000 --- a/plugins/org.eclipse.etrice.etunit.converter/buildEtUnitConverter.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<project default="create_run_jar" name="Create Runnable Jar for Project org.eclipse.etrice.etunit.converter"> - <!--this file was created by Eclipse Runnable JAR Export Wizard--> - <!--ANT 1.7 is required --> - <target name="create_run_jar"> - <jar destfile="C:/entw/projekte/eTrice/repositories/org.eclipse.etrice/plugins/org.eclipse.etrice.etunit.converter/release/etunit.converter.jar" filesetmanifest="mergewithoutmain"> - <manifest> - <attribute name="Main-Class" value="org.eclipse.etrice.etunit.converter.EtUnitReportConverter"/> - <attribute name="Class-Path" value="."/> - </manifest> - <fileset dir="C:/entw/projekte/eTrice/repositories/org.eclipse.etrice/plugins/org.eclipse.etrice.etunit.converter/bin"/> - <zipfileset excludes="META-INF/*.SF" src="C:/entw/eclipse/eclipse-modeling-kepler-R-win32/eclipse/plugins/org.eclipse.core.runtime_3.9.0.v20130326-1255.jar"/> - <zipfileset excludes="META-INF/*.SF" src="C:/entw/eclipse/eclipse-modeling-kepler-R-win32/eclipse/plugins/org.eclipse.osgi_3.9.1.v20130814-1242.jar"/> - <zipfileset excludes="META-INF/*.SF" src="C:/entw/eclipse/eclipse-modeling-kepler-R-win32/eclipse/plugins/org.eclipse.equinox.weaving.hook_1.0.200.I20130319-1000.jar"/> - <zipfileset excludes="META-INF/*.SF" src="C:/entw/eclipse/eclipse-modeling-kepler-R-win32/eclipse/plugins/org.eclipse.equinox.common_3.6.200.v20130402-1505.jar"/> - <zipfileset excludes="META-INF/*.SF" src="C:/entw/eclipse/eclipse-modeling-kepler-R-win32/eclipse/plugins/org.eclipse.core.jobs_3.5.300.v20130429-1813.jar"/> - <zipfileset excludes="META-INF/*.SF" src="C:/entw/eclipse/eclipse-modeling-kepler-R-win32/eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.5.200.v20130514-1256/runtime_registry_compatibility.jar"/> - <zipfileset excludes="META-INF/*.SF" src="C:/entw/eclipse/eclipse-modeling-kepler-R-win32/eclipse/plugins/org.eclipse.equinox.registry_3.5.301.v20130717-1549.jar"/> - <zipfileset excludes="META-INF/*.SF" src="C:/entw/eclipse/eclipse-modeling-kepler-R-win32/eclipse/plugins/org.eclipse.equinox.preferences_3.5.100.v20130422-1538.jar"/> - <zipfileset excludes="META-INF/*.SF" src="C:/entw/eclipse/eclipse-modeling-kepler-R-win32/eclipse/plugins/org.eclipse.core.contenttype_3.4.200.v20130326-1255.jar"/> - <zipfileset excludes="META-INF/*.SF" src="C:/entw/eclipse/eclipse-modeling-kepler-R-win32/eclipse/plugins/org.eclipse.equinox.app_1.3.100.v20130327-1442.jar"/> - <zipfileset excludes="META-INF/*.SF" src="C:/entw/eclipse/eclipse-modeling-kepler-R-win32/eclipse/plugins/org.eclipse.emf.ecore_2.9.1.v20130827-0309.jar"/> - <zipfileset excludes="META-INF/*.SF" src="C:/entw/eclipse/eclipse-modeling-kepler-R-win32/eclipse/plugins/org.eclipse.emf.common_2.9.1.v20130827-0309.jar"/> - <zipfileset excludes="META-INF/*.SF" src="C:/entw/eclipse/eclipse-modeling-kepler-R-win32/eclipse/plugins/org.eclipse.emf.ecore.xmi_2.9.1.v20130827-0309.jar"/> - </jar> - </target> -</project> diff --git a/plugins/org.eclipse.etrice.generator.c/export_c_generator.launch b/plugins/org.eclipse.etrice.generator.c/export_c_generator.launch deleted file mode 100644 index 682c81bc4..000000000 --- a/plugins/org.eclipse.etrice.generator.c/export_c_generator.launch +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType"> -<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.etrice.generator.c/export_c_generator.xml"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> -<mapAttribute key="org.eclipse.debug.core.environmentVariables"> -<mapEntry key="ANT_HOME" value="C:\Users\hrentz\.p2\pool\plugins\org.apache.ant_1.9.6.v201510161327"/> -<mapEntry key="ECLIPSE_HOME" value="${target_platform_plugin_location:org.eclipse.xtext}/../.."/> -<mapEntry key="REPO_LOC" value="${git_work_tree}"/> -<mapEntry key="ZIP_DESTINATION" value="${workspace_loc}/../../deliveries"/> -</mapAttribute> -<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.generator.c"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.etrice.generator.c/export_c_generator.xml}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.etrice.generator.c}"/> -<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> -</launchConfiguration> diff --git a/plugins/org.eclipse.etrice.generator.c/export_c_generator.xml b/plugins/org.eclipse.etrice.generator.c/export_c_generator.xml deleted file mode 100644 index 8fda95f52..000000000 --- a/plugins/org.eclipse.etrice.generator.c/export_c_generator.xml +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<project default="create_run_jar" name="Create Runnable Jar for Project org.eclipse.etrice.generator.c with libraries in sub-folder"> - - <!-- - don't forget to add - <zip destfile="${zip_destination}/eTrice-C-generator.zip" basedir="${export_destination}" /> - as last command - - <copy failonerror="false" file=" - --> - - <property environment="env"/> - <property name="zip_destination" location="${env.ZIP_DESTINATION}"/> - <property name="eclipse_home" location="${env.ECLIPSE_HOME}"/> - <property name="repo_loc" location="${env.REPO_LOC}"/> - - <property name="export_destination" location="${zip_destination}/C-generator"/> - - <target name="testProps"> - <echo message="zip_destination = ${zip_destination}"/> - <echo message="export_destination = ${export_destination}"/> - <echo message="eclipse_home = ${eclipse_home}"/> - <echo message="repo_loc = ${repo_loc}"/> - </target> - - <!--this file was created by Eclipse Runnable JAR Export Wizard--> - <!--ANT 1.7 is required --> - <!--define folder properties--> - <target name="create_run_jar"> - <jar destfile="${export_destination}/CGenerator.jar"> - <manifest> - <attribute name="Main-Class" value="org.eclipse.etrice.generator.c.Main"/> - <attribute name="Class-Path" value=". CGenerator_lib/org.eclipse.xtext_2.10.0.v201605250459.jar CGenerator_lib/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar CGenerator_lib/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar CGenerator_lib/org.eclipse.emf.common_2.12.0.v20160420-0247.jar CGenerator_lib/org.antlr.runtime_3.2.0.v201101311130.jar CGenerator_lib/com.google.inject_3.0.0.v201605172100.jar CGenerator_lib/org.eclipse.emf.mwe.core_1.3.20.v201605261103.jar CGenerator_lib/org.apache.commons.cli_1.2.0.v201404270220.jar CGenerator_lib/org.eclipse.emf.mwe2.runtime_2.9.0.v201605261103.jar CGenerator_lib/org.eclipse.emf.mwe.utils_1.3.20.v201605261103.jar CGenerator_lib/org.eclipse.xtext.util_2.10.0.v201605250459.jar CGenerator_lib/com.google.guava_15.0.0.v201403281430.jar CGenerator_lib/javax.inject_1.0.0.v20091030.jar CGenerator_lib/org.eclipse.xtext.xbase_2.10.0.v201605250459.jar CGenerator_lib/org.eclipse.xtext.common.types_2.10.0.v201605250459.jar CGenerator_lib/org.eclipse.xtend.lib_2.10.0.v201605250459.jar CGenerator_lib/org.eclipse.xtext.xbase.lib_2.10.0.v201605250459.jar CGenerator_lib/org.eclipse.xtend.lib.macro_2.10.0.v201605250459.jar CGenerator_lib/org.eclipse.xtext.generator_2.10.0.v201605250459.jar CGenerator_lib/org.eclipse.xtext.xtext.generator_2.10.0.v201605250459.jar CGenerator_lib/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar CGenerator_lib/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar CGenerator_lib/org.eclipse.xtend_2.2.0.v201605260315.jar CGenerator_lib/com.ibm.icu_56.1.0.v201601250100.jar CGenerator_lib/org.eclipse.xpand_2.2.0.v201605260315.jar CGenerator_lib/org.eclipse.xtend.typesystem.emf_2.2.0.v201605260315.jar CGenerator_lib/org.eclipse.emf.mwe2.lib_2.9.0.v201605261103.jar CGenerator_lib/org.apache.commons.logging_1.1.1.v201101211721.jar CGenerator_lib/org.eclipse.emf.mwe2.launch_2.9.0.v201605261103.jar CGenerator_lib/org.eclipse.emf.mwe2.language_2.9.0.v201605261103.jar CGenerator_lib/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar CGenerator_lib/org.eclipse.osgi_3.11.2.v20161107-1947.jar CGenerator_lib/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar CGenerator_lib/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar CGenerator_lib/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar CGenerator_lib/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar CGenerator_lib/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar CGenerator_lib/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar CGenerator_lib/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar CGenerator_lib/org.eclipse.core.resources_3.11.1.v20161107-2032.jar CGenerator_lib/org.apache.log4j_1.2.15.v201012070815.jar CGenerator_lib/org.objectweb.asm_5.0.1.v201404251740.jar CGenerator_lib/org.eclipse.emf_2.6.0.v20160526-0356.jar CGenerator_lib/org.apache.commons.io_2.2.0.v201405211200.jar CGenerator_lib/org.eclipse.ui_3.108.1.v20160929-1045.jar CGenerator_lib/org.eclipse.swt_3.105.2.v20161122-0613.jar CGenerator_lib/org.eclipse.jface_3.12.1.v20160923-1528.jar CGenerator_lib/org.eclipse.core.commands_3.8.0.v20160316-1921.jar CGenerator_lib/org.eclipse.ui.workbench_3.108.2.v20161025-2029.jar CGenerator_lib/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar CGenerator_lib/org.eclipse.ui.ide_3.12.2.v20161115-1450.jar CGenerator_lib/org.eclipse.ui.views_3.8.101.v20160816-1954.jar"/> - </manifest> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.genmodel/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.common/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.fsm/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.room/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.genmodel.fsm/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.etphys/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.etmap/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.generator.fsm/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.generator/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.generator.config/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.config/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.generator.doc/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.generator.gnuplot/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.generator.java/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.abstractexec.behavior/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.generator.c/bin"/> - </jar> - <delete dir="${export_destination}/CGenerator_lib"/> - <mkdir dir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext_2.10.0.v201605250459.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.antlr.runtime_3.2.0.v201101311130.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/com.google.inject_3.0.0.v201605172100.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.mwe.core_1.3.20.v201605261103.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.apache.commons.cli_1.2.0.v201404270220.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.runtime_2.9.0.v201605261103.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.mwe.utils_1.3.20.v201605261103.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext.util_2.10.0.v201605250459.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/com.google.guava_15.0.0.v201403281430.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/javax.inject_1.0.0.v20091030.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext.xbase_2.10.0.v201605250459.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext.common.types_2.10.0.v201605250459.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtend.lib_2.10.0.v201605250459.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext.xbase.lib_2.10.0.v201605250459.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtend.lib.macro_2.10.0.v201605250459.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext.generator_2.10.0.v201605250459.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext.xtext.generator_2.10.0.v201605250459.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtend_2.2.0.v201605260315.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/com.ibm.icu_56.1.0.v201601250100.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xpand_2.2.0.v201605260315.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtend.typesystem.emf_2.2.0.v201605260315.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.lib_2.9.0.v201605261103.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.launch_2.9.0.v201605261103.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.language_2.9.0.v201605261103.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.osgi_3.11.2.v20161107-1947.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.apache.log4j_1.2.15.v201012070815.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.objectweb.asm_5.0.1.v201404251740.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf_2.6.0.v20160526-0356.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.apache.commons.io_2.2.0.v201405211200.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.ui_3.108.1.v20160929-1045.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.swt_3.105.2.v20161122-0613.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.jface_3.12.1.v20160923-1528.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.core.commands_3.8.0.v20160316-1921.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.ui.workbench_3.108.2.v20161025-2029.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.ui.ide_3.12.2.v20161115-1450.jar" todir="${export_destination}/CGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.ui.views_3.8.101.v20160816-1954.jar" todir="${export_destination}/CGenerator_lib"/> - - <zip destfile="${zip_destination}/eTrice-C-generator.zip" basedir="${export_destination}" /> - </target> -</project> diff --git a/plugins/org.eclipse.etrice.generator.c/launch standalone C-generator on modellib.launch b/plugins/org.eclipse.etrice.generator.c/launch standalone C-generator on modellib.launch deleted file mode 100644 index 4e4d32119..000000000 --- a/plugins/org.eclipse.etrice.generator.c/launch standalone C-generator on modellib.launch +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType"> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${ee_home:JavaSE-1.7}/bin/java.exe"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-jar ../../../../../deliveries/C-generator/org.eclipse.etrice.generator.c.jar ${workspace_loc:org.eclipse.etrice.modellib.c}/model/TimingService.room ${workspace_loc:org.eclipse.etrice.modellib.c}/model/TcpService.room -lib"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.etrice.modellib.c}"/> -</launchConfiguration> diff --git a/plugins/org.eclipse.etrice.generator.cpp/export_cpp_generator.launch b/plugins/org.eclipse.etrice.generator.cpp/export_cpp_generator.launch deleted file mode 100644 index 8b56bff81..000000000 --- a/plugins/org.eclipse.etrice.generator.cpp/export_cpp_generator.launch +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType"> -<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.etrice.generator.cpp/export_cpp_generator.xml"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> -<mapAttribute key="org.eclipse.debug.core.environmentVariables"> -<mapEntry key="ANT_HOME" value="C:\Users\hrentz\.p2\pool\plugins\org.apache.ant_1.9.6.v201510161327"/> -<mapEntry key="ECLIPSE_HOME" value="${target_platform_plugin_location:org.eclipse.xtext}/../.."/> -<mapEntry key="REPO_LOC" value="${git_work_tree}"/> -<mapEntry key="ZIP_DESTINATION" value="${workspace_loc}/../../deliveries"/> -</mapAttribute> -<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.generator.cpp"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.etrice.generator.cpp/export_cpp_generator.xml}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.etrice.generator.cpp}"/> -<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> -</launchConfiguration> diff --git a/plugins/org.eclipse.etrice.generator.cpp/export_cpp_generator.xml b/plugins/org.eclipse.etrice.generator.cpp/export_cpp_generator.xml deleted file mode 100644 index ca070d72c..000000000 --- a/plugins/org.eclipse.etrice.generator.cpp/export_cpp_generator.xml +++ /dev/null @@ -1,105 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<project default="create_run_jar" name="Create Runnable Jar for Project org.eclipse.etrice.generator.cpp with libraries in sub-folder"> - - <!-- - don't forget to add - <zip destfile="${zip_destination}/eTrice-CPP-generator.zip" basedir="${export_destination}" /> - as last command - - <copy failonerror="false" file=" - --> - - <property environment="env"/> - <property name="zip_destination" location="${env.ZIP_DESTINATION}"/> - <property name="eclipse_home" location="${env.ECLIPSE_HOME}"/> - <property name="repo_loc" location="${env.REPO_LOC}"/> - - <property name="export_destination" location="${zip_destination}/CPP-generator"/> - - <target name="testProps"> - <echo message="zip_destination = ${zip_destination}"/> - <echo message="export_destination = ${export_destination}"/> - <echo message="eclipse_home = ${eclipse_home}"/> - <echo message="repo_loc = ${repo_loc}"/> - </target> - - <!--this file was created by Eclipse Runnable JAR Export Wizard--> - <!--ANT 1.7 is required --> - <!--define folder properties--> - <target name="create_run_jar"> - <jar destfile="${export_destination}/CPPGenerator.jar"> - <manifest> - <attribute name="Main-Class" value="org.eclipse.etrice.generator.cpp.Main"/> - <attribute name="Class-Path" value=". CPPGenerator_lib/org.eclipse.xtext_2.10.0.v201605250459.jar CPPGenerator_lib/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar CPPGenerator_lib/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar CPPGenerator_lib/org.eclipse.emf.common_2.12.0.v20160420-0247.jar CPPGenerator_lib/org.antlr.runtime_3.2.0.v201101311130.jar CPPGenerator_lib/com.google.inject_3.0.0.v201605172100.jar CPPGenerator_lib/org.eclipse.emf.mwe.core_1.3.20.v201605261103.jar CPPGenerator_lib/org.apache.commons.cli_1.2.0.v201404270220.jar CPPGenerator_lib/org.eclipse.emf.mwe2.runtime_2.9.0.v201605261103.jar CPPGenerator_lib/org.eclipse.emf.mwe.utils_1.3.20.v201605261103.jar CPPGenerator_lib/org.eclipse.xtext.util_2.10.0.v201605250459.jar CPPGenerator_lib/com.google.guava_15.0.0.v201403281430.jar CPPGenerator_lib/javax.inject_1.0.0.v20091030.jar CPPGenerator_lib/org.eclipse.xtext.xbase_2.10.0.v201605250459.jar CPPGenerator_lib/org.eclipse.xtext.common.types_2.10.0.v201605250459.jar CPPGenerator_lib/org.eclipse.xtend.lib_2.10.0.v201605250459.jar CPPGenerator_lib/org.eclipse.xtext.xbase.lib_2.10.0.v201605250459.jar CPPGenerator_lib/org.eclipse.xtend.lib.macro_2.10.0.v201605250459.jar CPPGenerator_lib/org.eclipse.xtext.generator_2.10.0.v201605250459.jar CPPGenerator_lib/org.eclipse.xtext.xtext.generator_2.10.0.v201605250459.jar CPPGenerator_lib/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar CPPGenerator_lib/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar CPPGenerator_lib/org.eclipse.xtend_2.2.0.v201605260315.jar CPPGenerator_lib/com.ibm.icu_56.1.0.v201601250100.jar CPPGenerator_lib/org.eclipse.xpand_2.2.0.v201605260315.jar CPPGenerator_lib/org.eclipse.xtend.typesystem.emf_2.2.0.v201605260315.jar CPPGenerator_lib/org.eclipse.emf.mwe2.lib_2.9.0.v201605261103.jar CPPGenerator_lib/org.apache.commons.logging_1.1.1.v201101211721.jar CPPGenerator_lib/org.eclipse.emf.mwe2.launch_2.9.0.v201605261103.jar CPPGenerator_lib/org.eclipse.emf.mwe2.language_2.9.0.v201605261103.jar CPPGenerator_lib/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar CPPGenerator_lib/org.eclipse.osgi_3.11.2.v20161107-1947.jar CPPGenerator_lib/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar CPPGenerator_lib/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar CPPGenerator_lib/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar CPPGenerator_lib/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar CPPGenerator_lib/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar CPPGenerator_lib/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar CPPGenerator_lib/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar CPPGenerator_lib/org.eclipse.core.resources_3.11.1.v20161107-2032.jar CPPGenerator_lib/org.apache.log4j_1.2.15.v201012070815.jar CPPGenerator_lib/org.objectweb.asm_5.0.1.v201404251740.jar CPPGenerator_lib/org.eclipse.emf_2.6.0.v20160526-0356.jar CPPGenerator_lib/org.apache.commons.io_2.2.0.v201405211200.jar CPPGenerator_lib/org.eclipse.ui_3.108.1.v20160929-1045.jar CPPGenerator_lib/org.eclipse.swt_3.105.2.v20161122-0613.jar CPPGenerator_lib/org.eclipse.jface_3.12.1.v20160923-1528.jar CPPGenerator_lib/org.eclipse.core.commands_3.8.0.v20160316-1921.jar CPPGenerator_lib/org.eclipse.ui.workbench_3.108.2.v20161025-2029.jar CPPGenerator_lib/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar CPPGenerator_lib/org.eclipse.ui.ide_3.12.2.v20161115-1450.jar CPPGenerator_lib/org.eclipse.ui.views_3.8.101.v20160816-1954.jar"/> - </manifest> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.generator.cpp/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.genmodel/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.common/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.fsm/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.room/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.genmodel.fsm/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.etphys/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.etmap/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.generator.fsm/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.generator/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.generator.config/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.config/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.generator.doc/bin"/> - </jar> - <delete dir="${export_destination}/CPPGenerator_lib"/> - <mkdir dir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext_2.10.0.v201605250459.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.antlr.runtime_3.2.0.v201101311130.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/com.google.inject_3.0.0.v201605172100.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.mwe.core_1.3.20.v201605261103.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.apache.commons.cli_1.2.0.v201404270220.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.runtime_2.9.0.v201605261103.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.mwe.utils_1.3.20.v201605261103.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext.util_2.10.0.v201605250459.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/com.google.guava_15.0.0.v201403281430.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/javax.inject_1.0.0.v20091030.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext.xbase_2.10.0.v201605250459.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext.common.types_2.10.0.v201605250459.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtend.lib_2.10.0.v201605250459.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext.xbase.lib_2.10.0.v201605250459.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtend.lib.macro_2.10.0.v201605250459.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext.generator_2.10.0.v201605250459.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext.xtext.generator_2.10.0.v201605250459.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtend_2.2.0.v201605260315.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/com.ibm.icu_56.1.0.v201601250100.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xpand_2.2.0.v201605260315.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtend.typesystem.emf_2.2.0.v201605260315.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.lib_2.9.0.v201605261103.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.launch_2.9.0.v201605261103.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.language_2.9.0.v201605261103.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.osgi_3.11.2.v20161107-1947.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.apache.log4j_1.2.15.v201012070815.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.objectweb.asm_5.0.1.v201404251740.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf_2.6.0.v20160526-0356.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.apache.commons.io_2.2.0.v201405211200.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.ui_3.108.1.v20160929-1045.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.swt_3.105.2.v20161122-0613.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.jface_3.12.1.v20160923-1528.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.core.commands_3.8.0.v20160316-1921.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.ui.workbench_3.108.2.v20161025-2029.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.ui.ide_3.12.2.v20161115-1450.jar" todir="${export_destination}/CPPGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.ui.views_3.8.101.v20160816-1954.jar" todir="${export_destination}/CPPGenerator_lib"/> - <zip destfile="${zip_destination}/eTrice-CPP-generator.zip" basedir="${export_destination}" /> - </target> -</project> diff --git a/plugins/org.eclipse.etrice.generator.cpp/launch standalone CPP-generator on modellib.launch b/plugins/org.eclipse.etrice.generator.cpp/launch standalone CPP-generator on modellib.launch deleted file mode 100644 index 891d8c8d3..000000000 --- a/plugins/org.eclipse.etrice.generator.cpp/launch standalone CPP-generator on modellib.launch +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType"> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${ee_home:JavaSE-1.7}/bin/java.exe"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-jar ../../../../../deliveries/CPP-generator/org.eclipse.etrice.generator.cpp.jar ${workspace_loc:org.eclipse.etrice.modellib.c}/model/TimingService.room ${workspace_loc:org.eclipse.etrice.modellib.c}/model/TcpService.room -lib"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.etrice.modellib.cpp}"/> -</launchConfiguration> diff --git a/plugins/org.eclipse.etrice.generator.gnuplot/launch standalone Java-generator on modellib.launch b/plugins/org.eclipse.etrice.generator.gnuplot/launch standalone Java-generator on modellib.launch deleted file mode 100644 index 2f5a00f4c..000000000 --- a/plugins/org.eclipse.etrice.generator.gnuplot/launch standalone Java-generator on modellib.launch +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType"> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${ee_home:JavaSE-1.7}/bin/java.exe"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-jar ../../../../../deliveries/Java-generator/org.eclipse.etrice.generator.java.jar ${workspace_loc:org.eclipse.etrice.modellib.java}/model/ALogService.room ${workspace_loc:org.eclipse.etrice.modellib.java}/model/TimingService.room ${workspace_loc:org.eclipse.etrice.modellib.java}/model/TcpService.room -lib -msc_instr"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.etrice.modellib.java}"/> -</launchConfiguration> diff --git a/plugins/org.eclipse.etrice.generator.java/export_java_generator.launch b/plugins/org.eclipse.etrice.generator.java/export_java_generator.launch deleted file mode 100644 index 40a551039..000000000 --- a/plugins/org.eclipse.etrice.generator.java/export_java_generator.launch +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType"> -<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.etrice.generator.java/export_java_generator.xml"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> -<mapAttribute key="org.eclipse.debug.core.environmentVariables"> -<mapEntry key="ANT_HOME" value="C:\Users\hrentz\.p2\pool\plugins\org.apache.ant_1.9.6.v201510161327"/> -<mapEntry key="ECLIPSE_HOME" value="${target_platform_plugin_location:org.eclipse.xtext}/../.."/> -<mapEntry key="REPO_LOC" value="${git_work_tree}"/> -<mapEntry key="ZIP_DESTINATION" value="${workspace_loc}/../../deliveries"/> -</mapAttribute> -<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.generator.java"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.etrice.generator.java/export_java_generator.xml}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.etrice.generator.java}"/> -<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> -</launchConfiguration> diff --git a/plugins/org.eclipse.etrice.generator.java/export_java_generator.xml b/plugins/org.eclipse.etrice.generator.java/export_java_generator.xml deleted file mode 100644 index cf80a1b26..000000000 --- a/plugins/org.eclipse.etrice.generator.java/export_java_generator.xml +++ /dev/null @@ -1,105 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<project default="create_run_jar" name="Create Runnable Jar for Project org.eclipse.etrice.generator.java with libraries in sub-folder"> - - <!-- - don't forget to add - <zip destfile="${zip_destination}/eTrice-Java-generator.zip" basedir="${export_destination}" /> - as last command - - <copy failonerror="false" file=" - --> - - <property environment="env"/> - <property name="zip_destination" location="${env.ZIP_DESTINATION}"/> - <property name="eclipse_home" location="${env.ECLIPSE_HOME}"/> - <property name="repo_loc" location="${env.REPO_LOC}"/> - - <property name="export_destination" location="${zip_destination}/Java-generator"/> - - <target name="testProps"> - <echo message="zip_destination = ${zip_destination}"/> - <echo message="eclipse_home = ${eclipse_home}"/> - <echo message="repo_loc = ${repo_loc}"/> - <echo message="export_destination = ${export_destination}"/> - </target> - - <!--this file was created by Eclipse Runnable JAR Export Wizard--> - <!--ANT 1.7 is required --> - <!--define folder properties--> - <target name="create_run_jar"> - <jar destfile="${export_destination}/JavaGenerator.jar"> - <manifest> - <attribute name="Main-Class" value="org.eclipse.etrice.generator.java.Main"/> - <attribute name="Class-Path" value=". JavaGenerator_lib/org.eclipse.xtext_2.10.0.v201605250459.jar JavaGenerator_lib/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar JavaGenerator_lib/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar JavaGenerator_lib/org.eclipse.emf.common_2.12.0.v20160420-0247.jar JavaGenerator_lib/org.antlr.runtime_3.2.0.v201101311130.jar JavaGenerator_lib/com.google.inject_3.0.0.v201605172100.jar JavaGenerator_lib/org.eclipse.emf.mwe.core_1.3.20.v201605261103.jar JavaGenerator_lib/org.apache.commons.cli_1.2.0.v201404270220.jar JavaGenerator_lib/org.eclipse.emf.mwe2.runtime_2.9.0.v201605261103.jar JavaGenerator_lib/org.eclipse.emf.mwe.utils_1.3.20.v201605261103.jar JavaGenerator_lib/org.eclipse.xtext.util_2.10.0.v201605250459.jar JavaGenerator_lib/com.google.guava_15.0.0.v201403281430.jar JavaGenerator_lib/javax.inject_1.0.0.v20091030.jar JavaGenerator_lib/org.eclipse.xtext.xbase_2.10.0.v201605250459.jar JavaGenerator_lib/org.eclipse.xtext.common.types_2.10.0.v201605250459.jar JavaGenerator_lib/org.eclipse.xtend.lib_2.10.0.v201605250459.jar JavaGenerator_lib/org.eclipse.xtext.xbase.lib_2.10.0.v201605250459.jar JavaGenerator_lib/org.eclipse.xtend.lib.macro_2.10.0.v201605250459.jar JavaGenerator_lib/org.eclipse.xtext.generator_2.10.0.v201605250459.jar JavaGenerator_lib/org.eclipse.xtext.xtext.generator_2.10.0.v201605250459.jar JavaGenerator_lib/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar JavaGenerator_lib/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar JavaGenerator_lib/org.eclipse.xtend_2.2.0.v201605260315.jar JavaGenerator_lib/com.ibm.icu_56.1.0.v201601250100.jar JavaGenerator_lib/org.eclipse.xpand_2.2.0.v201605260315.jar JavaGenerator_lib/org.eclipse.xtend.typesystem.emf_2.2.0.v201605260315.jar JavaGenerator_lib/org.eclipse.emf.mwe2.lib_2.9.0.v201605261103.jar JavaGenerator_lib/org.apache.commons.logging_1.1.1.v201101211721.jar JavaGenerator_lib/org.eclipse.emf.mwe2.launch_2.9.0.v201605261103.jar JavaGenerator_lib/org.eclipse.emf.mwe2.language_2.9.0.v201605261103.jar JavaGenerator_lib/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar JavaGenerator_lib/org.eclipse.osgi_3.11.2.v20161107-1947.jar JavaGenerator_lib/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar JavaGenerator_lib/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar JavaGenerator_lib/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar JavaGenerator_lib/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar JavaGenerator_lib/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar JavaGenerator_lib/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar JavaGenerator_lib/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar JavaGenerator_lib/org.eclipse.core.resources_3.11.1.v20161107-2032.jar JavaGenerator_lib/org.apache.log4j_1.2.15.v201012070815.jar JavaGenerator_lib/org.objectweb.asm_5.0.1.v201404251740.jar JavaGenerator_lib/org.eclipse.emf_2.6.0.v20160526-0356.jar JavaGenerator_lib/org.apache.commons.io_2.2.0.v201405211200.jar JavaGenerator_lib/org.eclipse.ui_3.108.1.v20160929-1045.jar JavaGenerator_lib/org.eclipse.swt_3.105.2.v20161122-0613.jar JavaGenerator_lib/org.eclipse.jface_3.12.1.v20160923-1528.jar JavaGenerator_lib/org.eclipse.core.commands_3.8.0.v20160316-1921.jar JavaGenerator_lib/org.eclipse.ui.workbench_3.108.2.v20161025-2029.jar JavaGenerator_lib/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar JavaGenerator_lib/org.eclipse.ui.ide_3.12.2.v20161115-1450.jar JavaGenerator_lib/org.eclipse.ui.views_3.8.101.v20160816-1954.jar"/> - </manifest> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.genmodel/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.common/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.fsm/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.room/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.genmodel.fsm/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.etphys/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.etmap/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.generator.fsm/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.generator/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.generator.config/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.core.config/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.generator.doc/bin"/> - <fileset dir="${repo_loc}/plugins/org.eclipse.etrice.generator.java/bin"/> - </jar> - <delete dir="${export_destination}/JavaGenerator_lib"/> - <mkdir dir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext_2.10.0.v201605250459.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.antlr.runtime_3.2.0.v201101311130.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/com.google.inject_3.0.0.v201605172100.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.mwe.core_1.3.20.v201605261103.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.apache.commons.cli_1.2.0.v201404270220.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.runtime_2.9.0.v201605261103.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.mwe.utils_1.3.20.v201605261103.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext.util_2.10.0.v201605250459.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/com.google.guava_15.0.0.v201403281430.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/javax.inject_1.0.0.v20091030.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext.xbase_2.10.0.v201605250459.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext.common.types_2.10.0.v201605250459.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtend.lib_2.10.0.v201605250459.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext.xbase.lib_2.10.0.v201605250459.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtend.lib.macro_2.10.0.v201605250459.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext.generator_2.10.0.v201605250459.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtext.xtext.generator_2.10.0.v201605250459.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtend_2.2.0.v201605260315.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/com.ibm.icu_56.1.0.v201601250100.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xpand_2.2.0.v201605260315.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.xtend.typesystem.emf_2.2.0.v201605260315.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.lib_2.9.0.v201605261103.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.launch_2.9.0.v201605261103.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.language_2.9.0.v201605261103.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.osgi_3.11.2.v20161107-1947.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.apache.log4j_1.2.15.v201012070815.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.objectweb.asm_5.0.1.v201404251740.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.emf_2.6.0.v20160526-0356.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.apache.commons.io_2.2.0.v201405211200.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.ui_3.108.1.v20160929-1045.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.swt_3.105.2.v20161122-0613.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.jface_3.12.1.v20160923-1528.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.core.commands_3.8.0.v20160316-1921.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.ui.workbench_3.108.2.v20161025-2029.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.ui.ide_3.12.2.v20161115-1450.jar" todir="${export_destination}/JavaGenerator_lib"/> - <copy failonerror="false" file="${eclipse_home}/plugins/org.eclipse.ui.views_3.8.101.v20160816-1954.jar" todir="${export_destination}/JavaGenerator_lib"/> - <zip destfile="${zip_destination}/eTrice-Java-generator.zip" basedir="${export_destination}" /> - </target> -</project> diff --git a/plugins/org.eclipse.etrice.ui.runtime/buckminster.cspex b/plugins/org.eclipse.etrice.ui.runtime/buckminster.cspex deleted file mode 100644 index ec40e4849..000000000 --- a/plugins/org.eclipse.etrice.ui.runtime/buckminster.cspex +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<cspecExtension - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" - xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"> - <dependencies> - <!-- Place your Dependencies here --> - </dependencies> - <generators> - <!-- Place your Generators here --> - </generators> - <artifacts> - <!-- Place your Artifacts here --> - </artifacts> - <actions> - <!-- Place your Actions here --> - <public name="create.contents" actor="ant"> - <actorProperties> - <property key="buildFile" value="create_contents.xml"/> - <property key="targets" value="zip_all_projects"/> - </actorProperties> - <properties> - <property key="repo_loc" value="${WORKSPACE}/etrice_local_repo"/> - </properties> - </public> - </actions> - <groups> - <!-- Place your Groups here --> - </groups> - <alterDependencies> - <!-- Place your Dependency alterations here --> - </alterDependencies> - <alterArtifacts> - <!-- Place your Artifact alterations here --> - </alterArtifacts> - <alterActions> - <!-- Place your Action alterations here --> - </alterActions> - <alterGroups> - <!-- Place your Group alterations here --> - </alterGroups> -</cspecExtension> diff --git a/plugins/org.eclipse.etrice.ui.runtime/build.gradle b/plugins/org.eclipse.etrice.ui.runtime/build.gradle new file mode 100644 index 000000000..91ceac59a --- /dev/null +++ b/plugins/org.eclipse.etrice.ui.runtime/build.gradle @@ -0,0 +1,31 @@ +!!!! This script is currently not in use, see maven pom instead !!!! + +plugins { + id 'base' +} + +def projects = [ + 'org.eclipse.etrice.runtime.c': '../../runtime', + 'org.eclipse.etrice.modellib.c': '../../runtime', + 'org.eclipse.etrice.tutorials.c': '../../examples', + 'org.eclipse.etrice.examples.c': '../../examples', + 'org.eclipse.etrice.template.c': '../../examples', + + 'org.eclipse.etrice.runtime.cpp': '../../runtime', + 'org.eclipse.etrice.modellib.cpp': '../../runtime', + 'org.eclipse.etrice.tutorials.cpp': '../../examples', + 'org.eclipse.etrice.template.cpp': '../../examples', + + 'org.eclipse.etrice.runtime.java': '../../runtime', + 'org.eclipse.etrice.modellib.java': '../../runtime', + 'org.eclipse.etrice.tutorials.java': '../../examples', + 'org.eclipse.etrice.examples.java': '../../examples' +] + +projects.each { name, path -> + build.dependsOn tasks.create(name: "zip_$name", type: Zip) { + destinationDir = file('contents') + archiveName = "${name}.zip" + from "$path/$name" + } +}
\ No newline at end of file diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.c.zip Binary files differdeleted file mode 100644 index 3ecace8a9..000000000 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.c.zip +++ /dev/null diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.java.zip Binary files differdeleted file mode 100644 index acc143640..000000000 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.java.zip +++ /dev/null diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip Binary files differdeleted file mode 100644 index 01b556e8a..000000000 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip +++ /dev/null diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zip Binary files differdeleted file mode 100644 index cd2962219..000000000 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zip +++ /dev/null diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip Binary files differdeleted file mode 100644 index 5df63c0f7..000000000 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip +++ /dev/null diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip Binary files differdeleted file mode 100644 index 1914fe307..000000000 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip +++ /dev/null diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zip Binary files differdeleted file mode 100644 index 32cf6d8f7..000000000 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zip +++ /dev/null diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip Binary files differdeleted file mode 100644 index db59e9965..000000000 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip +++ /dev/null diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.c.zip Binary files differdeleted file mode 100644 index 24536ada3..000000000 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.c.zip +++ /dev/null diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.cpp.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.cpp.zip Binary files differdeleted file mode 100644 index 79db259db..000000000 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.cpp.zip +++ /dev/null diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip Binary files differdeleted file mode 100644 index 56e9239e0..000000000 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip +++ /dev/null diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.cpp.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.cpp.zip Binary files differdeleted file mode 100644 index bad2140fb..000000000 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.cpp.zip +++ /dev/null diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip Binary files differdeleted file mode 100644 index a86dfd48d..000000000 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip +++ /dev/null diff --git a/plugins/org.eclipse.etrice.ui.runtime/pom.xml b/plugins/org.eclipse.etrice.ui.runtime/pom.xml new file mode 100644 index 000000000..b4f90a7bf --- /dev/null +++ b/plugins/org.eclipse.etrice.ui.runtime/pom.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.etrice</groupId> + <artifactId>org.eclipse.etrice.parent</artifactId> + <version>1.1.1-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath> + </parent> + <groupId>org.eclipse.etrice</groupId> + <artifactId>org.eclipse.etrice.ui.runtime</artifactId> + <packaging>eclipse-plugin</packaging> + + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.8</version> + <executions> + <execution> + <phase>generate-resources</phase> + <configuration> + <tasks> + <ant antfile="create_contents.xml" target="zip_all_projects"/> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> diff --git a/plugins/pom.xml b/plugins/pom.xml index cd18cfb23..c76bced7b 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -6,11 +6,10 @@ <parent> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../releng/org.eclipse.etrice.parent</relativePath> </parent> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.plugins</artifactId> - <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> </project>
\ No newline at end of file @@ -7,13 +7,12 @@ <parent> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>releng/org.eclipse.etrice.parent</relativePath> </parent> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice</artifactId> - <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <modules> diff --git a/releng/org.eclipse.etrice.parent/pom.xml b/releng/org.eclipse.etrice.parent/pom.xml index 7b5e74df8..088c469c5 100644 --- a/releng/org.eclipse.etrice.parent/pom.xml +++ b/releng/org.eclipse.etrice.parent/pom.xml @@ -5,13 +5,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> <packaging>pom</packaging> <properties> <project.build.sourceEncoding>Cp1252</project.build.sourceEncoding> - <xtext.version>2.10.0</xtext.version> + <xtext.version>2.12.0</xtext.version> <tycho.version>1.0.0</tycho.version> <cbi.version>1.1.4</cbi.version> diff --git a/releng/org.eclipse.etrice.parent/pom_old.xml b/releng/org.eclipse.etrice.parent/pom_old.xml new file mode 100644 index 000000000..1eb825362 --- /dev/null +++ b/releng/org.eclipse.etrice.parent/pom_old.xml @@ -0,0 +1,344 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.eclipse.etrice</groupId> + <artifactId>java-generator</artifactId> + <version>1.1.1-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>eTrice Java generator</name> + + <description>code generator from ROOM (Real-Time Object Oriented Modeling) + models to the Java target language</description> + <url>http://eclipse.org/etrice</url> + <inceptionYear>2010</inceptionYear> + + <properties> + <project.build.sourceEncoding>Cp1252</project.build.sourceEncoding> + + <etrice.version>${project.version}</etrice.version> + + <tycho.version>0.19.0</tycho.version> + <tycho-extras.version>${tycho.version}</tycho-extras.version> + + <!-- eclipse version etrice is built against --> + <eclipse-repo.url>http://download.eclipse.org/releases/luna</eclipse-repo.url> + + <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository</orbit-site> + </properties> + + <organization> + <name>Protos Software GmbH</name> + <url>http://www.protos.de</url> + </organization> + + <licenses> + <license> + <name>Eclipse Public License - v 1.0</name> + <url>http://www.eclipse.org/legal/epl-v10.html</url> + </license> + </licenses> + + <issueManagement> + <system>Bugzilla</system> + <url>https://bugs.eclipse.org/bugs/enter_bug.cgi?product=eTrice</url> + </issueManagement> + + <ciManagement> + <system>Hudson</system> + <url>https://hudson.eclipse.org/etrice/job/etrice-maven3/</url> + </ciManagement> + + <scm> + <url>http://git.eclipse.org/c/etrice/org.eclipse.etrice.git/</url> + <connection>http://git.eclipse.org/gitroot/etrice/org.eclipse.etrice.git</connection> + <developerConnection>ssh://userid@git.eclipse.org/gitroot/etrice/org.eclipse.etrice.git</developerConnection> + </scm> + + <developers> + <developer> + <name>Thomas Schuetz</name> + </developer> + <developer> + <name>Henrik Rentz-Reichert</name> + </developer> + <developer> + <name>Thomas Jung</name> + </developer> + <developer> + <name>Juergen Haug</name> + </developer> + <developer> + <name>Eyrak Paen</name> + </developer> + <developer> + <name>Peter Karlitschek</name> + </developer> + </developers> + + <repositories> + <repository> + <id>eclipse</id> + <layout>p2</layout> + <url>${eclipse-repo.url}</url> + </repository> + <repository> + <id>orbit</id> + <layout>p2</layout> + <url>${orbit-site}</url> + </repository> + <repository> + <id>repository.jboss.org-public</id> + <name>JBoss.org Maven repository</name> + <url>https://repository.jboss.org/nexus/content/groups/public</url> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>repo.eclipse.org.cbi-releases</id> + <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url> + </pluginRepository> + </pluginRepositories> + + <modules> + <module>../../plugins/org.eclipse.etrice.core.common</module> + <module>../../plugins/org.eclipse.etrice.core.fsm</module> + <module>../../plugins/org.eclipse.etrice.core.room</module> + <module>../../plugins/org.eclipse.etrice.core.config</module> + <module>../../plugins/org.eclipse.etrice.core.etphys</module> + <module>../../plugins/org.eclipse.etrice.core.etmap</module> + <module>../../plugins/org.eclipse.etrice.core.genmodel.fsm</module> + <module>../../plugins/org.eclipse.etrice.core.genmodel</module> + <module>../../plugins/org.eclipse.etrice.generator.fsm</module> + <module>../../plugins/org.eclipse.etrice.generator</module> + <module>../../plugins/org.eclipse.etrice.generator.config</module> + <module>../../plugins/org.eclipse.etrice.generator.doc</module> + <module>../../plugins/org.eclipse.etrice.generator.java</module> + <module>../../plugins/org.eclipse.etrice.generator.java.mvn</module> + <module>../../runtime/org.eclipse.etrice.modellib.java</module> + <module>../../runtime/org.eclipse.etrice.runtime.java</module> + </modules> + + <profiles> + <profile> + <id>fast</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + </profile> + <profile> + <id>full</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>2.2.1</version> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.9.1</version> + <configuration> + <tags> + <tag> + <name>generated</name> + <placement>a</placement> + <head>Generated:</head> + </tag> + <tag> + <name>ordered</name> + <placement>X</placement> + <head>Ordered:</head> + </tag> + <tag> + <name>model</name> + <placement>X</placement> + <head>Model:</head> + </tag> + <tag> + <name>parameter</name> + <placement>X</placement> + <head>Parameter:</head> + </tag> + </tags> + </configuration> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tycho.version}</version> + <extensions>true</extensions> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho.version}</version> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-compiler-plugin</artifactId> + <version>${tycho.version}</version> + <configuration> + <excludeResources> + <!-- avoid error markers in the target folder by excluding ecore models --> + <excludeResource>**/*.ecore</excludeResource> + </excludeResources> + <compilerArguments> + <enableJavadoc /> + <encoding>ISO-8859-1</encoding> + </compilerArguments> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-packaging-plugin</artifactId> + <version>${tycho.version}</version> + <dependencies> + <dependency> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-buildtimestamp-jgit</artifactId> + <version>${tycho-extras.version}</version> + </dependency> + </dependencies> + <configuration> + <strictBinIncludes>false</strictBinIncludes> + <format>'v'yyyyMMdd-HHmm</format> + <timestampProvider>jgit</timestampProvider> + <jgit.ignore> + </jgit.ignore> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-director-plugin</artifactId> + <version>${tycho.version}</version> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-repository-plugin</artifactId> + <version>${tycho.version}</version> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho.version}</version> + <configuration> + <baselineMode>warn</baselineMode> + <baselineReplace>none</baselineReplace> + <baselineRepositories> + <repository> + <url>http://download.eclipse.org/eclipse/updates/4.2</url> + </repository> + </baselineRepositories> + </configuration> + </plugin> + <!--This plugin's configuration is used to store Eclipse m2e settings + only. It has no influence on the Maven build itself. --> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId> + org.eclipse.tycho + </groupId> + <artifactId> + tycho-packaging-plugin + </artifactId> + <versionRange> + [0.19.0,) + </versionRange> + <goals> + <goal>validate-id</goal> + <goal>validate-version</goal> + <goal>build-qualifier</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId> + org.eclipse.tycho + </groupId> + <artifactId> + tycho-compiler-plugin + </artifactId> + <versionRange> + [0.19.0,) + </versionRange> + <goals> + <goal>compile</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + + <distributionManagement> + <repository> + <id>repo.eclipse.org</id> + <name>eTrice Repository - Releases</name> + <url>https://repo.eclipse.org/content/repositories/etrice-releases/</url> + </repository> + <snapshotRepository> + <id>repo.eclipse.org</id> + <name>eTrice Repository - Snapshots</name> + <url>https://repo.eclipse.org/content/repositories/etrice-snapshots/</url> + <uniqueVersion>true</uniqueVersion> + </snapshotRepository> + </distributionManagement> +</project> diff --git a/releng/org.eclipse.etrice.site/category.xml b/releng/org.eclipse.etrice.site/category.xml index b09fe076d..134e911aa 100644 --- a/releng/org.eclipse.etrice.site/category.xml +++ b/releng/org.eclipse.etrice.site/category.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <site> - <feature url="features/org.eclipse.etrice.feature_1.1.1.qualifier.jar" id="org.eclipse.etrice.feature" version="1.1.1.qualifier"> + <feature id="org.eclipse.etrice.feature" version="1.1.1.qualifier"> <category name="org.eclipse.etrice"/> </feature> - <feature url="features/org.eclipse.etrice.cdt-integration.feature_1.1.1.qualifier.jar" id="org.eclipse.etrice.cdt-integration.feature" version="1.1.1.qualifier"> + <feature id="org.eclipse.etrice.cdt-integration.feature" version="1.1.1.qualifier"> <category name="org.eclipse.etrice"/> </feature> <category-def name="org.eclipse.etrice" label="eTrice"> diff --git a/releng/org.eclipse.etrice.site/feature.properties b/releng/org.eclipse.etrice.site/feature.properties deleted file mode 100644 index fcf39670f..000000000 --- a/releng/org.eclipse.etrice.site/feature.properties +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (c) 2010 - 2011 Protos Software GmbH. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Thomas Schuetz and Henrik Rentz-Reichert - initial API and implementation - -# NLS_MESSAGEFORMAT_VAR - -# ============================================================================== -# Do not change the properties between this line and the last line containing: -# %%% END OF TRANSLATED PROPERTIES %%% -# Instead, either redefine an existing property, or create a new property, -# append it to the end of the file, and change the code to use the new name. -# ============================================================================== - -providerName = Eclipse eTrice -featureName = eTrice Site -description = eTrice modeling tools for event driven real-time systems based on the modeling language ROOM - -# Label for the update site (on download1.eclipse.org) -updateSiteName=Eclipse Modeling Project Updates - - -# ============================================================================== -# %%% END OF TRANSLATED PROPERTIES %%% -# The above properties have been shipped for translation. -# ============================================================================== diff --git a/releng/org.eclipse.etrice.site/feature.xml b/releng/org.eclipse.etrice.site/feature.xml deleted file mode 100644 index 1d2897daf..000000000 --- a/releng/org.eclipse.etrice.site/feature.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (c) 2010 - 2011 Protos Software GmbH. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html - - Contributors: - Thomas Schuetz and Henrik Rentz-Reichert - initial API and implementation ---> -<feature - id="org.eclipse.etrice.site" - label="eTrice 1.1.1 Update Site" - version="1.1.1.qualifier" - provider-name="%providerName" - image="eclipse_update_120.jpg"> - - <description> - %description - </description> - - <copyright url="http://www.eclipse.org/legal/epl-v10.html"> - (c) 2010 - 2011 Protos Software GmbH. -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License -v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html - </copyright> - - <url> - <update url="http://www.eclipse.org/downloads/download.php?file=/etrice/updates/0.4.0"/> - <discovery label="KIELER provided by eTrice" url="http://download.eclipse.org/etrice/KIELER/kieler-0.7.1"/> - </url> - - <includes - id="org.eclipse.etrice.feature" - version="0.0.0"/> - - <includes - id="org.eclipse.etrice.cdt-integration.feature" - version="0.0.0"/> - -</feature> diff --git a/releng/org.eclipse.etrice.site/pom.xml b/releng/org.eclipse.etrice.site/pom.xml index 77bcbfd22..078dc6cb5 100644 --- a/releng/org.eclipse.etrice.site/pom.xml +++ b/releng/org.eclipse.etrice.site/pom.xml @@ -1,15 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <parent> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.etrice</groupId> + <artifactId>org.eclipse.etrice.parent</artifactId> + <version>1.1.1-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath> + </parent> <groupId>org.eclipse.etrice</groupId> - <artifactId>org.eclipse.etrice.parent</artifactId> - <version>1.0.0-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath> - </parent> - <groupId>org.eclipse.etrice</groupId> - <artifactId>org.eclipse.etrice.site</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>eclipse-repository</packaging> + <artifactId>org.eclipse.etrice.site</artifactId> + <packaging>eclipse-repository</packaging> </project> diff --git a/runtime/org.eclipse.etrice.modellib.c/buckminster.cspec b/runtime/org.eclipse.etrice.modellib.c/buckminster.cspec deleted file mode 100644 index 6449d924a..000000000 --- a/runtime/org.eclipse.etrice.modellib.c/buckminster.cspec +++ /dev/null @@ -1 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.modellib.c" componentType="buckminster" version="0.5.0.qualifier"/> diff --git a/runtime/org.eclipse.etrice.modellib.c/build.gradle b/runtime/org.eclipse.etrice.modellib.c/build.gradle index f11e40692..255601442 100644 --- a/runtime/org.eclipse.etrice.modellib.c/build.gradle +++ b/runtime/org.eclipse.etrice.modellib.c/build.gradle @@ -2,7 +2,7 @@ plugins { id 'c' } -apply from: etGenerator +apply from: "$rootDir/gradle/etGenerator.gradle" def models = [ 'model/PInterrupt.room', diff --git a/runtime/org.eclipse.etrice.modellib.c/doc-gen/images/ATimingService_behavior.jpg b/runtime/org.eclipse.etrice.modellib.c/doc-gen/images/ATimingService_behavior.jpg Binary files differdeleted file mode 100644 index 5599e352e..000000000 --- a/runtime/org.eclipse.etrice.modellib.c/doc-gen/images/ATimingService_behavior.jpg +++ /dev/null diff --git a/runtime/org.eclipse.etrice.modellib.c/doc-gen/images/ATimingService_structure.jpg b/runtime/org.eclipse.etrice.modellib.c/doc-gen/images/ATimingService_structure.jpg Binary files differdeleted file mode 100644 index d2ea00fa1..000000000 --- a/runtime/org.eclipse.etrice.modellib.c/doc-gen/images/ATimingService_structure.jpg +++ /dev/null diff --git a/runtime/org.eclipse.etrice.modellib.c/doc-gen/images/dot2jpg.bat b/runtime/org.eclipse.etrice.modellib.c/doc-gen/images/dot2jpg.bat deleted file mode 100644 index e69de29bb..000000000 --- a/runtime/org.eclipse.etrice.modellib.c/doc-gen/images/dot2jpg.bat +++ /dev/null diff --git a/runtime/org.eclipse.etrice.modellib.c/doc-gen/readme.txt b/runtime/org.eclipse.etrice.modellib.c/doc-gen/readme.txt deleted file mode 100644 index 1dc2b35ab..000000000 --- a/runtime/org.eclipse.etrice.modellib.c/doc-gen/readme.txt +++ /dev/null @@ -1,4 +0,0 @@ -This directory is an eTrice code generation target. -It will be erased every time the generator is executed. - -DO NOT PLACE OTHER FILES HERE! diff --git a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp.tex b/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp.tex deleted file mode 100644 index ad3903f17..000000000 --- a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp.tex +++ /dev/null @@ -1,91 +0,0 @@ -\documentclass[titlepage]{article} -\usepackage{import} -\usepackage{graphicx} -\usepackage{xr} -\usepackage{hyperref} -\IfFileExists{../doc/userinputs.tex}{\subimport{../doc/}{userinputs.tex}}{} %hook for conditional user-specific inputs, includes, macros, ... -\usepackage[a4paper,text={160mm,255mm},centering,headsep=5mm,footskip=10mm]{geometry} -\usepackage{nonfloat} -\parindent 0pt -\makeatletter -\newcommand\level[1]{% - \ifcase#1\relax\expandafter\chapter\or - \expandafter\section\or - \expandafter\subsection\or - \expandafter\subsubsection\else - \def\next{\@level{#1}}\expandafter\next - \fi} - -\newcommand{\@level}[1]{% -\@startsection{level#1} - {#1} - {\z@}% - {-3.25ex\@plus -1ex \@minus -.2ex}% - {1.5ex \@plus .2ex}% - {\normalfont\normalsize\bfseries}} - -\newdimen\@leveldim - \newdimen\@dotsdim - {\normalfont\normalsize - \sbox\z@{0}\global\@leveldim=\wd\z@ - \sbox\z@{.}\global\@dotsdim=\wd\z@ - } -\newcounter{level4}[subsubsection] - \@namedef{thelevel4}{\thesubsubsection.\arabic{level4}} - \@namedef{level4mark}#1{} - \def\l@section{\@dottedtocline{1}{0pt}{\dimexpr\@leveldim*4+\@dotsdim*1+6pt\relax}} - \def\l@subsection{\@dottedtocline{2}{0pt}{\dimexpr\@leveldim*5+\@dotsdim*2+6pt\relax}} - \def\l@subsubsection{\@dottedtocline{3}{0pt}{\dimexpr\@leveldim*6+\@dotsdim*3+6pt\relax}} - \@namedef{l@level4}{\@dottedtocline{4}{0pt}{\dimexpr\@leveldim*7+\@dotsdim*4+6pt\relax}} - -\count@=4 - \def\@ncp#1{\number\numexpr\count@+#1\relax} - \loop\ifnum\count@<100 - \begingroup\edef\x{\endgroup - \noexpand\newcounter{level\@ncp{1}}[level\number\count@] - \noexpand\@namedef{thelevel\@ncp{1}}{% - \noexpand\@nameuse{thelevel\@ncp{0}}.\noexpand\arabic{level\@ncp{0}}} - \noexpand\@namedef{level\@ncp{1}mark}####1{}% - \noexpand\@namedef{l@level\@ncp{1}}% - {\noexpand\@dottedtocline{\@ncp{1}}{0pt}{\the\dimexpr\@leveldim*\@ncp{5}+\@dotsdim*\@ncp{0}\relax}}}% - \x - \advance\count@\@ne - \repeat - \makeatother - \setcounter{secnumdepth}{100} - \setcounter{tocdepth}{100} - - -\title{room.basic.service.tcp Model Documentation} -\date{\today} -\author{generated by eTrice} - -\begin{document} - -\pagestyle{plain} -\maketitle -\tableofcontents - -\newpage -\listoffigures -\newpage -\section{Model Description} - - - - -\section{Protocol Classes} -\subimport*{room.basic.service.tcp/}{PTcpControl.tex} -\subimport*{room.basic.service.tcp/}{PTcpPayload.tex} -\newpage - - -\section{Data Classes} -\subimport*{room.basic.service.tcp/}{DTcpControl.tex} -\subimport*{room.basic.service.tcp/}{DTcpPayload.tex} -\newpage - -\section{Actor Classes} -\subimport*{room.basic.service.tcp/}{ATcpServer.tex} -\subimport*{room.basic.service.tcp/}{ATcpClient.tex} -\end{document} diff --git a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp/ATcpClient.tex b/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp/ATcpClient.tex deleted file mode 100644 index cabf2e955..000000000 --- a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp/ATcpClient.tex +++ /dev/null @@ -1,76 +0,0 @@ -\level{2}{ATcpClient} - - -\level{3}{Ports} -\begin{tabular}[ht]{|l|l|l|l|l|p{5cm}|} -\hline -\textbf{Name} & \textbf{Protocol} & \textbf{Type} & \textbf{Kind} & \textbf{Multiplicity} & \textbf{Description}\\ -\hline -controlPort & PTcpControl & reg. & external & 1 & \\ -\hline -payloadPort & PTcpPayload & reg. & external & 1 & \\ -\hline -\end{tabular} - -\level{3}{Behavior} -\level{4}{Top Level} - -\begin{par} - -\end{par} - - -\level{3}{Attributes} -\begin{tabular}[ht]{|l|l|p{8cm}|} -\hline -\textbf{Name} & \textbf{Type} & \textbf{Description}\\ -\hline -lastError & int32 & \\ -\hline -payload & DTcpPayload & \\ -\hline -client & etSocketConnectionData & \\ -\hline -\end{tabular} - -\level{3}{Operations} -\begin{tabular}[ht]{|l|l|} -\hline - Name: & ATcpClient\\ - \hline - ReturnType: & void\\ - \hline - Arguments: & \\ - \hline -\end{tabular} -\newline\newline\newline -\begin{tabular}[ht]{|l|l|} -\hline - Name: & ATcpClient\\ - \hline - ReturnType: & void\\ - \hline - Arguments: & \\ - \hline -\end{tabular} -\newline\newline\newline -\begin{tabular}[ht]{|l|l|} -\hline - Name: & hasError\\ - \hline - ReturnType: & boolean\\ - \hline - Arguments: & \\ - \hline -\end{tabular} -\newline\newline\newline -\begin{tabular}[ht]{|l|l|} -\hline - Name: & setErrorCode\\ - \hline - ReturnType: & void\\ - \hline - Arguments: & value:int32\\ - \hline -\end{tabular} -\newline\newline\newline diff --git a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp/ATcpServer.tex b/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp/ATcpServer.tex deleted file mode 100644 index 076c42260..000000000 --- a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp/ATcpServer.tex +++ /dev/null @@ -1,76 +0,0 @@ -\level{2}{ATcpServer} - - -\level{3}{Ports} -\begin{tabular}[ht]{|l|l|l|l|l|p{5cm}|} -\hline -\textbf{Name} & \textbf{Protocol} & \textbf{Type} & \textbf{Kind} & \textbf{Multiplicity} & \textbf{Description}\\ -\hline -controlPort & PTcpControl & reg. & external & 1 & \\ -\hline -payloadPort & PTcpPayload & reg. & external & 1 & \\ -\hline -\end{tabular} - -\level{3}{Behavior} -\level{4}{Top Level} - -\begin{par} - -\end{par} - - -\level{3}{Attributes} -\begin{tabular}[ht]{|l|l|p{8cm}|} -\hline -\textbf{Name} & \textbf{Type} & \textbf{Description}\\ -\hline -lastError & int32 & \\ -\hline -payloadPortReplocation & int32 & \\ -\hline -server & etSocketServerData & \\ -\hline -\end{tabular} - -\level{3}{Operations} -\begin{tabular}[ht]{|l|l|} -\hline - Name: & ATcpServer\\ - \hline - ReturnType: & void\\ - \hline - Arguments: & \\ - \hline -\end{tabular} -\newline\newline\newline -\begin{tabular}[ht]{|l|l|} -\hline - Name: & ATcpServer\\ - \hline - ReturnType: & void\\ - \hline - Arguments: & \\ - \hline -\end{tabular} -\newline\newline\newline -\begin{tabular}[ht]{|l|l|} -\hline - Name: & hasError\\ - \hline - ReturnType: & boolean\\ - \hline - Arguments: & \\ - \hline -\end{tabular} -\newline\newline\newline -\begin{tabular}[ht]{|l|l|} -\hline - Name: & setErrorCode\\ - \hline - ReturnType: & void\\ - \hline - Arguments: & value:int32\\ - \hline -\end{tabular} -\newline\newline\newline diff --git a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp/DTcpControl.tex b/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp/DTcpControl.tex deleted file mode 100644 index f15d98420..000000000 --- a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp/DTcpControl.tex +++ /dev/null @@ -1,13 +0,0 @@ -\level{2} {DTcpControl} -\level{3}{Attributes} -\begin{tabular}[ht]{|l|l|p{8cm}|} -\hline -\textbf{Name} & \textbf{Type} & \textbf{Description}\\ -\hline -IPAddr & string & \\ -\hline -TcpPort & int32 & \\ -\hline -\end{tabular} - -\level{3}{Operations} diff --git a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp/DTcpPayload.tex b/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp/DTcpPayload.tex deleted file mode 100644 index fd80f9c2c..000000000 --- a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp/DTcpPayload.tex +++ /dev/null @@ -1,35 +0,0 @@ -\level{2} {DTcpPayload} -\level{3}{Attributes} -\begin{tabular}[ht]{|l|l|p{8cm}|} -\hline -\textbf{Name} & \textbf{Type} & \textbf{Description}\\ -\hline -connectionId & int32 & \\ -\hline -length & int32 & \\ -\hline -data & int8 & \\ -\hline -\end{tabular} - -\level{3}{Operations} -\begin{tabular}[ht]{|l|l|} -\hline - Name: & setAsString\\ - \hline - ReturnType: & void\\ - \hline - Arguments: & value:charPtr\\ - \hline -\end{tabular} -\newline\newline\newline -\begin{tabular}[ht]{|l|l|} -\hline - Name: & getAsString\\ - \hline - ReturnType: & void\\ - \hline - Arguments: & value:charPtr\\ - \hline -\end{tabular} -\newline\newline\newline diff --git a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp/PTcpControl.tex b/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp/PTcpControl.tex deleted file mode 100644 index d6f4ed000..000000000 --- a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp/PTcpControl.tex +++ /dev/null @@ -1,24 +0,0 @@ -\level{2} {PTcpControl} -\level{3}{Incoming Messages} - -\begin{tabular}[ht]{|l|l|l|p{8cm}|} -\hline -Message & Data & Type & Description\\ -\hline -connect & data & DTcpControl & \\ -\hline -disconnect & & & \\ -\hline -\end{tabular} -\level{3}{Outgoing Messages} -\begin{tabular}[ht]{|l|l|l|p{8cm}|} -\hline -Message & Data & Type & Description\\ -\hline -connected & & & \\ -\hline -disconnected & & & \\ -\hline -error & & & \\ -\hline -\end{tabular} diff --git a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp/PTcpPayload.tex b/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp/PTcpPayload.tex deleted file mode 100644 index 4c4931872..000000000 --- a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.tcp/PTcpPayload.tex +++ /dev/null @@ -1,18 +0,0 @@ -\level{2} {PTcpPayload} -\level{3}{Incoming Messages} - -\begin{tabular}[ht]{|l|l|l|p{8cm}|} -\hline -Message & Data & Type & Description\\ -\hline -dataPackage & data & DTcpPayload & \\ -\hline -\end{tabular} -\level{3}{Outgoing Messages} -\begin{tabular}[ht]{|l|l|l|p{8cm}|} -\hline -Message & Data & Type & Description\\ -\hline -dataPackage & data & DTcpPayload & \\ -\hline -\end{tabular} diff --git a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.timing.pdf b/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.timing.pdf Binary files differdeleted file mode 100644 index fb9df2de3..000000000 --- a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.timing.pdf +++ /dev/null diff --git a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.timing.tex b/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.timing.tex deleted file mode 100644 index fcda0bc46..000000000 --- a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.timing.tex +++ /dev/null @@ -1,85 +0,0 @@ -\documentclass[titlepage]{article} -\usepackage{import} -\usepackage{graphicx} -\usepackage{xr} -\usepackage{hyperref} -\IfFileExists{../doc/userinputs.tex}{\subimport{../doc/}{userinputs.tex}}{} %hook for conditional user-specific inputs, includes, macros, ... -\usepackage[a4paper,text={160mm,255mm},centering,headsep=5mm,footskip=10mm]{geometry} -\usepackage{nonfloat} -\parindent 0pt -\makeatletter -\newcommand\level[1]{% - \ifcase#1\relax\expandafter\chapter\or - \expandafter\section\or - \expandafter\subsection\or - \expandafter\subsubsection\else - \def\next{\@level{#1}}\expandafter\next - \fi} - -\newcommand{\@level}[1]{% -\@startsection{level#1} - {#1} - {\z@}% - {-3.25ex\@plus -1ex \@minus -.2ex}% - {1.5ex \@plus .2ex}% - {\normalfont\normalsize\bfseries}} - -\newdimen\@leveldim - \newdimen\@dotsdim - {\normalfont\normalsize - \sbox\z@{0}\global\@leveldim=\wd\z@ - \sbox\z@{.}\global\@dotsdim=\wd\z@ - } -\newcounter{level4}[subsubsection] - \@namedef{thelevel4}{\thesubsubsection.\arabic{level4}} - \@namedef{level4mark}#1{} - \def\l@section{\@dottedtocline{1}{0pt}{\dimexpr\@leveldim*4+\@dotsdim*1+6pt\relax}} - \def\l@subsection{\@dottedtocline{2}{0pt}{\dimexpr\@leveldim*5+\@dotsdim*2+6pt\relax}} - \def\l@subsubsection{\@dottedtocline{3}{0pt}{\dimexpr\@leveldim*6+\@dotsdim*3+6pt\relax}} - \@namedef{l@level4}{\@dottedtocline{4}{0pt}{\dimexpr\@leveldim*7+\@dotsdim*4+6pt\relax}} - -\count@=4 - \def\@ncp#1{\number\numexpr\count@+#1\relax} - \loop\ifnum\count@<100 - \begingroup\edef\x{\endgroup - \noexpand\newcounter{level\@ncp{1}}[level\number\count@] - \noexpand\@namedef{thelevel\@ncp{1}}{% - \noexpand\@nameuse{thelevel\@ncp{0}}.\noexpand\arabic{level\@ncp{0}}} - \noexpand\@namedef{level\@ncp{1}mark}####1{}% - \noexpand\@namedef{l@level\@ncp{1}}% - {\noexpand\@dottedtocline{\@ncp{1}}{0pt}{\the\dimexpr\@leveldim*\@ncp{5}+\@dotsdim*\@ncp{0}\relax}}}% - \x - \advance\count@\@ne - \repeat - \makeatother - \setcounter{secnumdepth}{100} - \setcounter{tocdepth}{100} - - -\title{room.basic.service.timing Model Documentation} -\date{\today} -\author{generated by eTrice} - -\begin{document} - -\pagestyle{plain} -\maketitle -\tableofcontents - -\newpage -\listoffigures -\newpage -\section{Model Description} - - - - -\section{Protocol Classes} -\subimport*{room.basic.service.timing/}{PTimer.tex} -\newpage - - - -\section{Actor Classes} -\subimport*{room.basic.service.timing/}{ATimingService.tex} -\end{document} diff --git a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.timing/ATimingService.tex b/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.timing/ATimingService.tex deleted file mode 100644 index 861041016..000000000 --- a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.timing/ATimingService.tex +++ /dev/null @@ -1,97 +0,0 @@ -\level{2}{ATimingService} - -\level{3}{Structure} -{ -\centering{} -\includegraphics[width=1.0\textwidth]{./images/ATimingService_structure.jpg} -\figcaption{ATimingService Structure} -} - - -\level{3}{Behavior} -\level{4}{Top Level} -{ -\centering{} -\includegraphics[width=1.0\textwidth]{./images/ATimingService_behavior.jpg} -\figcaption{ATimingService Top State} -} - -\begin{par} - -\end{par} - - -\level{3}{Attributes} -\begin{tabular}[ht]{|l|l|p{8cm}|} -\hline -\textbf{Name} & \textbf{Type} & \textbf{Description}\\ -\hline -tcbs & tcb & \\ -\hline -usedTcbsRoot & tcb & \\ -\hline -freeTcbsRoot & tcb & \\ -\hline -\end{tabular} - -\level{3}{Operations} -\begin{tabular}[ht]{|l|l|} -\hline - Name: & getTcb\\ - \hline - ReturnType: & tcb\\ - \hline - Arguments: & \\ - \hline -\end{tabular} -\newline\newline\newline -\begin{tabular}[ht]{|l|l|} -\hline - Name: & returnTcb\\ - \hline - ReturnType: & void\\ - \hline - Arguments: & block:tcb\\ - \hline -\end{tabular} -\newline\newline\newline -\begin{tabular}[ht]{|l|l|} -\hline - Name: & removeTcbFromUsedList\\ - \hline - ReturnType: & void\\ - \hline - Arguments: & idx:int32\\ - \hline -\end{tabular} -\newline\newline\newline -\begin{tabular}[ht]{|l|l|} -\hline - Name: & putTcbToUsedList\\ - \hline - ReturnType: & void\\ - \hline - Arguments: & block:tcb\\ - \hline -\end{tabular} -\newline\newline\newline -\begin{tabular}[ht]{|l|l|} -\hline - Name: & isTimeGreater\\ - \hline - ReturnType: & boolean\\ - \hline - Arguments: & t1:targetTime, t2:targetTime\\ - \hline -\end{tabular} -\newline\newline\newline -\begin{tabular}[ht]{|l|l|} -\hline - Name: & addTime\\ - \hline - ReturnType: & void\\ - \hline - Arguments: & t1:targetTime, t2:targetTime\\ - \hline -\end{tabular} -\newline\newline\newline diff --git a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.timing/PTimer.tex b/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.timing/PTimer.tex deleted file mode 100644 index 9319ec255..000000000 --- a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.service.timing/PTimer.tex +++ /dev/null @@ -1,22 +0,0 @@ -\level{2} {PTimer} -\level{3}{Incoming Messages} - -\begin{tabular}[ht]{|l|l|l|p{8cm}|} -\hline -Message & Data & Type & Description\\ -\hline -startTimer & time & uint32 & \\ -\hline -startTimeout & time & uint32 & \\ -\hline -kill & & & \\ -\hline -\end{tabular} -\level{3}{Outgoing Messages} -\begin{tabular}[ht]{|l|l|l|p{8cm}|} -\hline -Message & Data & Type & Description\\ -\hline -timeout & & & \\ -\hline -\end{tabular} diff --git a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.types.pdf b/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.types.pdf Binary files differdeleted file mode 100644 index 4b999f165..000000000 --- a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.types.pdf +++ /dev/null diff --git a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.types.tex b/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.types.tex deleted file mode 100644 index 5cb44f958..000000000 --- a/runtime/org.eclipse.etrice.modellib.c/doc-gen/room.basic.types.tex +++ /dev/null @@ -1,80 +0,0 @@ -\documentclass[titlepage]{article} -\usepackage{import} -\usepackage{graphicx} -\usepackage{xr} -\usepackage{hyperref} -\IfFileExists{../doc/userinputs.tex}{\subimport{../doc/}{userinputs.tex}}{} %hook for conditional user-specific inputs, includes, macros, ... -\usepackage[a4paper,text={160mm,255mm},centering,headsep=5mm,footskip=10mm]{geometry} -\usepackage{nonfloat} -\parindent 0pt -\makeatletter -\newcommand\level[1]{% - \ifcase#1\relax\expandafter\chapter\or - \expandafter\section\or - \expandafter\subsection\or - \expandafter\subsubsection\else - \def\next{\@level{#1}}\expandafter\next - \fi} - -\newcommand{\@level}[1]{% -\@startsection{level#1} - {#1} - {\z@}% - {-3.25ex\@plus -1ex \@minus -.2ex}% - {1.5ex \@plus .2ex}% - {\normalfont\normalsize\bfseries}} - -\newdimen\@leveldim - \newdimen\@dotsdim - {\normalfont\normalsize - \sbox\z@{0}\global\@leveldim=\wd\z@ - \sbox\z@{.}\global\@dotsdim=\wd\z@ - } -\newcounter{level4}[subsubsection] - \@namedef{thelevel4}{\thesubsubsection.\arabic{level4}} - \@namedef{level4mark}#1{} - \def\l@section{\@dottedtocline{1}{0pt}{\dimexpr\@leveldim*4+\@dotsdim*1+6pt\relax}} - \def\l@subsection{\@dottedtocline{2}{0pt}{\dimexpr\@leveldim*5+\@dotsdim*2+6pt\relax}} - \def\l@subsubsection{\@dottedtocline{3}{0pt}{\dimexpr\@leveldim*6+\@dotsdim*3+6pt\relax}} - \@namedef{l@level4}{\@dottedtocline{4}{0pt}{\dimexpr\@leveldim*7+\@dotsdim*4+6pt\relax}} - -\count@=4 - \def\@ncp#1{\number\numexpr\count@+#1\relax} - \loop\ifnum\count@<100 - \begingroup\edef\x{\endgroup - \noexpand\newcounter{level\@ncp{1}}[level\number\count@] - \noexpand\@namedef{thelevel\@ncp{1}}{% - \noexpand\@nameuse{thelevel\@ncp{0}}.\noexpand\arabic{level\@ncp{0}}} - \noexpand\@namedef{level\@ncp{1}mark}####1{}% - \noexpand\@namedef{l@level\@ncp{1}}% - {\noexpand\@dottedtocline{\@ncp{1}}{0pt}{\the\dimexpr\@leveldim*\@ncp{5}+\@dotsdim*\@ncp{0}\relax}}}% - \x - \advance\count@\@ne - \repeat - \makeatother - \setcounter{secnumdepth}{100} - \setcounter{tocdepth}{100} - - -\title{room.basic.types Model Documentation} -\date{\today} -\author{generated by eTrice} - -\begin{document} - -\pagestyle{plain} -\maketitle -\tableofcontents - -\newpage -\listoffigures -\newpage -\section{Model Description} - - - - - - - -\end{document} diff --git a/runtime/org.eclipse.etrice.modellib.cpp/buckminster.cspec b/runtime/org.eclipse.etrice.modellib.cpp/buckminster.cspec deleted file mode 100644 index 3e51044d1..000000000 --- a/runtime/org.eclipse.etrice.modellib.cpp/buckminster.cspec +++ /dev/null @@ -1 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.modellib.cpp" componentType="buckminster" version="0.5.0.qualifier"/> diff --git a/runtime/org.eclipse.etrice.modellib.cpp/build.gradle b/runtime/org.eclipse.etrice.modellib.cpp/build.gradle index 3330c2406..8ae584694 100644 --- a/runtime/org.eclipse.etrice.modellib.cpp/build.gradle +++ b/runtime/org.eclipse.etrice.modellib.cpp/build.gradle @@ -2,7 +2,7 @@ plugins { id 'cpp' } -apply from: etGenerator +apply from: "$rootDir/gradle/etGenerator.gradle" def models = [ 'model/TimingService.room' diff --git a/runtime/org.eclipse.etrice.modellib.java/buckminster.cspec b/runtime/org.eclipse.etrice.modellib.java/buckminster.cspec deleted file mode 100644 index a4c43f534..000000000 --- a/runtime/org.eclipse.etrice.modellib.java/buckminster.cspec +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.modellib.java" componentType="buckminster" version="0.5.0.qualifier"/> diff --git a/runtime/org.eclipse.etrice.modellib.java/build.gradle b/runtime/org.eclipse.etrice.modellib.java/build.gradle index 004c8614f..9d3ddffb5 100644 --- a/runtime/org.eclipse.etrice.modellib.java/build.gradle +++ b/runtime/org.eclipse.etrice.modellib.java/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' } -apply from: etGenerator +apply from: "$rootDir/gradle/etGenerator.gradle" def models = [ 'model/ALogService.room', diff --git a/runtime/org.eclipse.etrice.modellib.java/pom.xml b/runtime/org.eclipse.etrice.modellib.java/pom.xml deleted file mode 100644 index 33abbe471..000000000 --- a/runtime/org.eclipse.etrice.modellib.java/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ -<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> - - <artifactId>org.eclipse.etrice.modellib.java</artifactId> - - <parent> - <groupId>org.eclipse.etrice</groupId> - <artifactId>java-generator</artifactId> - <version>1.1.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.etrice.parent</relativePath> - </parent> - - <build> - <sourceDirectory>src-gen</sourceDirectory> - <resources> - <resource> - <directory>src-gen</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - <resource> - <directory>model</directory> - </resource> - </resources> - </build> - <dependencies> - <dependency> - <groupId>org.eclipse.etrice</groupId> - <artifactId>org.eclipse.etrice.runtime.java</artifactId> - <version>1.1.1-SNAPSHOT</version> - </dependency> - </dependencies> -</project>
\ No newline at end of file diff --git a/runtime/org.eclipse.etrice.runtime.c/buckminster.cspec b/runtime/org.eclipse.etrice.runtime.c/buckminster.cspec deleted file mode 100644 index be9cea325..000000000 --- a/runtime/org.eclipse.etrice.runtime.c/buckminster.cspec +++ /dev/null @@ -1 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.runtime.c" componentType="buckminster" version="0.5.0.qualifier"/> diff --git a/runtime/org.eclipse.etrice.runtime.cpp/buckminster.cspec b/runtime/org.eclipse.etrice.runtime.cpp/buckminster.cspec deleted file mode 100644 index 14afaf1da..000000000 --- a/runtime/org.eclipse.etrice.runtime.cpp/buckminster.cspec +++ /dev/null @@ -1 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.runtime.cpp" componentType="buckminster" version="0.5.0.qualifier"/> diff --git a/runtime/org.eclipse.etrice.runtime.java/buckminster.cspec b/runtime/org.eclipse.etrice.runtime.java/buckminster.cspec deleted file mode 100644 index 06938d6ea..000000000 --- a/runtime/org.eclipse.etrice.runtime.java/buckminster.cspec +++ /dev/null @@ -1 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.runtime.java" componentType="buckminster" version="0.5.0.qualifier"/> diff --git a/runtime/org.eclipse.etrice.runtime.java/pom.xml b/runtime/org.eclipse.etrice.runtime.java/pom.xml deleted file mode 100644 index e9dba60dc..000000000 --- a/runtime/org.eclipse.etrice.runtime.java/pom.xml +++ /dev/null @@ -1,74 +0,0 @@ -<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> - - <artifactId>org.eclipse.etrice.runtime.java</artifactId> - - <parent> - <groupId>org.eclipse.etrice</groupId> - <artifactId>java-generator</artifactId> - <version>1.1.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.etrice.parent</relativePath> - </parent> - - <build> - <sourceDirectory>src</sourceDirectory> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.4</version> - <executions> - <execution> - <id>add-generated-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>${basedir}/src-gen</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.codehaus.mojo - </groupId> - <artifactId> - build-helper-maven-plugin - </artifactId> - <versionRange> - [1.4,) - </versionRange> - <goals> - <goal>add-source</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore></ignore> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> -</project>
\ No newline at end of file diff --git a/tests/org.eclipse.etrice.generator.c.tests/Makefile b/tests/org.eclipse.etrice.generator.c.tests/Makefile deleted file mode 100644 index 9a1750a43..000000000 --- a/tests/org.eclipse.etrice.generator.c.tests/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# for make.xml - -#include ${MODELLIB_ROOTDIR}/buildTools/modellib.mk -include ${RUNTIME_ROOTDIR}/buildTools/runtime.mk - -# --- -IN_TARGET := ${APP_TARGET} -IN_BUILD_DIR := ${APP_BUILD_DIR} -IN_INCDIRS += ${APP_SRCDIRS_REC} -IN_SRCDIRS_REC += ${APP_SRCDIRS_REC} -#--- - -# Create rules -include ${RUNTIME_ROOTDIR}/buildTools/Makefile.mk
\ No newline at end of file diff --git a/tests/org.eclipse.etrice.generator.c.tests/buckminster.cspec b/tests/org.eclipse.etrice.generator.c.tests/buckminster.cspec deleted file mode 100644 index c3cb872da..000000000 --- a/tests/org.eclipse.etrice.generator.c.tests/buckminster.cspec +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.generator.c.tests" componentType="buckminster" version="0.5.0.qualifier"> - <cs:actions> - <cs:public name="run_tests" actor="ant"> - <cs:actorProperties> - <cs:property key="buildFile" value="make.xml"/> - <cs:property key="targets" value="all"/> - </cs:actorProperties> - </cs:public> - </cs:actions> -</cs:cspec>
\ No newline at end of file diff --git a/tests/org.eclipse.etrice.generator.c.tests/build.gradle b/tests/org.eclipse.etrice.generator.c.tests/build.gradle index f706476a9..e5ed184c3 100644 --- a/tests/org.eclipse.etrice.generator.c.tests/build.gradle +++ b/tests/org.eclipse.etrice.generator.c.tests/build.gradle @@ -2,7 +2,7 @@ plugins { id 'c' } -apply from: etTest +apply from: "$rootDir/gradle/etTest.gradle" def genericPhysical = '../org.eclipse.etrice.generator.common.tests/models/GenericPhysical.etphys' diff --git a/tests/org.eclipse.etrice.generator.c.tests/make.xml b/tests/org.eclipse.etrice.generator.c.tests/make.xml deleted file mode 100644 index 07e2df06e..000000000 --- a/tests/org.eclipse.etrice.generator.c.tests/make.xml +++ /dev/null @@ -1,100 +0,0 @@ -<?xml version="1.0"?> -<!-- - Ant makefile for building and running of tests. - - Includes common.xml from org.eclipse.etrice.generator.common.tests ---> -<project name="org.eclipse.etrice.generator.c.tests" basedir="." default="all"> - - <target name="testing" depends="common.testing"> - - <!-- add test here, testid==testSuiteFileName --> - <test testid="StaticConfigTest" models="${models.path}/staticConfig/StaticConfigTest.etmap ${models.path}/staticConfig/StaticConfigTest.room ${models.path}/staticConfig/StaticConfigTest.config ${models.path}/TimingService.room" /> - - <!-- fail on build server --> - <!--<test testid="SendingDataTestC" models="${models.path}/sendingData/SendingDataTestC.room ${models.path}/GenericPhysical.etphys" />--> - <echo>done with ${ant.project.name}</echo> - </target> - - <target name="copyModels" depends="common.copyModels"> - <copy todir="${models.path}"> - <fileset dir="./targetModels"/> - </copy> - <move file="${models.path}/staticConfig/StaticConfigTest_C.room" toFile="${models.path}/staticConfig//StaticConfigTest.room" /> - </target> - - <!-- ################################################################ --> - - <import file="../org.eclipse.etrice.generator.common.tests/common.xml" as="common"/> - - <property name="modellib.path" value="../../runtime/org.eclipse.etrice.modellib.c" /> - <property name="runtime.path" value="../../runtime/org.eclipse.etrice.runtime.c" /> - - <target name="set_local_rt" unless="runtime.platform"> - <!-- <property name="runtime.platform" value="MT_POSIX_GENERIC_GCC"/> --> - <property name="runtime.platform" value="MT_WIN_MinGW"/> - <echo> runtime.platform = ${runtime.platform} </echo> - </target> - <target name="setVars" depends="set_local_rt,common.setVars"/> - - <target name="all" depends="clean,copyModels,testing"></target> - - <!-- test := generate 1 executable, build, run, process results --> - <macrodef name="test"> - <attribute name="testId"/> - <attribute name="models"/> - <sequential> - <standaloneGenerator testId="@{testId}" models="@{models}"/> - <build testId="@{testId}"/> - <run testId="@{testId}"/> - <convert testId="@{testId}"/> - <copyResult testId="@{testId}" targetId="C_${runtime.platform}_"/> - </sequential> - </macrodef> - - <macrodef name="standaloneGenerator"> - <attribute name="testId"/> - <attribute name="models"/> - <sequential> - <mkdir dir="${output}"/> - <java output="${output}/generate.txt" error="${output}/generate_err.txt" classname="org.eclipse.etrice.generator.c.Main" fork="true" failonerror="true"> - <arg line="@{models}"/> - <arg value="-genDir"/><arg value="src-gen/@{testId}"/> - <arg value="-msc_instr"/> - <classpath refid="etrice.clspath"/> - </java> - </sequential> - </macrodef> - - <!-- - build: compiles and links the generated C sources - --> - <macrodef name="build"> - <attribute name="testId"/> - <sequential> - <mkdir dir="${bin.path}"/> - <mkdir dir="${output}"/> - <exec executable="make" failonerror="true" output="${output}/build.txt"> - <arg line="all"/> - <arg line="APP_TARGET=@{testId}.exe"/> - <arg line="APP_BUILD_DIR=${bin.path}"/> - <arg line="APP_SRCDIRS_REC='./src-gen/@{testId} ./src/@{testId}'"/> - <arg line="RUNTIME_ROOTDIR=${runtime.path}"/> - <arg line="MODELLIB_ROOTDIR=${modellib.path}"/> - <arg line="TARGET_PLATFORM=${runtime.platform}"/> - </exec> - </sequential> - </macrodef> - - <macrodef name="run"> - <attribute name="testId"/> - <sequential> - <mkdir dir="${output}"/> - <mkdir dir="${testlog.path}"/> - <exec dir="./" output="${output}/run.txt" resolveexecutable="true" executable="${bin.path}/@{testId}.exe" timeout="${run.msTimout}"> - <arg value="-run_as_test"/> - </exec> - </sequential> - </macrodef> - -</project> diff --git a/tests/org.eclipse.etrice.generator.c.tests/org.eclipse.etrice.generator.c.tests make.xml.launch b/tests/org.eclipse.etrice.generator.c.tests/org.eclipse.etrice.generator.c.tests make.xml.launch deleted file mode 100644 index 92ce070b0..000000000 --- a/tests/org.eclipse.etrice.generator.c.tests/org.eclipse.etrice.generator.c.tests make.xml.launch +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType"> -<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> -<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.etrice.generator.c.tests/make.xml"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> -<listEntry value="org.eclipse.ui.externaltools.launchGroup"/> -</listAttribute> -<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.generator.c.tests"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES"> -<mapEntry key="eclipse.home" value="${eclipse_home}"/> -<mapEntry key="eclipse.pdebuild.home" value="${target_platform_plugin_location:org.eclipse.pde.build}"/> -<mapEntry key="eclipse.pdebuild.scripts" value="${target_platform_plugin_location:org.eclipse.pde.build}/scripts/"/> -<mapEntry key="eclipse.pdebuild.templates" value="${target_platform_plugin_location:org.eclipse.pde.build}/templates/"/> -<mapEntry key="eclipse.running" value="true"/> -<mapEntry key="com.google.guava" value="${target_platform_plugin_location:com.google.guava}"/> -<mapEntry key="com.google.inject" value="${target_platform_plugin_location:com.google.inject}"/> -<mapEntry key="javax.inject" value="${target_platform_plugin_location:javax.inject}"/> -<mapEntry key="org.antlr.runtime" value="${target_platform_plugin_location:org.antlr.runtime}"/> -<mapEntry key="org.apache.log4j" value="${target_platform_plugin_location:org.apache.log4j}"/> -<mapEntry key="org.eclipse.emf.common" value="${target_platform_plugin_location:org.eclipse.emf.common}"/> -<mapEntry key="org.eclipse.emf.ecore" value="${target_platform_plugin_location:org.eclipse.emf.ecore}"/> -<mapEntry key="org.eclipse.emf.ecore.xmi" value="${target_platform_plugin_location:org.eclipse.emf.ecore.xmi}"/> -<mapEntry key="org.eclipse.equinox.common" value="${target_platform_plugin_location:org.eclipse.equinox.common}"/> -<mapEntry key="org.eclipse.xtend.lib" value="${target_platform_plugin_location:org.eclipse.xtend.lib}"/> -<mapEntry key="org.eclipse.xtext" value="${target_platform_plugin_location:org.eclipse.xtext}"/> -<mapEntry key="org.eclipse.xtext.common.types" value="${target_platform_plugin_location:org.eclipse.xtext.common.types}"/> -<mapEntry key="org.eclipse.xtext.util" value="${target_platform_plugin_location:org.eclipse.xtext.util}"/> -<mapEntry key="org.eclipse.xtext.xbase.lib" value="${target_platform_plugin_location:org.eclipse.xtext.xbase.lib}"/> -</mapAttribute> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.etrice.generator.c.tests/make.xml}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-v"/> -<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> -</launchConfiguration> diff --git a/tests/org.eclipse.etrice.generator.common.tests/buckminster.cspec b/tests/org.eclipse.etrice.generator.common.tests/buckminster.cspec deleted file mode 100644 index b9bd37b93..000000000 --- a/tests/org.eclipse.etrice.generator.common.tests/buckminster.cspec +++ /dev/null @@ -1 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.generator.common.tests" componentType="buckminster" version="0.5.0.qualifier"/> diff --git a/tests/org.eclipse.etrice.generator.common.tests/build.gradle b/tests/org.eclipse.etrice.generator.common.tests/build.gradle index 8e6530812..9fd487354 100644 --- a/tests/org.eclipse.etrice.generator.common.tests/build.gradle +++ b/tests/org.eclipse.etrice.generator.common.tests/build.gradle @@ -4,7 +4,7 @@ plugins { id 'java-base' } -apply from: etTest +apply from: "$rootDir/gradle/etTest.gradle" def genericPhysical = 'models/GenericPhysical.etphys' diff --git a/tests/org.eclipse.etrice.generator.common.tests/common.xml b/tests/org.eclipse.etrice.generator.common.tests/common.xml deleted file mode 100644 index 63b4ab7d3..000000000 --- a/tests/org.eclipse.etrice.generator.common.tests/common.xml +++ /dev/null @@ -1,217 +0,0 @@ -<?xml version="1.0"?> -<project name="org.eclipse.etrice.generator.common.tests"> - - <target name="testing" depends="copyModels"> - - <!-- add test here, testid==testSuiteFileName --> - <test testid="ActorCommunicationTest" models="${models.path}/ActorCommunicationTest.room ${models.path}/GenericPhysical.etphys ${models.path}/TimingService.room" /> - <test testid="ChoicePointTest" models="${models.path}/ChoicePointTest.room ${models.path}/GenericPhysical.etphys" /> - <test testid="ChoicePointTestExtended" models="${models.path}/ChoicePointTestExtended.room ${models.path}/GenericPhysical.etphys" /> - <test testid="DataDrivenTest" models="${models.path}/DataDrivenTest.room ${models.path}/GenericPhysical.etphys ${models.path}/TimingService.room" /> - <test testid="EnumTest" models="${models.path}/EnumTest.room ${models.path}/GenericPhysical.etphys" /> - <test testid="CompileTests" models="${models.path}/CompileTests.room ${models.path}/GenericPhysical.etphys ${models.path}/DetailExpressionTest.room ${models.path}/StatemachineInterfaceTest.room ${models.path}/StatemachineInterfaceInheritedTest.room ${models.path}/StatemachineInterfaceTest.room ${models.path}/ContinuationTransitionTest.room ${models.path}/TimingService.room" /> - <test testid="HandlerTest" models="${models.path}/HandlerTest.room ${models.path}/GenericPhysical.etphys" /> - <test testid="OperationInheritanceTest" models="${models.path}/OperationInheritanceTest.room ${models.path}/GenericPhysical.etphys" /> - <test testid="PingPongThreadTest" models="${models.path}/PingPongThreadTest.etmap ${models.path}/PingPongThreadTest.room ${models.path}/TimingService.room" /> - <test testid="PingPongThreadReplPortTest" models="${models.path}/PingPongThreadReplPortTest.etmap ${models.path}/PingPongThreadReplPortTest.room ${models.path}/TimingService.room" /> - - - <echo>done with ${ant.project.name}</echo> - </target> - - <target name="copyModels" depends="setVars"> - <copy todir="${models.path}"> - <fileset dir="../org.eclipse.etrice.generator.common.tests/models"/> - </copy> - <copy todir="${models.path}" > - <fileset dir="${modellib.path}/model"> - <include name="*.room"/> - <include name="*.etphys"/> - </fileset> - </copy> - </target> - - <!-- ################################################################ --> - - <!-- global properties --> - <!-- test.results, target.platform --> - - <!-- private properties--> - <property name="models.path" value="./models"/> - <property name="testlog.path" value="./log/testlog"/> - <property name="output" value="./output"/> - <property name="bin.path" value="./bin"/> - - <property name="run.msTimout" value="5000"/> - - <!-- show ALL used variables --> - <target name="showVars"> - <echo> ant.project.name = ${ant.project.name} </echo> - <echo> runtime.path = ${runtime.path} </echo> - <echo> testlog.path = ${testlog.path} </echo> - <echo> test.results = ${test.results} </echo> - <echo> output = ${output} </echo> - <echo> bin.path = ${bin.path} </echo> - <echo> target.platform = ${target.platform} </echo> - <echo> modellib.path = ${modellib.path} </echo> - <echo> models.path = ${models.path} </echo> - <echo> basedir = ${basedir} </echo> - - <echo> org.eclipse.emf.ecore = ${org.eclipse.emf.ecore} </echo> - <echo> org.eclipse.emf.common = ${org.eclipse.emf.common} </echo> - <echo> org.eclipse.emf.ecore.xmi = ${org.eclipse.emf.ecore.xmi} </echo> - <echo> com.google.inject = ${com.google.inject} </echo> - <echo> com.google.guava = ${com.google.guava} </echo> - <echo> org.eclipse.equinox.common = ${org.eclipse.equinox.common} </echo> - <echo> org.eclipse.xtext = ${org.eclipse.xtext} </echo> - <echo> org.eclipse.xtext.util = ${org.eclipse.xtext.util} </echo> - <echo> org.eclipse.xtext.common.types = ${org.eclipse.xtext.common.types} </echo> - <echo> org.eclipse.xtend.lib = ${org.eclipse.xtend.lib} </echo> - <echo> org.eclipse.xtext.xbase.lib = ${org.eclipse.xtext.xbase.lib} </echo> - <echo> org.apache.log4j = ${org.apache.log4j} </echo> - <echo> org.antlr.runtime = ${org.antlr.runtime} </echo> - <echo> javax.inject = ${javax.inject} </echo> - - <pathconvert property="classpathProp" refid="etrice.clspath"/> - <echo> etrice.clspath = ${classpathProp} </echo> - </target> - - <!-- set global properties if not set--> - <target name="set_local_tr" unless="test.results"> - <property name="test.results" value="./results"/> - </target> - <target name="set_local_tp" unless="target.platform"> - <property name="target.platform" value="${eclipse.home}"/> - </target> - - <target name="setVars" depends="set_local_tp,set_local_tr,set_etrice_clspath,showVars"/> - - <target name="set_etrice_clspath"> - <path id="etrice.clspath"> - <pathelement location="../../plugins/org.eclipse.etrice.generator.c/bin"/> - <pathelement location="../../plugins/org.eclipse.etrice.generator.java/bin"/> - <pathelement location="../../plugins/org.eclipse.etrice.generator.cpp/bin"/> - <pathelement location="../../plugins/org.eclipse.etrice.etunit.converter/bin"/> - <pathelement location="../../plugins/org.eclipse.etrice.generator.config/bin"/> - <pathelement location="../../plugins/org.eclipse.etrice.generator.doc/bin"/> - <pathelement location="../../plugins/org.eclipse.etrice.generator.fsm/bin" /> - <pathelement location="../../plugins/org.eclipse.etrice.generator/bin"/> - <pathelement location="../../plugins/org.eclipse.etrice.generator.gnuplot/bin"/> - <pathelement location="../../plugins/org.eclipse.etrice.core.common/bin"/> - <pathelement location="../../plugins/org.eclipse.etrice.core.fsm/bin" /> - <pathelement location="../../plugins/org.eclipse.etrice.core.room/bin"/> - <pathelement location="../../plugins/org.eclipse.etrice.core.etphys/bin"/> - <pathelement location="../../plugins/org.eclipse.etrice.core.etmap/bin"/> - <pathelement location="../../plugins/org.eclipse.etrice.core.config/bin"/> - <pathelement location="../../plugins/org.eclipse.etrice.core.genmodel.fsm/bin" /> - <pathelement location="../../plugins/org.eclipse.etrice.core.genmodel/bin"/> - - <!-- resolve dependencies using Oomph util in properties of launch config --> - <pathelement location="${org.eclipse.emf.ecore}"/> - <pathelement location="${org.eclipse.emf.common}"/> - <pathelement location="${org.eclipse.emf.ecore.xmi}"/> - <pathelement location="${com.google.inject}"/> - <pathelement location="${com.google.guava}"/> - <pathelement location="${org.eclipse.equinox.common}"/> - <pathelement location="${org.eclipse.xtext}"/> - <pathelement location="${org.eclipse.xtext.util}"/> - <pathelement location="${org.eclipse.xtext.common.types}"/> - <pathelement location="${org.eclipse.xtend.lib}"/> - <pathelement location="${org.eclipse.xtext.xbase.lib}"/> - <pathelement location="${org.apache.log4j}"/> - <pathelement location="${org.antlr.runtime}"/> - <pathelement location="${javax.inject}"/> - - <!-- resolve if used from Buckminster Ant task --> - <fileset dir="${target.platform}/plugins/"> - <include name="org.eclipse.emf.ecore_2.1*.jar" /> - <include name="org.eclipse.emf.common_2.1*.jar" /> - <include name="org.eclipse.emf.ecore.xmi_2.1*.jar" /> - <include name="com.google.inject_*.jar" /> - <include name="com.google.guava_1*.jar" /> - <include name="org.eclipse.equinox.common_3.*.jar" /> - <include name="org.apache.log4j_1.2*.jar" /> - <include name="org.antlr.runtime_3.2*.jar" /> - <include name="javax.inject_1.0*.jar" /> - - <!-- Xtext 2.6 --> - <include name="org.eclipse.xtext_2.6*.jar" /> - <include name="org.eclipse.xtext.util_2.6*.jar" /> - <include name="org.eclipse.xtext.common.types_2.6*.jar" /> - <include name="org.eclipse.xtend.lib_2.6*.jar" /> - <include name="org.eclipse.xtext.xbase.lib_2.6*.jar" /> - - <!-- Xtext 2.7 --> - <include name="org.eclipse.xtext_2.7*.jar" /> - <include name="org.eclipse.xtext.util_2.7*.jar" /> - <include name="org.eclipse.xtext.common.types_2.7*.jar" /> - <include name="org.eclipse.xtend.lib_2.7*.jar" /> - <include name="org.eclipse.xtext.xbase.lib_2.7*.jar" /> - - <!-- Xtext 2.8 --> - <include name="org.eclipse.xtext_2.8*.jar" /> - <include name="org.eclipse.xtext.util_2.8*.jar" /> - <include name="org.eclipse.xtext.common.types_2.8*.jar" /> - <include name="org.eclipse.xtend.lib_2.8*.jar" /> - <include name="org.eclipse.xtext.xbase.lib_2.8*.jar" /> - - <!-- Xtext 2.10 --> - <include name="org.eclipse.xtext_2.10*.jar" /> - <include name="org.eclipse.xtext.util_2.10*.jar" /> - <include name="org.eclipse.xtext.common.types_2.10*.jar" /> - <include name="org.eclipse.xtend.lib_2.10*.jar" /> - <include name="org.eclipse.xtext.xbase.lib_2.10*.jar" /> - </fileset> - </path> - </target> - - <!-- - clean: deletes all folders created by this script - --> - <target name="clean" depends="setVars"> - <delete dir="${testlog.path}"/> - <!--deletes resulst from other script on server <delete dir="${test.results}"/>--> - <delete dir="${output}"/> - <delete dir="${bin.path}"/> - <delete dir="${models.path}"/> - <delete dir="log"/> - <delete dir="src-gen"/> - </target> - - <macrodef name="convert"> - <attribute name="testId"/> - <sequential> - <java output="${output}/convert.txt" append="true" classname="org.eclipse.etrice.etunit.converter.EtUnitReportConverter" fork="true" failonerror="true"> - <arg value="-suite"/> - <arg value="${ant.project.name}.@{testId}"/> - <arg value="${testlog.path}/@{testId}.etu"/> - <classpath refid="etrice.clspath"/> - </java> - </sequential> - </macrodef> - - <macrodef name="convertPre"> - <attribute name="testId"/> - <sequential> - <java output="${output}/convert.txt" append="true" classname="org.eclipse.etrice.etunit.converter.EtUnitReportConverter" fork="true" failonerror="true"> - <arg value="-presuite"/> - <arg value="${ant.project.name}."/> - <arg value="${testlog.path}/@{testId}.etu"/> - <classpath refid="etrice.clspath"/> - </java> - </sequential> - </macrodef> - - <!-- - copy_results: copies the *.xml results to their final destination - --> - <macrodef name="copyResult"> - <attribute name="testId"/> - <attribute name="targetId" default=""/> - <sequential> - <mkdir dir="${test.results}"/> - <move file="${testlog.path}/@{testId}.xml" tofile="${test.results}/@{targetId}@{testId}.xml"/> - </sequential> - </macrodef> - -</project>
\ No newline at end of file diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/Makefile b/tests/org.eclipse.etrice.generator.cpp.tests/Makefile deleted file mode 100644 index b6b863770..000000000 --- a/tests/org.eclipse.etrice.generator.cpp.tests/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# for make.xml - -#include ${CPP_MODELLIB_ROOTDIR}/buildTools/modellib.mk -include ${CPP_RUNTIME_ROOTDIR}/buildTools/runtime.mk - -# --- -IN_TARGET := ${APP_TARGET} -IN_BUILD_DIR := ${APP_BUILD_DIR} -IN_INCDIRS += ${APP_SRCDIRS_REC} -IN_SRCDIRS_REC += ${APP_SRCDIRS_REC} -CC = ${CXX} -IN_CFLAGS += -std=c++98 -O0 -g3 -pedantic -Wall -#--- - -# Create rules -include ${RUNTIME_ROOTDIR}/buildTools/Makefile.mk
\ No newline at end of file diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/buckminster.cspec b/tests/org.eclipse.etrice.generator.cpp.tests/buckminster.cspec deleted file mode 100644 index 39f8c66f3..000000000 --- a/tests/org.eclipse.etrice.generator.cpp.tests/buckminster.cspec +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.generator.cpp.tests" componentType="buckminster" version="0.5.0.qualifier"> - <cs:actions> - <cs:public name="run_tests" actor="ant"> - <cs:actorProperties> - <cs:property key="buildFile" value="make.xml"/> - <cs:property key="targets" value="all"/> - </cs:actorProperties> - </cs:public> - </cs:actions> -</cs:cspec> diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle b/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle index 1860582d3..aede47920 100644 --- a/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle +++ b/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle @@ -2,7 +2,7 @@ plugins { id 'cpp' } -apply from: etTest +apply from: "$rootDir/gradle/etTest.gradle" def genericPhysical = '../org.eclipse.etrice.generator.common.tests/models/GenericPhysical.etphys' diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/make.xml b/tests/org.eclipse.etrice.generator.cpp.tests/make.xml deleted file mode 100644 index af3fe27d6..000000000 --- a/tests/org.eclipse.etrice.generator.cpp.tests/make.xml +++ /dev/null @@ -1,122 +0,0 @@ -<?xml version="1.0"?> -<!-- - Ant makefile for building and running of tests. - - Includes common.xml from org.eclipse.etrice.generator.common.tests ---> -<project name="org.eclipse.etrice.generator.cpp.tests" basedir="." default="all"> - - <!-- <target name="testing" depends="setVars,common.testing"> - - // add test here, testid==testSuiteFileName - <echo>done with ${ant.project.name}</echo> - </target> --> - - <target name="testing" depends="copyModels"> - <!-- modified target from common.xml because cpp is not complete yet --> - <test testid="SendingDataTestCpp" models="${models.path}/sendingData/SendingDataTestCpp.room ${models.path}/GenericPhysical.etphys" /> - <test testid="CompileTests" models="${models.path}/CompileTests.room ${models.path}/GenericPhysical.etphys ${models.path}/DetailExpressionTest.room ${models.path}/StatemachineInterfaceTest.room ${models.path}/StatemachineInterfaceInheritedTest.room ${models.path}/StatemachineInterfaceTest.room ${models.path}/ContinuationTransitionTest.room ${models.path}/TimingService.room" /> - <test testid="ActorCommunicationTest" models="${models.path}/ActorCommunicationTest.room ${models.path}/GenericPhysical.etphys ${models.path}/TimingService.room" /> - <test testid="ChoicePointTest" models="${models.path}/ChoicePointTest.room ${models.path}/GenericPhysical.etphys" /> - <test testid="ChoicePointTestExtended" models="${models.path}/ChoicePointTestExtended.room ${models.path}/GenericPhysical.etphys" /> - <test testid="DataDrivenTest" models="${models.path}/DataDrivenTest.room ${models.path}/GenericPhysical.etphys ${models.path}/TimingService.room" /> - <test testid="HandlerTest" models="${models.path}/HandlerTest.room ${models.path}/GenericPhysical.etphys" /> - <test testid="OperationInheritanceTest" models="${models.path}/OperationInheritanceTest.room ${models.path}/GenericPhysical.etphys" /> - <test testid="PingPongThreadTest" models="${models.path}/PingPongThreadTest.etmap ${models.path}/PingPongThreadTest.room ${models.path}/TimingService.room" /> - <test testid="PingPongThreadReplPortTest" models="${models.path}/PingPongThreadReplPortTest.etmap ${models.path}/PingPongThreadReplPortTest.room ${models.path}/TimingService.room" /> - <test testid="InitializationTest" models="${models.path}/InitializationTest.room ${models.path}/GenericPhysical.etphys" /> - </target> - - <target name="copyModels" depends="common.copyModels"> - <copy todir="${models.path}"> - <fileset dir="./targetModels"/> - </copy> - <!--<move file="${models.path}/staticConfig/StaticConfigTest_C.room" toFile="${models.path}/staticConfig//StaticConfigTest.room" />--> - </target> - - <!-- ################################################################ --> - - <import file="../org.eclipse.etrice.generator.common.tests/common.xml" as="common"/> - - <property name="runtime.path" value="../../runtime/org.eclipse.etrice.runtime.c" /> - <property name="modellib.path" value="../../runtime/org.eclipse.etrice.modellib.cpp" /> - <property name="cpp-runtime.path" value="../../runtime/org.eclipse.etrice.runtime.cpp" /> - - <target name="set_local_rt" unless="runtime.platform"> - <!--<property name="runtime.platform" value="MT_POSIX_GENERIC_GCC"/>--> - <property name="runtime.platform" value="MT_WIN_MinGW"/> - <echo> runtime.platform = ${runtime.platform} </echo> - </target> - <target name="setVars" depends="set_local_rt,common.setVars"/> - - <target name="all" depends="clean,copyModels,testing"></target> - - <!-- test := generate 1 executable, build, run, process results --> - <macrodef name="test"> - <attribute name="testId"/> - <attribute name="models"/> - <sequential> - <echo>generating @{testId}</echo> - <standaloneGenerator testId="@{testId}" models="@{models}"/> - - <echo>building @{testId}</echo> - <build testId="@{testId}"/> - - <echo>running @{testId}</echo> - <run testId="@{testId}"/> - - <echo>converting @{testId}</echo> - <convert testId="@{testId}"/> - - <echo>copying result @{testId}</echo> - <copyResult testId="@{testId}" targetId="CPP_${runtime.platform}_"/> - </sequential> - </macrodef> - - <macrodef name="standaloneGenerator"> - <attribute name="testId"/> - <attribute name="models"/> - <sequential> - <mkdir dir="${output}"/> - <java output="${output}/@{testId}_generate.txt" error="${output}/@{testId}_generate_err.txt" classname="org.eclipse.etrice.generator.cpp.Main" fork="true" failonerror="true"> - <arg line="@{models}"/> - <arg value="-genDir"/><arg value="src-gen/@{testId}"/> - <arg value="-msc_instr"/> - <classpath refid="etrice.clspath"/> - </java> - </sequential> - </macrodef> - - <!-- - build: compiles and links the generated Cpp sources - --> - <macrodef name="build"> - <attribute name="testId"/> - <sequential> - <mkdir dir="${bin.path}"/> - <mkdir dir="${output}"/> - <exec executable="make" failonerror="true" output="${output}/@{testId}_build.txt"> - <arg line="all"/> - <arg line="APP_TARGET=@{testId}.exe"/> - <arg line="APP_BUILD_DIR=${bin.path}"/> - <arg line="APP_SRCDIRS_REC='./src-gen/@{testId} ./src/@{testId}'"/> - <arg line="RUNTIME_ROOTDIR=${runtime.path}"/> - <arg line="CPP_RUNTIME_ROOTDIR=${cpp-runtime.path}"/> - <arg line="MODELLIB_ROOTDIR=${modellib.path}"/> - <arg line="TARGET_PLATFORM=${runtime.platform}"/> - </exec> - </sequential> - </macrodef> - - <macrodef name="run"> - <attribute name="testId"/> - <sequential> - <mkdir dir="${output}"/> - <mkdir dir="${testlog.path}"/> - <exec dir="./" output="${output}/@{testId}_run.txt" resolveexecutable="true" executable="${bin.path}/@{testId}.exe" timeout="${run.msTimout}"> - <arg value="-run_as_test"/> - </exec> - </sequential> - </macrodef> - -</project> diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/org.eclipse.etrice.generator.cpp.tests make.xml.launch b/tests/org.eclipse.etrice.generator.cpp.tests/org.eclipse.etrice.generator.cpp.tests make.xml.launch deleted file mode 100644 index 6849d0869..000000000 --- a/tests/org.eclipse.etrice.generator.cpp.tests/org.eclipse.etrice.generator.cpp.tests make.xml.launch +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType"> -<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.etrice.generator.cpp.tests/make.xml"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> -<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.generator.cpp.tests"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES"> -<mapEntry key="eclipse.home" value="${eclipse_home}"/> -<mapEntry key="eclipse.pdebuild.home" value="${target_platform_plugin_location:org.eclipse.pde.build}"/> -<mapEntry key="eclipse.pdebuild.scripts" value="${target_platform_plugin_location:org.eclipse.pde.build}/scripts/"/> -<mapEntry key="eclipse.pdebuild.templates" value="${target_platform_plugin_location:org.eclipse.pde.build}/templates/"/> -<mapEntry key="eclipse.running" value="true"/> -<mapEntry key="com.google.guava" value="${target_platform_plugin_location:com.google.guava}"/> -<mapEntry key="com.google.inject" value="${target_platform_plugin_location:com.google.inject}"/> -<mapEntry key="javax.inject" value="${target_platform_plugin_location:javax.inject}"/> -<mapEntry key="org.antlr.runtime" value="${target_platform_plugin_location:org.antlr.runtime}"/> -<mapEntry key="org.apache.log4j" value="${target_platform_plugin_location:org.apache.log4j}"/> -<mapEntry key="org.eclipse.emf.common" value="${target_platform_plugin_location:org.eclipse.emf.common}"/> -<mapEntry key="org.eclipse.emf.ecore" value="${target_platform_plugin_location:org.eclipse.emf.ecore}"/> -<mapEntry key="org.eclipse.emf.ecore.xmi" value="${target_platform_plugin_location:org.eclipse.emf.ecore.xmi}"/> -<mapEntry key="org.eclipse.equinox.common" value="${target_platform_plugin_location:org.eclipse.equinox.common}"/> -<mapEntry key="org.eclipse.xtend.lib" value="${target_platform_plugin_location:org.eclipse.xtend.lib}"/> -<mapEntry key="org.eclipse.xtext" value="${target_platform_plugin_location:org.eclipse.xtext}"/> -<mapEntry key="org.eclipse.xtext.common.types" value="${target_platform_plugin_location:org.eclipse.xtext.common.types}"/> -<mapEntry key="org.eclipse.xtext.util" value="${target_platform_plugin_location:org.eclipse.xtext.util}"/> -<mapEntry key="org.eclipse.xtext.xbase.lib" value="${target_platform_plugin_location:org.eclipse.xtext.xbase.lib}"/> -</mapAttribute> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.etrice.generator.cpp.tests/make.xml}"/> -<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> -</launchConfiguration> diff --git a/tests/org.eclipse.etrice.generator.java.tests/buckminster.cspec b/tests/org.eclipse.etrice.generator.java.tests/buckminster.cspec deleted file mode 100644 index b4b3128c9..000000000 --- a/tests/org.eclipse.etrice.generator.java.tests/buckminster.cspec +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.generator.java.tests" componentType="buckminster" version="0.5.0.qualifier"> - <cs:actions> - <cs:public name="run_tests" actor="ant"> - <cs:actorProperties> - <cs:property key="buildFile" value="make.xml"/> - <cs:property key="targets" value="all"/> - </cs:actorProperties> - </cs:public> - </cs:actions> -</cs:cspec> diff --git a/tests/org.eclipse.etrice.generator.java.tests/build.gradle b/tests/org.eclipse.etrice.generator.java.tests/build.gradle index 006dc073d..0c8b984e7 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/build.gradle +++ b/tests/org.eclipse.etrice.generator.java.tests/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java-base' } -apply from: etTest +apply from: "$rootDir/gradle/etTest.gradle" def genericPhysical = '../org.eclipse.etrice.generator.common.tests/models/GenericPhysical.etphys' diff --git a/tests/org.eclipse.etrice.generator.java.tests/make.xml b/tests/org.eclipse.etrice.generator.java.tests/make.xml deleted file mode 100644 index a75d0330c..000000000 --- a/tests/org.eclipse.etrice.generator.java.tests/make.xml +++ /dev/null @@ -1,129 +0,0 @@ -<?xml version="1.0"?> -<!-- - Ant makefile for building and running of tests. - - Includes common.xml from org.eclipse.etrice.generator.common.tests ---> -<project name="org.eclipse.etrice.generator.java.tests" basedir="." default="all"> - - <target name="testing" depends="dynamicActorTests,common.testing"> - - <!-- add test here, testid==testSuiteFileName --> - <test testid="SendingDataTestJava" models="${models.path}/sendingData/SendingDataTestJava.room ${models.path}/GenericPhysical.etphys" /> - <test testid="TCPTest" models="${models.path}/TCPTest.room ${models.path}/GenericPhysical.etphys ${models.path}/TcpService.room" /> - <test testid="DynamicConfigTest" models="${models.path}/DynamicConfigTest.etmap ${models.path}/DynamicConfigTest.room ${models.path}/DynamicConfigTest.config ${models.path}/TimingService.room"/> - <test testid="StaticConfigTest" models="${models.path}/staticConfig/StaticConfigTest.etmap ${models.path}/staticConfig/StaticConfigTest.room ${models.path}/staticConfig/StaticConfigTest.config ${models.path}/TimingService.room" /> - - <echo>done with ${ant.project.name}</echo> - </target> - - <target name="dynamicActorTests"> - <property name="genOptions" value="-persistable -storeDataObj"/> - - <test testid="DynamicActorTest1" genOptions="${genOptions}" models="${models.path}/DynamicActorTest1.etmap ${models.path}/DynamicActorTest1.room" /> - <test testid="DynamicActorTest2" genOptions="${genOptions}" models="${models.path}/DynamicActorTest2.etmap ${models.path}/DynamicActorTest2.room" /> - <test testid="DynamicActorTest3" genOptions="${genOptions}" models="${models.path}/DynamicActorTest3.room ${models.path}/GenericPhysical.etphys" /> - <test testid="DynamicActorTest4" genOptions="${genOptions}" models="${models.path}/DynamicActorTest4.room ${models.path}/GenericPhysical.etphys" /> - <test testid="DynamicActorTest5" genOptions="${genOptions}" models="${models.path}/DynamicActorTest5.room ${models.path}/GenericPhysical.etphys" /> - <test testid="DynamicActorTest6" genOptions="${genOptions}" models="${models.path}/DynamicActorTest6.room ${models.path}/GenericPhysical.etphys" /> - <test testid="DynamicActorTest7" genOptions="${genOptions}" models="${models.path}/DynamicActorTest7.etmap ${models.path}/DynamicActorTest7.room" /> - <test testid="StoreRestore" genOptions="${genOptions}" models="${models.path}/StoreRestore.room ${models.path}/GenericPhysical.etphys" /> - </target> - - <target name="copyModels" depends="common.copyModels"> - <copy todir="${models.path}"> - <fileset dir="./targetModels"/> - </copy> - <move file="${models.path}/staticConfig/StaticConfigTest_Java.room" toFile="${models.path}/staticConfig//StaticConfigTest.room" /> - </target> - - <!-- ################################################################ --> - - <import file="../org.eclipse.etrice.generator.common.tests/common.xml" as="common"/> - - <property name="modellib.path" value="../../runtime/org.eclipse.etrice.modellib.java" /> - <property name="runtime.path" value="../../runtime/org.eclipse.etrice.runtime.java" /> - - <target name="all" depends="clean,copyModels,testing"/> - - <!-- test := generate 1 executable, build, run, process results --> - <macrodef name="test"> - <attribute name="testId"/> - <attribute name="models"/> - <attribute name="genOptions" default=""/> - <sequential> - <standaloneGenerator testId="@{testId}" models="@{models}" genOptions="@{genOptions}"/> - <build testId="@{testId}"/> - <run testId="@{testId}"/> - <convert testId="@{testId}"/> - <copyResult testId="@{testId}" targetId="Java_"/> - </sequential> - </macrodef> - - <macrodef name="standaloneGenerator"> - <attribute name="testId"/> - <attribute name="models"/> - <attribute name="genOptions" default=""/> - <sequential> - <mkdir dir="${output}"/> - <java output="${output}/generate.txt" error="${output}/generate_err.txt" classname="org.eclipse.etrice.generator.java.Main" fork="true" failonerror="true"> - <arg line="@{models}"/> - <arg value="-genDir"/><arg value="src-gen/@{testId}"/> - <arg value="-msc_instr" /> - <arg line="@{genOptions}" /> - <classpath refid="etrice.clspath" /> - </java> - </sequential> - </macrodef> - - <!-- - compile: compiles the generated Java sources - --> - <macrodef name="build"> - <attribute name="testId"/> - <sequential> - <mkdir dir="${bin.path}/@{testId}" /> - <!-- ./src/xxx is optional, create it anyway to avoid error --> - <mkdir dir="./src/@{testId}" /> - <record name="${basedir}/output/compile.txt" action="start"/> - <javac destdir="${bin.path}/@{testId}" source="1.6" classpath="${runtime.path}/target/classes" debug="off" verbose="off"> - <src> - <pathelement location="src-gen/@{testId}" /> - <pathelement location="src/@{testId}" /> - </src> - </javac> - <record name="${basedir}/output/compile.txt" action="stop"/> - </sequential> - </macrodef> - - <!-- - run: runs all executables - --> - <macrodef name="run"> - <attribute name="testId"/> - <sequential> - <mkdir dir="${testlog.path}" /> - <!-- get runner class --> - <local name="runner.class"/> - <fileset id="runnerFileSet" dir="./src-gen/@{testId}"> - <include name="**/*Runner.java"/> - </fileset> - <pathconvert property="runner.class"> - <string>${toString:runnerFileSet}</string> - <chainedmapper> - <globmapper from="*.java" to="*"/> - <packagemapper from="*" to="*"/> - </chainedmapper> - </pathconvert> - <!--<echo>path of runner.java: ${toString:runnerFileSet}</echo> - <echo>runner path converted to class: ${runner.class}</echo>--> - - <echo>run @{testId}</echo> - <java output="${output}/run@{testId}.txt" classname="${runner.class}" fork="true" failonerror="true" timeout="${run.msTimout}"> - <arg value="-run_as_test" /> - <classpath path="./bin/@{testId};${runtime.path}/target/classes;" /> - </java> - </sequential> - </macrodef> - -</project> diff --git a/tests/org.eclipse.etrice.generator.java.tests/org.eclipse.etrice.generator.java.tests make.xml.launch b/tests/org.eclipse.etrice.generator.java.tests/org.eclipse.etrice.generator.java.tests make.xml.launch deleted file mode 100644 index 7ad38f90f..000000000 --- a/tests/org.eclipse.etrice.generator.java.tests/org.eclipse.etrice.generator.java.tests make.xml.launch +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType"> -<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> -<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.etrice.generator.java.tests/make.xml"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> -<listEntry value="org.eclipse.ui.externaltools.launchGroup"/> -</listAttribute> -<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.generator.java.tests"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.etrice.generator.java.tests/make.xml}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-v"/> -<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> -<mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES"> -<mapEntry key="eclipse.home" value="${eclipse_home}"/> -<mapEntry key="eclipse.pdebuild.home" value="${target_platform_plugin_location:org.eclipse.pde.build}"/> -<mapEntry key="eclipse.pdebuild.scripts" value="${target_platform_plugin_location:org.eclipse.pde.build}/scripts/"/> -<mapEntry key="eclipse.pdebuild.templates" value="${target_platform_plugin_location:org.eclipse.pde.build}/templates/"/> -<mapEntry key="eclipse.running" value="true"/> -<mapEntry key="com.google.guava" value="${target_platform_plugin_location:com.google.guava}"/> -<mapEntry key="com.google.inject" value="${target_platform_plugin_location:com.google.inject}"/> -<mapEntry key="javax.inject" value="${target_platform_plugin_location:javax.inject}"/> -<mapEntry key="org.antlr.runtime" value="${target_platform_plugin_location:org.antlr.runtime}"/> -<mapEntry key="org.apache.log4j" value="${target_platform_plugin_location:org.apache.log4j}"/> -<mapEntry key="org.eclipse.emf.common" value="${target_platform_plugin_location:org.eclipse.emf.common}"/> -<mapEntry key="org.eclipse.emf.ecore" value="${target_platform_plugin_location:org.eclipse.emf.ecore}"/> -<mapEntry key="org.eclipse.emf.ecore.xmi" value="${target_platform_plugin_location:org.eclipse.emf.ecore.xmi}"/> -<mapEntry key="org.eclipse.equinox.common" value="${target_platform_plugin_location:org.eclipse.equinox.common}"/> -<mapEntry key="org.eclipse.xtend.lib" value="${target_platform_plugin_location:org.eclipse.xtend.lib}"/> -<mapEntry key="org.eclipse.xtext" value="${target_platform_plugin_location:org.eclipse.xtext}"/> -<mapEntry key="org.eclipse.xtext.common.types" value="${target_platform_plugin_location:org.eclipse.xtext.common.types}"/> -<mapEntry key="org.eclipse.xtext.util" value="${target_platform_plugin_location:org.eclipse.xtext.util}"/> -<mapEntry key="org.eclipse.xtext.xbase.lib" value="${target_platform_plugin_location:org.eclipse.xtext.xbase.lib}"/> -</mapAttribute> -</launchConfiguration> diff --git a/tests/org.eclipse.etrice.runtime.c.tests/Makefile b/tests/org.eclipse.etrice.runtime.c.tests/Makefile deleted file mode 100644 index 1f9507676..000000000 --- a/tests/org.eclipse.etrice.runtime.c.tests/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# for make.xml -include ${RUNTIME_ROOTDIR}/buildTools/runtime.mk - -# --- -IN_TARGET := $(notdir $(shell pwd)).exe -IN_BUILD_DIR := ./bin -IN_INCDIRS += ./src -IN_SRCDIRS_REC += ./src -#--- - - -# Create rules -include ${RUNTIME_ROOTDIR}/buildTools/Makefile.mk
\ No newline at end of file diff --git a/tests/org.eclipse.etrice.runtime.c.tests/buckminster.cspec b/tests/org.eclipse.etrice.runtime.c.tests/buckminster.cspec deleted file mode 100644 index f803be39c..000000000 --- a/tests/org.eclipse.etrice.runtime.c.tests/buckminster.cspec +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.runtime.c.tests" componentType="buckminster" version="0.5.0.qualifier"> - <cs:actions> - <cs:public name="run_tests" actor="ant"> - <cs:actorProperties> - <cs:property key="buildFile" value="make.xml"/> - <cs:property key="targets" value="all"/> - </cs:actorProperties> - </cs:public> - </cs:actions> -</cs:cspec> diff --git a/tests/org.eclipse.etrice.runtime.c.tests/build.gradle b/tests/org.eclipse.etrice.runtime.c.tests/build.gradle index 1321f31f4..32ebe4192 100644 --- a/tests/org.eclipse.etrice.runtime.c.tests/build.gradle +++ b/tests/org.eclipse.etrice.runtime.c.tests/build.gradle @@ -4,7 +4,7 @@ plugins { id 'c' } -apply from: etUnitConverter +apply from: "$rootDir/gradle/etUnitConverter.gradle" model { components { diff --git a/tests/org.eclipse.etrice.runtime.c.tests/make.xml b/tests/org.eclipse.etrice.runtime.c.tests/make.xml deleted file mode 100644 index a37d667b1..000000000 --- a/tests/org.eclipse.etrice.runtime.c.tests/make.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0"?> -<!-- - Ant makefile for building and running of tests. - This includes conversion of the etunit - results into xunit xml. - - @author Henrik Rentz-Reichert ---> -<project name="org.eclipse.etrice.runtime.c.tests" basedir="." default="all"> - - <import file="../org.eclipse.etrice.generator.common.tests/common.xml" as="common"/> - - <property name="runtime.path" value="../../runtime/org.eclipse.etrice.runtime.c" /> - - <target name="set_local_rt" unless="runtime.platform"> - <!-- <property name="runtime.platform" value="MT_POSIX_GENERIC_GCC"/> --> - <property name="runtime.platform" value="MT_WIN_MinGW"/> - <echo> runtime.platform = ${runtime.platform} </echo> - </target> - <target name="setVars" depends="set_local_rt,common.setVars"/> - - <!-- - all: compiles, runs, converts and copies the results - --> - <target name="all" depends="convert,copy_results"> - <echo>done with ${ant.project.name}</echo> - </target> - - <!-- - build: compiles and link everything - --> - <target name="build" depends="setVars,clean"> - <mkdir dir="${output}"/> - <mkdir dir="${bin.path}"/> - <exec executable="make" failonerror="true" output="${output}/build.txt"> - <arg line="all"/> - <arg line="RUNTIME_ROOTDIR=${runtime.path}"/> - <arg line="TARGET_PLATFORM=${runtime.platform}"/> - </exec> - </target> - - <!-- - run: runs all executables - --> - <target name="run" depends="build"> - <mkdir dir="${testlog.path}"/> - <echo>start RuntimeTest</echo> - <exec resolveexecutable="true" executable="${bin.path}/${ant.project.name}.exe" output="${output}/run.txt" /> - <echo>end RuntimeTest</echo> - </target> - - <!-- - convert: converts etu- into xunit xml-format - --> - <target name="convert" depends="run"> - <convertPre testId="TestEtUnitSpecial"/> - <convertPre testId="TestCRuntime"/> - </target> - - <!-- - copy_results: copies the *.xml results to their final destination - --> - <target name="copy_results" depends="setVars"> - <copyResult testId="TestEtUnitSpecial" targetid="${runtime.platform}_"/> - <copyResult testId="TestCRuntime" targetid="${runtime.platform}_"/> - </target> - -</project> diff --git a/tests/org.eclipse.etrice.runtime.c.tests/org.eclipse.etrice.runtime.c.tests make.xml.launch b/tests/org.eclipse.etrice.runtime.c.tests/org.eclipse.etrice.runtime.c.tests make.xml.launch deleted file mode 100644 index 37fbb50c8..000000000 --- a/tests/org.eclipse.etrice.runtime.c.tests/org.eclipse.etrice.runtime.c.tests make.xml.launch +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType"> -<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.etrice.runtime.c.tests/make.xml"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> -<listEntry value="org.eclipse.ui.externaltools.launchGroup"/> -</listAttribute> -<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.runtime.c.tests"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES"> -<mapEntry key="eclipse.home" value="${eclipse_home}"/> -<mapEntry key="eclipse.pdebuild.home" value="${target_platform_plugin_location:org.eclipse.pde.build}"/> -<mapEntry key="eclipse.pdebuild.scripts" value="${target_platform_plugin_location:org.eclipse.pde.build}/scripts/"/> -<mapEntry key="eclipse.pdebuild.templates" value="${target_platform_plugin_location:org.eclipse.pde.build}/templates/"/> -<mapEntry key="eclipse.running" value="true"/> -<mapEntry key="com.google.guava" value="${target_platform_plugin_location:com.google.guava}"/> -<mapEntry key="com.google.inject" value="${target_platform_plugin_location:com.google.inject}"/> -<mapEntry key="javax.inject" value="${target_platform_plugin_location:javax.inject}"/> -<mapEntry key="org.antlr.runtime" value="${target_platform_plugin_location:org.antlr.runtime}"/> -<mapEntry key="org.apache.log4j" value="${target_platform_plugin_location:org.apache.log4j}"/> -<mapEntry key="org.eclipse.emf.common" value="${target_platform_plugin_location:org.eclipse.emf.common}"/> -<mapEntry key="org.eclipse.emf.ecore" value="${target_platform_plugin_location:org.eclipse.emf.ecore}"/> -<mapEntry key="org.eclipse.emf.ecore.xmi" value="${target_platform_plugin_location:org.eclipse.emf.ecore.xmi}"/> -<mapEntry key="org.eclipse.equinox.common" value="${target_platform_plugin_location:org.eclipse.equinox.common}"/> -<mapEntry key="org.eclipse.xtend.lib" value="${target_platform_plugin_location:org.eclipse.xtend.lib}"/> -<mapEntry key="org.eclipse.xtext" value="${target_platform_plugin_location:org.eclipse.xtext}"/> -<mapEntry key="org.eclipse.xtext.common.types" value="${target_platform_plugin_location:org.eclipse.xtext.common.types}"/> -<mapEntry key="org.eclipse.xtext.util" value="${target_platform_plugin_location:org.eclipse.xtext.util}"/> -<mapEntry key="org.eclipse.xtext.xbase.lib" value="${target_platform_plugin_location:org.eclipse.xtext.xbase.lib}"/> -</mapAttribute> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.etrice.runtime.c.tests/make.xml}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-v"/> -<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> -</launchConfiguration> diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/Makefile b/tests/org.eclipse.etrice.runtime.cpp.tests/Makefile deleted file mode 100644 index 6d6a9607b..000000000 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -include ${CPP_RUNTIME_ROOTDIR}/buildTools/runtime.mk - -# --- -IN_TARGET := $(notdir $(shell pwd)).exe -IN_BUILD_DIR := ./bin -IN_INCDIRS += ./src -IN_SRCDIRS_REC += ./src -CC = ${CXX} -IN_CFLAGS += -std=c++98 -O0 -g3 -pedantic -Wall -#--- - - -# Create rules -include ${RUNTIME_ROOTDIR}/buildTools/Makefile.mk diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/buckminster.cspec b/tests/org.eclipse.etrice.runtime.cpp.tests/buckminster.cspec deleted file mode 100644 index 74fcad21d..000000000 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/buckminster.cspec +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.runtime.cpp.tests" componentType="buckminster" version="0.5.0.qualifier"> - <cs:actions> - <cs:public name="run_tests" actor="ant"> - <cs:actorProperties> - <cs:property key="buildFile" value="make.xml"/> - <cs:property key="targets" value="all"/> - </cs:actorProperties> - </cs:public> - </cs:actions> -</cs:cspec> diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle b/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle index f4a919d3e..c3bcbb50b 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle @@ -4,7 +4,7 @@ plugins { id 'cpp' } -apply from: etUnitConverter +apply from: "$rootDir/gradle/etUnitConverter.gradle" model { components { diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/make.xml b/tests/org.eclipse.etrice.runtime.cpp.tests/make.xml deleted file mode 100644 index e8c7725d1..000000000 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/make.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0"?> -<!-- - Ant makefile for building and running of tests. - This includes conversion of the etunit - results into xunit xml. - - @author Henrik Rentz-Reichert ---> -<project name="org.eclipse.etrice.runtime.cpp.tests" basedir="." default="all"> - - <import file="../org.eclipse.etrice.generator.common.tests/common.xml" as="common"/> - - <property name="runtime.path" value="../../runtime/org.eclipse.etrice.runtime.c" /> - <property name="cpp-runtime.path" value="../../runtime/org.eclipse.etrice.runtime.cpp" /> - - <target name="set_local_rt" unless="runtime.platform"> - <!-- <property name="runtime.platform" value="MT_POSIX_GENERIC_GCC"/> --> - <property name="runtime.platform" value="MT_WIN_MinGW"/> - <echo> runtime.platform = ${runtime.platform} </echo> - </target> - <target name="setVars" depends="set_local_rt,common.setVars"/> - - <!-- - all: compiles, runs, converts and copies the results - --> - <target name="all" depends="convert,copy_results"> - <echo>done with ${ant.project.name}</echo> - </target> - - <!-- - build: compiles and link everything - --> - <target name="build" depends="setVars,clean"> - <mkdir dir="${output}"/> - <mkdir dir="${bin.path}"/> - <exec executable="make" failonerror="true" output="${output}/build.txt"> - <arg line="all"/> - <arg line="RUNTIME_ROOTDIR=${runtime.path}"/> - <arg line="TARGET_PLATFORM=${runtime.platform}"/> - <arg line="CPP_RUNTIME_ROOTDIR=${cpp-runtime.path}"/> - </exec> - </target> - - <!-- - run: runs all executables - --> - <target name="run" depends="build"> - <mkdir dir="${testlog.path}"/> - <echo>start RuntimeTest</echo> - <exec resolveexecutable="true" executable="${bin.path}/${ant.project.name}.exe" output="${output}/run.txt" /> - <echo>end RuntimeTest</echo> - </target> - - <!-- - convert: converts etu- into xunit xml-format - --> - <target name="convert" depends="run"> - <convertPre testId="TestCppRuntime"/> - </target> - - <!-- - copy_results: copies the *.xml results to their final destination - --> - <target name="copy_results" depends="setVars"> - <copyResult testId="TestCppRuntime" targetid="${runtime.platform}_"/> - </target> - -</project> diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/org.eclipse.etrice.runtime.cpp.tests make.xml.launch b/tests/org.eclipse.etrice.runtime.cpp.tests/org.eclipse.etrice.runtime.cpp.tests make.xml.launch deleted file mode 100644 index 8d344f97e..000000000 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/org.eclipse.etrice.runtime.cpp.tests make.xml.launch +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType"> -<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> -<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.etrice.runtime.cpp.tests/make.xml"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> -<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.runtime.cpp.tests"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES"> -<mapEntry key="eclipse.home" value="${eclipse_home}"/> -<mapEntry key="eclipse.pdebuild.home" value="${target_platform_plugin_location:org.eclipse.pde.build}"/> -<mapEntry key="eclipse.pdebuild.scripts" value="${target_platform_plugin_location:org.eclipse.pde.build}/scripts/"/> -<mapEntry key="eclipse.pdebuild.templates" value="${target_platform_plugin_location:org.eclipse.pde.build}/templates/"/> -<mapEntry key="eclipse.running" value="true"/> -<mapEntry key="com.google.guava" value="${target_platform_plugin_location:com.google.guava}"/> -<mapEntry key="com.google.inject" value="${target_platform_plugin_location:com.google.inject}"/> -<mapEntry key="javax.inject" value="${target_platform_plugin_location:javax.inject}"/> -<mapEntry key="org.antlr.runtime" value="${target_platform_plugin_location:org.antlr.runtime}"/> -<mapEntry key="org.apache.log4j" value="${target_platform_plugin_location:org.apache.log4j}"/> -<mapEntry key="org.eclipse.emf.common" value="${target_platform_plugin_location:org.eclipse.emf.common}"/> -<mapEntry key="org.eclipse.emf.ecore" value="${target_platform_plugin_location:org.eclipse.emf.ecore}"/> -<mapEntry key="org.eclipse.emf.ecore.xmi" value="${target_platform_plugin_location:org.eclipse.emf.ecore.xmi}"/> -<mapEntry key="org.eclipse.equinox.common" value="${target_platform_plugin_location:org.eclipse.equinox.common}"/> -<mapEntry key="org.eclipse.xtend.lib" value="${target_platform_plugin_location:org.eclipse.xtend.lib}"/> -<mapEntry key="org.eclipse.xtext" value="${target_platform_plugin_location:org.eclipse.xtext}"/> -<mapEntry key="org.eclipse.xtext.common.types" value="${target_platform_plugin_location:org.eclipse.xtext.common.types}"/> -<mapEntry key="org.eclipse.xtext.util" value="${target_platform_plugin_location:org.eclipse.xtext.util}"/> -<mapEntry key="org.eclipse.xtext.xbase.lib" value="${target_platform_plugin_location:org.eclipse.xtext.xbase.lib}"/> -</mapAttribute> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.etrice.runtime.cpp.tests/make.xml}"/> -<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> -</launchConfiguration> diff --git a/tests/org.eclipse.etrice.runtime.java.tests/buckminster.cspec b/tests/org.eclipse.etrice.runtime.java.tests/buckminster.cspec deleted file mode 100644 index c02254993..000000000 --- a/tests/org.eclipse.etrice.runtime.java.tests/buckminster.cspec +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.runtime.java.tests" componentType="buckminster" version="0.5.0.qualifier"> - <cs:dependencies> - <cs:dependency name="org.eclipse.etrice.runtime.java" componentType="buckminster"/> - </cs:dependencies> -</cs:cspec> diff --git a/tests/pom.xml b/tests/pom.xml index 9ee1ea0a3..4376835cb 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,12 +6,11 @@ <parent> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../releng/org.eclipse.etrice.parent</relativePath> </parent> <groupId>org.eclipse.etrice</groupId> <artifactId>org.eclipse.etrice.tests</artifactId> - <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <build> |