From 40b8e1b05c6008c71a3cc7e17e8bb232b6882b9f Mon Sep 17 00:00:00 2001
From: Henrik Rentz-Reichert
Date: Wed, 4 Jan 2017 12:56:09 +0100
Subject: Bug 509924 - adjust generator export to Neon.2

Change-Id: I666bf8f6a1d552722826a176ff23199f1f1c27dd
---
 .../export_c_generator.xml                         | 121 +++++++++++----------
 .../export_cpp_generator.xml                       | 121 ++++++++++-----------
 .../export_java_generator.xml                      | 117 ++++++++++----------
 3 files changed, 180 insertions(+), 179 deletions(-)

diff --git a/plugins/org.eclipse.etrice.generator.c/export_c_generator.xml b/plugins/org.eclipse.etrice.generator.c/export_c_generator.xml
index de173e89e..603266ef5 100644
--- a/plugins/org.eclipse.etrice.generator.c/export_c_generator.xml
+++ b/plugins/org.eclipse.etrice.generator.c/export_c_generator.xml
@@ -26,11 +26,11 @@
     <!--this file was created by Eclipse Runnable JAR Export Wizard-->
     <!--ANT 1.7 is required                                        -->
     <!--define folder properties-->
-    <target name="create_run_jar" depends="testProps">
-        <jar destfile="${export_destination}/org.eclipse.etrice.generator.c.jar">
+    <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=". org.eclipse.etrice.generator.c_lib/org.eclipse.xtext_2.10.0.v201605250459.jar org.eclipse.etrice.generator.c_lib/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar org.eclipse.etrice.generator.c_lib/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar org.eclipse.etrice.generator.c_lib/org.eclipse.emf.common_2.12.0.v20160420-0247.jar org.eclipse.etrice.generator.c_lib/org.antlr.runtime_3.2.0.v201101311130.jar org.eclipse.etrice.generator.c_lib/com.google.inject_3.0.0.v201605172100.jar org.eclipse.etrice.generator.c_lib/org.eclipse.emf.mwe.core_1.3.20.v201605261103.jar org.eclipse.etrice.generator.c_lib/org.apache.commons.cli_1.2.0.v201404270220.jar org.eclipse.etrice.generator.c_lib/org.eclipse.emf.mwe2.runtime_2.9.0.v201605261103.jar org.eclipse.etrice.generator.c_lib/org.eclipse.emf.mwe.utils_1.3.20.v201605261103.jar org.eclipse.etrice.generator.c_lib/org.eclipse.xtext.util_2.10.0.v201605250459.jar org.eclipse.etrice.generator.c_lib/com.google.guava_15.0.0.v201403281430.jar org.eclipse.etrice.generator.c_lib/javax.inject_1.0.0.v20091030.jar org.eclipse.etrice.generator.c_lib/org.eclipse.xtext.xbase_2.10.0.v201605250459.jar org.eclipse.etrice.generator.c_lib/org.eclipse.xtext.common.types_2.10.0.v201605250459.jar org.eclipse.etrice.generator.c_lib/org.eclipse.xtend.lib_2.10.0.v201605250459.jar org.eclipse.etrice.generator.c_lib/org.eclipse.xtext.xbase.lib_2.10.0.v201605250459.jar org.eclipse.etrice.generator.c_lib/org.eclipse.xtend.lib.macro_2.10.0.v201605250459.jar org.eclipse.etrice.generator.c_lib/org.eclipse.xtext.generator_2.10.0.v201605250459.jar org.eclipse.etrice.generator.c_lib/org.eclipse.xtext.xtext.generator_2.10.0.v201605250459.jar org.eclipse.etrice.generator.c_lib/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar org.eclipse.etrice.generator.c_lib/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar org.eclipse.etrice.generator.c_lib/org.eclipse.xtend_2.2.0.v201605260315.jar org.eclipse.etrice.generator.c_lib/com.ibm.icu_56.1.0.v201601250100.jar org.eclipse.etrice.generator.c_lib/org.eclipse.xpand_2.2.0.v201605260315.jar org.eclipse.etrice.generator.c_lib/org.eclipse.xtend.typesystem.emf_2.2.0.v201605260315.jar org.eclipse.etrice.generator.c_lib/org.eclipse.emf.mwe2.lib_2.9.0.v201605261103.jar org.eclipse.etrice.generator.c_lib/org.apache.commons.logging_1.1.1.v201101211721.jar org.eclipse.etrice.generator.c_lib/org.eclipse.emf.mwe2.launch_2.9.0.v201605261103.jar org.eclipse.etrice.generator.c_lib/org.eclipse.emf.mwe2.language_2.9.0.v201605261103.jar org.eclipse.etrice.generator.c_lib/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar org.eclipse.etrice.generator.c_lib/org.eclipse.osgi_3.11.1.v20160708-1632.jar org.eclipse.etrice.generator.c_lib/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar org.eclipse.etrice.generator.c_lib/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar org.eclipse.etrice.generator.c_lib/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar org.eclipse.etrice.generator.c_lib/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar org.eclipse.etrice.generator.c_lib/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar org.eclipse.etrice.generator.c_lib/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar org.eclipse.etrice.generator.c_lib/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar org.eclipse.etrice.generator.c_lib/org.eclipse.core.resources_3.11.0.v20160503-1608.jar org.eclipse.etrice.generator.c_lib/org.apache.log4j_1.2.15.v201012070815.jar org.eclipse.etrice.generator.c_lib/org.objectweb.asm_5.0.1.v201404251740.jar org.eclipse.etrice.generator.c_lib/org.eclipse.emf_2.6.0.v20160526-0356.jar org.eclipse.etrice.generator.c_lib/org.apache.commons.io_2.2.0.v201405211200.jar org.eclipse.etrice.generator.c_lib/org.eclipse.ui_3.108.0.v20160518-1929.jar org.eclipse.etrice.generator.c_lib/org.eclipse.swt_3.105.1.v20160907-0248.jar org.eclipse.etrice.generator.c_lib/org.eclipse.jface_3.12.0.v20160518-1929.jar org.eclipse.etrice.generator.c_lib/org.eclipse.core.commands_3.8.0.v20160316-1921.jar org.eclipse.etrice.generator.c_lib/org.eclipse.ui.workbench_3.108.1.v20160819-2118.jar org.eclipse.etrice.generator.c_lib/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar org.eclipse.etrice.generator.c_lib/org.eclipse.ui.ide_3.12.1.v20160823-0925.jar org.eclipse.etrice.generator.c_lib/org.eclipse.ui.views_3.8.101.v20160816-1954.jar"/>
+                <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.fx.osgi_2.4.0.201605100504.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.swt.win32.win32.x86_64_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"/>
@@ -49,62 +49,63 @@
             <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}/org.eclipse.etrice.generator.c_lib"/>
