diff options
Diffstat (limited to 'tests/org.eclipse.etrice.generator.common.tests')
| -rw-r--r-- | tests/org.eclipse.etrice.generator.common.tests/common.xml | 76 |
1 files changed, 59 insertions, 17 deletions
diff --git a/tests/org.eclipse.etrice.generator.common.tests/common.xml b/tests/org.eclipse.etrice.generator.common.tests/common.xml index 1e326bb68..1e154cce7 100644 --- a/tests/org.eclipse.etrice.generator.common.tests/common.xml +++ b/tests/org.eclipse.etrice.generator.common.tests/common.xml @@ -46,16 +46,34 @@ <!-- 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> 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--> @@ -87,13 +105,34 @@ <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.10*.jar" /> - <include name="org.eclipse.emf.common_2.10*.jar" /> - <include name="org.eclipse.emf.ecore.xmi_2.10*.jar" /> + <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.6.*.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" /> @@ -116,9 +155,12 @@ <include name="org.eclipse.xtend.lib_2.8*.jar" /> <include name="org.eclipse.xtext.xbase.lib_2.8*.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.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> |