-        <mkdir dir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.antlr.runtime_3.2.0.v201101311130.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/com.google.inject_3.0.0.v201605172100.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe.core_1.3.20.v201605261103.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.apache.commons.cli_1.2.0.v201404270220.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.runtime_2.9.0.v201605261103.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe.utils_1.3.20.v201605261103.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.util_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/com.google.guava_15.0.0.v201403281430.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/javax.inject_1.0.0.v20091030.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.xbase_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.common.types_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtend.lib_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.xbase.lib_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtend.lib.macro_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.generator_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.xtext.generator_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtend_2.2.0.v201605260315.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/com.ibm.icu_56.1.0.v201601250100.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xpand_2.2.0.v201605260315.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtend.typesystem.emf_2.2.0.v201605260315.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.lib_2.9.0.v201605261103.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.launch_2.9.0.v201605261103.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.language_2.9.0.v201605261103.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.osgi_3.11.1.v20160708-1632.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.core.resources_3.11.0.v20160503-1608.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.apache.log4j_1.2.15.v201012070815.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.objectweb.asm_5.0.1.v201404251740.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf_2.6.0.v20160526-0356.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.apache.commons.io_2.2.0.v201405211200.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.ui_3.108.0.v20160518-1929.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.swt_3.105.1.v20160907-0248.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.jface_3.12.0.v20160518-1929.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.core.commands_3.8.0.v20160316-1921.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.ui.workbench_3.108.1.v20160819-2118.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.ui.ide_3.12.1.v20160823-0925.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.ui.views_3.8.101.v20160816-1954.jar" todir="${export_destination}/org.eclipse.etrice.generator.c_lib"/>
-
-    	<zip destfile="${zip_destination}/eTrice-C-generator.zip" basedir="${export_destination}" />
-    	<echo message="created ${zip_destination}/eTrice-C-generator.zip" />
+        <delete dir="${export_destination}/CGenerator_lib"/>
+        <mkdir dir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext_2.10.0.v201605250459.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.antlr.runtime_3.2.0.v201101311130.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/com.google.inject_3.0.0.v201605172100.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe.core_1.3.20.v201605261103.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.apache.commons.cli_1.2.0.v201404270220.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.runtime_2.9.0.v201605261103.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe.utils_1.3.20.v201605261103.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.util_2.10.0.v201605250459.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/com.google.guava_15.0.0.v201403281430.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/javax.inject_1.0.0.v20091030.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.xbase_2.10.0.v201605250459.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.common.types_2.10.0.v201605250459.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtend.lib_2.10.0.v201605250459.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.xbase.lib_2.10.0.v201605250459.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtend.lib.macro_2.10.0.v201605250459.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.generator_2.10.0.v201605250459.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.xtext.generator_2.10.0.v201605250459.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtend_2.2.0.v201605260315.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/com.ibm.icu_56.1.0.v201601250100.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xpand_2.2.0.v201605260315.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtend.typesystem.emf_2.2.0.v201605260315.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.lib_2.9.0.v201605261103.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.launch_2.9.0.v201605261103.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.language_2.9.0.v201605261103.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.osgi_3.11.2.v20161107-1947.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.fx.osgi_2.4.0.201605100504.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.apache.log4j_1.2.15.v201012070815.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.objectweb.asm_5.0.1.v201404251740.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf_2.6.0.v20160526-0356.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.apache.commons.io_2.2.0.v201405211200.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.ui_3.108.1.v20160929-1045.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.swt_3.105.2.v20161122-0613.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.swt.win32.win32.x86_64_3.105.2.v20161122-0613.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.jface_3.12.1.v20160923-1528.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.core.commands_3.8.0.v20160316-1921.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.ui.workbench_3.108.2.v20161025-2029.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.ui.ide_3.12.2.v20161115-1450.jar" todir="${export_destination}/CGenerator_lib"/>
+        <copy 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.cpp/export_cpp_generator.xml b/plugins/org.eclipse.etrice.generator.cpp/export_cpp_generator.xml
index f547f8f2e..885da8f70 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/export_cpp_generator.xml
+++ b/plugins/org.eclipse.etrice.generator.cpp/export_cpp_generator.xml
@@ -3,7 +3,7 @@
 	
 	<!--
 		don't forget to add
-		<zip destfile="${zip_destination}/eTrice-C-generator.zip" basedir="${export_destination}" />
+		<zip destfile="${zip_destination}/eTrice-CPP-generator.zip" basedir="${export_destination}" />
 		as last command
 		
 		<copy failonerror="false" file="
@@ -26,13 +26,11 @@
     <!--this file was created by Eclipse Runnable JAR Export Wizard-->
     <!--ANT 1.7 is required                                        -->
     <!--define folder properties-->
-    <property name="dir.workspace" value="C:/Users/hrentz/EclipseInstallations/etrice-neon/ws"/>
-    <property name="dir.jarfile" value="C:/Users/hrentz/Documents/protos/Entwicklung/protos/eTrice/tmp"/>
-    <target name="create_run_jar" depends="testProps">
-        <jar destfile="${export_destination}/org.eclipse.etrice.generator.cpp.jar">
+    <target name="create_run_jar">
+        <jar destfile="${zip_destination}/CPPGenerator.jar">
             <manifest>
                 <attribute name="Main-Class" value="org.eclipse.etrice.generator.cpp.Main"/>
-                <attribute name="Class-Path" value=". org.eclipse.etrice.generator.cpp_lib/org.eclipse.xtext_2.10.0.v201605250459.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.emf.common_2.12.0.v20160420-0247.jar org.eclipse.etrice.generator.cpp_lib/org.antlr.runtime_3.2.0.v201101311130.jar org.eclipse.etrice.generator.cpp_lib/com.google.inject_3.0.0.v201605172100.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.emf.mwe.core_1.3.20.v201605261103.jar org.eclipse.etrice.generator.cpp_lib/org.apache.commons.cli_1.2.0.v201404270220.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.emf.mwe2.runtime_2.9.0.v201605261103.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.emf.mwe.utils_1.3.20.v201605261103.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.xtext.util_2.10.0.v201605250459.jar org.eclipse.etrice.generator.cpp_lib/com.google.guava_15.0.0.v201403281430.jar org.eclipse.etrice.generator.cpp_lib/javax.inject_1.0.0.v20091030.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.xtext.xbase_2.10.0.v201605250459.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.xtext.common.types_2.10.0.v201605250459.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.xtend.lib_2.10.0.v201605250459.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.xtext.xbase.lib_2.10.0.v201605250459.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.xtend.lib.macro_2.10.0.v201605250459.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.xtext.generator_2.10.0.v201605250459.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.xtext.xtext.generator_2.10.0.v201605250459.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.xtend_2.2.0.v201605260315.jar org.eclipse.etrice.generator.cpp_lib/com.ibm.icu_56.1.0.v201601250100.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.xpand_2.2.0.v201605260315.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.xtend.typesystem.emf_2.2.0.v201605260315.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.emf.mwe2.lib_2.9.0.v201605261103.jar org.eclipse.etrice.generator.cpp_lib/org.apache.commons.logging_1.1.1.v201101211721.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.emf.mwe2.launch_2.9.0.v201605261103.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.emf.mwe2.language_2.9.0.v201605261103.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.osgi_3.11.1.v20160708-1632.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.core.resources_3.11.0.v20160503-1608.jar org.eclipse.etrice.generator.cpp_lib/org.apache.log4j_1.2.15.v201012070815.jar org.eclipse.etrice.generator.cpp_lib/org.objectweb.asm_5.0.1.v201404251740.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.emf_2.6.0.v20160526-0356.jar org.eclipse.etrice.generator.cpp_lib/org.apache.commons.io_2.2.0.v201405211200.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.ui_3.108.0.v20160518-1929.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.swt_3.105.1.v20160907-0248.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.jface_3.12.0.v20160518-1929.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.core.commands_3.8.0.v20160316-1921.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.ui.workbench_3.108.1.v20160819-2118.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.ui.ide_3.12.1.v20160823-0925.jar org.eclipse.etrice.generator.cpp_lib/org.eclipse.ui.views_3.8.101.v20160816-1954.jar"/>
+                <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.fx.osgi_2.4.0.201605100504.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.swt.win32.win32.x86_64_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"/>
@@ -48,61 +46,62 @@
             <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}/org.eclipse.etrice.generator.cpp_lib"/>
-        <mkdir dir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.antlr.runtime_3.2.0.v201101311130.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/com.google.inject_3.0.0.v201605172100.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe.core_1.3.20.v201605261103.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.apache.commons.cli_1.2.0.v201404270220.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.runtime_2.9.0.v201605261103.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe.utils_1.3.20.v201605261103.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.util_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/com.google.guava_15.0.0.v201403281430.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/javax.inject_1.0.0.v20091030.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.xbase_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.common.types_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtend.lib_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.xbase.lib_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtend.lib.macro_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.generator_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.xtext.generator_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtend_2.2.0.v201605260315.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/com.ibm.icu_56.1.0.v201601250100.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xpand_2.2.0.v201605260315.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtend.typesystem.emf_2.2.0.v201605260315.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.lib_2.9.0.v201605261103.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.launch_2.9.0.v201605261103.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.language_2.9.0.v201605261103.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.osgi_3.11.1.v20160708-1632.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.core.resources_3.11.0.v20160503-1608.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.apache.log4j_1.2.15.v201012070815.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.objectweb.asm_5.0.1.v201404251740.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf_2.6.0.v20160526-0356.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.apache.commons.io_2.2.0.v201405211200.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.ui_3.108.0.v20160518-1929.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.swt_3.105.1.v20160907-0248.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.jface_3.12.0.v20160518-1929.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.core.commands_3.8.0.v20160316-1921.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.ui.workbench_3.108.1.v20160819-2118.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.ui.ide_3.12.1.v20160823-0925.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.ui.views_3.8.101.v20160816-1954.jar" todir="${export_destination}/org.eclipse.etrice.generator.cpp_lib"/>
+        <delete dir="${zip_destination}/CPPGenerator_lib"/>
+        <mkdir dir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext_2.10.0.v201605250459.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.antlr.runtime_3.2.0.v201101311130.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/com.google.inject_3.0.0.v201605172100.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe.core_1.3.20.v201605261103.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.apache.commons.cli_1.2.0.v201404270220.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.runtime_2.9.0.v201605261103.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe.utils_1.3.20.v201605261103.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.util_2.10.0.v201605250459.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/com.google.guava_15.0.0.v201403281430.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/javax.inject_1.0.0.v20091030.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.xbase_2.10.0.v201605250459.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.common.types_2.10.0.v201605250459.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtend.lib_2.10.0.v201605250459.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.xbase.lib_2.10.0.v201605250459.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtend.lib.macro_2.10.0.v201605250459.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.generator_2.10.0.v201605250459.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.xtext.generator_2.10.0.v201605250459.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtend_2.2.0.v201605260315.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/com.ibm.icu_56.1.0.v201601250100.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xpand_2.2.0.v201605260315.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtend.typesystem.emf_2.2.0.v201605260315.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.lib_2.9.0.v201605261103.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.launch_2.9.0.v201605261103.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.language_2.9.0.v201605261103.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.osgi_3.11.2.v20161107-1947.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.fx.osgi_2.4.0.201605100504.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.apache.log4j_1.2.15.v201012070815.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.objectweb.asm_5.0.1.v201404251740.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf_2.6.0.v20160526-0356.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.apache.commons.io_2.2.0.v201405211200.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.ui_3.108.1.v20160929-1045.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.swt_3.105.2.v20161122-0613.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.swt.win32.win32.x86_64_3.105.2.v20161122-0613.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.jface_3.12.1.v20160923-1528.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.core.commands_3.8.0.v20160316-1921.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.ui.workbench_3.108.2.v20161025-2029.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.ui.ide_3.12.2.v20161115-1450.jar" todir="${zip_destination}/CPPGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.ui.views_3.8.101.v20160816-1954.jar" todir="${zip_destination}/CPPGenerator_lib"/>
 		<zip destfile="${zip_destination}/eTrice-CPP-generator.zip" basedir="${export_destination}" />
-    	<echo message="created ${zip_destination}/eTrice-CPP-generator.zip" />
     </target>
 </project>
diff --git a/plugins/org.eclipse.etrice.generator.java/export_java_generator.xml b/plugins/org.eclipse.etrice.generator.java/export_java_generator.xml
index 9185ef837..bb3d4a036 100644
--- a/plugins/org.eclipse.etrice.generator.java/export_java_generator.xml
+++ b/plugins/org.eclipse.etrice.generator.java/export_java_generator.xml
@@ -26,11 +26,11 @@
     <!--this file was created by Eclipse Runnable JAR Export Wizard-->
     <!--ANT 1.7 is required                                        -->
     <!--define folder properties-->
-    <target name="create_run_jar" depends="testProps">
-        <jar destfile="${export_destination}/org.eclipse.etrice.generator.java.jar">
+    <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=". org.eclipse.etrice.generator.java_lib/org.eclipse.xtext_2.10.0.v201605250459.jar org.eclipse.etrice.generator.java_lib/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar org.eclipse.etrice.generator.java_lib/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar org.eclipse.etrice.generator.java_lib/org.eclipse.emf.common_2.12.0.v20160420-0247.jar org.eclipse.etrice.generator.java_lib/org.antlr.runtime_3.2.0.v201101311130.jar org.eclipse.etrice.generator.java_lib/com.google.inject_3.0.0.v201605172100.jar org.eclipse.etrice.generator.java_lib/org.eclipse.emf.mwe.core_1.3.20.v201605261103.jar org.eclipse.etrice.generator.java_lib/org.apache.commons.cli_1.2.0.v201404270220.jar org.eclipse.etrice.generator.java_lib/org.eclipse.emf.mwe2.runtime_2.9.0.v201605261103.jar org.eclipse.etrice.generator.java_lib/org.eclipse.emf.mwe.utils_1.3.20.v201605261103.jar org.eclipse.etrice.generator.java_lib/org.eclipse.xtext.util_2.10.0.v201605250459.jar org.eclipse.etrice.generator.java_lib/com.google.guava_15.0.0.v201403281430.jar org.eclipse.etrice.generator.java_lib/javax.inject_1.0.0.v20091030.jar org.eclipse.etrice.generator.java_lib/org.eclipse.xtext.xbase_2.10.0.v201605250459.jar org.eclipse.etrice.generator.java_lib/org.eclipse.xtext.common.types_2.10.0.v201605250459.jar org.eclipse.etrice.generator.java_lib/org.eclipse.xtend.lib_2.10.0.v201605250459.jar org.eclipse.etrice.generator.java_lib/org.eclipse.xtext.xbase.lib_2.10.0.v201605250459.jar org.eclipse.etrice.generator.java_lib/org.eclipse.xtend.lib.macro_2.10.0.v201605250459.jar org.eclipse.etrice.generator.java_lib/org.eclipse.xtext.generator_2.10.0.v201605250459.jar org.eclipse.etrice.generator.java_lib/org.eclipse.xtext.xtext.generator_2.10.0.v201605250459.jar org.eclipse.etrice.generator.java_lib/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar org.eclipse.etrice.generator.java_lib/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar org.eclipse.etrice.generator.java_lib/org.eclipse.xtend_2.2.0.v201605260315.jar org.eclipse.etrice.generator.java_lib/com.ibm.icu_56.1.0.v201601250100.jar org.eclipse.etrice.generator.java_lib/org.eclipse.xpand_2.2.0.v201605260315.jar org.eclipse.etrice.generator.java_lib/org.eclipse.xtend.typesystem.emf_2.2.0.v201605260315.jar org.eclipse.etrice.generator.java_lib/org.eclipse.emf.mwe2.lib_2.9.0.v201605261103.jar org.eclipse.etrice.generator.java_lib/org.apache.commons.logging_1.1.1.v201101211721.jar org.eclipse.etrice.generator.java_lib/org.eclipse.emf.mwe2.launch_2.9.0.v201605261103.jar org.eclipse.etrice.generator.java_lib/org.eclipse.emf.mwe2.language_2.9.0.v201605261103.jar org.eclipse.etrice.generator.java_lib/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar org.eclipse.etrice.generator.java_lib/org.eclipse.osgi_3.11.1.v20160708-1632.jar org.eclipse.etrice.generator.java_lib/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar org.eclipse.etrice.generator.java_lib/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar org.eclipse.etrice.generator.java_lib/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar org.eclipse.etrice.generator.java_lib/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar org.eclipse.etrice.generator.java_lib/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar org.eclipse.etrice.generator.java_lib/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar org.eclipse.etrice.generator.java_lib/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar org.eclipse.etrice.generator.java_lib/org.eclipse.core.resources_3.11.0.v20160503-1608.jar org.eclipse.etrice.generator.java_lib/org.apache.log4j_1.2.15.v201012070815.jar org.eclipse.etrice.generator.java_lib/org.objectweb.asm_5.0.1.v201404251740.jar org.eclipse.etrice.generator.java_lib/org.eclipse.emf_2.6.0.v20160526-0356.jar org.eclipse.etrice.generator.java_lib/org.apache.commons.io_2.2.0.v201405211200.jar org.eclipse.etrice.generator.java_lib/org.eclipse.ui_3.108.0.v20160518-1929.jar org.eclipse.etrice.generator.java_lib/org.eclipse.swt_3.105.1.v20160907-0248.jar org.eclipse.etrice.generator.java_lib/org.eclipse.jface_3.12.0.v20160518-1929.jar org.eclipse.etrice.generator.java_lib/org.eclipse.core.commands_3.8.0.v20160316-1921.jar org.eclipse.etrice.generator.java_lib/org.eclipse.ui.workbench_3.108.1.v20160819-2118.jar org.eclipse.etrice.generator.java_lib/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar org.eclipse.etrice.generator.java_lib/org.eclipse.ui.ide_3.12.1.v20160823-0925.jar org.eclipse.etrice.generator.java_lib/org.eclipse.ui.views_3.8.101.v20160816-1954.jar"/>
+                <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.fx.osgi_2.4.0.201605100504.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.swt.win32.win32.x86_64_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"/>
@@ -46,61 +46,62 @@
             <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}/org.eclipse.etrice.generator.java_lib"/>
-        <mkdir dir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.antlr.runtime_3.2.0.v201101311130.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/com.google.inject_3.0.0.v201605172100.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe.core_1.3.20.v201605261103.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.apache.commons.cli_1.2.0.v201404270220.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.runtime_2.9.0.v201605261103.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe.utils_1.3.20.v201605261103.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.util_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/com.google.guava_15.0.0.v201403281430.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/javax.inject_1.0.0.v20091030.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.xbase_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.common.types_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtend.lib_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.xbase.lib_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtend.lib.macro_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.generator_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.xtext.generator_2.10.0.v201605250459.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtend_2.2.0.v201605260315.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/com.ibm.icu_56.1.0.v201601250100.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xpand_2.2.0.v201605260315.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.xtend.typesystem.emf_2.2.0.v201605260315.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.lib_2.9.0.v201605261103.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.launch_2.9.0.v201605261103.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.language_2.9.0.v201605261103.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.osgi_3.11.1.v20160708-1632.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.core.resources_3.11.0.v20160503-1608.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.apache.log4j_1.2.15.v201012070815.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.objectweb.asm_5.0.1.v201404251740.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.emf_2.6.0.v20160526-0356.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.apache.commons.io_2.2.0.v201405211200.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.ui_3.108.0.v20160518-1929.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.swt_3.105.1.v20160907-0248.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.jface_3.12.0.v20160518-1929.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.core.commands_3.8.0.v20160316-1921.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.ui.workbench_3.108.1.v20160819-2118.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.ui.ide_3.12.1.v20160823-0925.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
-        <copy file="${eclipse_home}/plugins/org.eclipse.ui.views_3.8.101.v20160816-1954.jar" todir="${export_destination}/org.eclipse.etrice.generator.java_lib"/>
+        <delete dir="${export_destination}/JavaGenerator_lib"/>
+        <mkdir dir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext_2.10.0.v201605250459.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.ecore.xmi_2.12.0.v20160420-0247.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.ecore_2.12.0.v20160420-0247.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.common_2.12.0.v20160420-0247.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.antlr.runtime_3.2.0.v201101311130.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/com.google.inject_3.0.0.v201605172100.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe.core_1.3.20.v201605261103.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.apache.commons.cli_1.2.0.v201404270220.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.runtime_2.9.0.v201605261103.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe.utils_1.3.20.v201605261103.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.util_2.10.0.v201605250459.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/com.google.guava_15.0.0.v201403281430.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/javax.inject_1.0.0.v20091030.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.xbase_2.10.0.v201605250459.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.common.types_2.10.0.v201605250459.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtend.lib_2.10.0.v201605250459.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.xbase.lib_2.10.0.v201605250459.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtend.lib.macro_2.10.0.v201605250459.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.generator_2.10.0.v201605250459.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtext.xtext.generator_2.10.0.v201605250459.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtend_2.2.0.v201605260315.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/com.ibm.icu_56.1.0.v201601250100.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xpand_2.2.0.v201605260315.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.xtend.typesystem.emf_2.2.0.v201605260315.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.lib_2.9.0.v201605261103.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.launch_2.9.0.v201605261103.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf.mwe2.language_2.9.0.v201605261103.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.osgi_3.11.2.v20161107-1947.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.fx.osgi_2.4.0.201605100504.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.registry_3.6.100.v20160223-2218.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.preferences_3.6.1.v20160815-1406.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.apache.log4j_1.2.15.v201012070815.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.objectweb.asm_5.0.1.v201404251740.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.emf_2.6.0.v20160526-0356.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.apache.commons.io_2.2.0.v201405211200.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.ui_3.108.1.v20160929-1045.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.swt_3.105.2.v20161122-0613.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.swt.win32.win32.x86_64_3.105.2.v20161122-0613.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.jface_3.12.1.v20160923-1528.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.core.commands_3.8.0.v20160316-1921.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.ui.workbench_3.108.2.v20161025-2029.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy file="${eclipse_home}/plugins/org.eclipse.ui.ide_3.12.2.v20161115-1450.jar" todir="${export_destination}/JavaGenerator_lib"/>
+        <copy 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}" />
-    	<echo message="created ${zip_destination}/eTrice-Java-generator.zip" />
     </target>
 </project>
-- 
cgit v1.2.3