diff options
author | Martin Taal | 2013-02-18 19:04:10 +0000 |
---|---|---|
committer | Martin Taal | 2013-02-18 19:04:10 +0000 |
commit | e727e76559c5a87fdcb7743a34548c6eafb3f2b2 (patch) | |
tree | 5e5882f416f996f8b7586beb8f34b17fe7d3cf5e /build | |
parent | e34af277d06615fd2d5905d5235b524e65efab3f (diff) | |
download | org.eclipse.emf.teneo-e727e76559c5a87fdcb7743a34548c6eafb3f2b2.tar.gz org.eclipse.emf.teneo-e727e76559c5a87fdcb7743a34548c6eafb3f2b2.tar.xz org.eclipse.emf.teneo-e727e76559c5a87fdcb7743a34548c6eafb3f2b2.zip |
Removed emma https://bugs.eclipse.org/bugs/show_bug.cgi?id=368042
Diffstat (limited to 'build')
-rwxr-xr-x | build/org.eclipse.emf.teneo.releng.buckminster/build.xml | 16 | ||||
-rwxr-xr-x | build/org.eclipse.emf.teneo.releng.buckminster/test/teneo_test.xml | 14 |
2 files changed, 13 insertions, 17 deletions
diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/build.xml b/build/org.eclipse.emf.teneo.releng.buckminster/build.xml index eda6829cb..e9bca3e44 100755 --- a/build/org.eclipse.emf.teneo.releng.buckminster/build.xml +++ b/build/org.eclipse.emf.teneo.releng.buckminster/build.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!-- +<!-- Copyright (c) 2010 Cloudsmith Inc, Martin Taal (Doorn, The Netherlands) and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 @@ -93,14 +93,14 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu <echo message="Building" /> <ant dir="${basedir}/build" antfile="teneo_build.xml" target="run" inheritRefs="true" /> - + <echo message="Testing" /> <ant dir="${basedir}/test" antfile="teneo_test.xml" target="run" inheritRefs="true" /> <computeVersionQualifier directory="${rootPath}/output/org.eclipse.emf.teneo_${teneo.version}-osgi.bundle/jar" pattern="org.eclipse.emf.teneo*.jar"/> - + <echo message="Creating maven jars with versionQualifier ${versionQualifier}" /> - + <property name="mavenVersion" value="${teneo.version}-${versionQualifier}" /> <property name="teneoVersion" value="${teneo.version}.${versionQualifier}" /> @@ -119,7 +119,7 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu <mkdir dir="${promoteUpdateSite}"/> <mkdir dir="${promoteUpdateSite}/plugins"/> <mkdir dir="${promoteUpdateSite}/features"/> - + <copy todir="${promoteUpdateSite}"> <fileset dir="${buildSitePath}"> <include name="**/*" /> @@ -129,7 +129,7 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu <mkdir dir="${promoteDropsLocation}"/> <mkdir dir="${promoteDropsLocation}/${teneo.version}"/> - <mkdir dir="${promoteDropsLocation}/${teneo.version}/${build.type}${buildTimestamp}"/> + <mkdir dir="${promoteDropsLocation}/${teneo.version}/${build.type}${buildTimestamp}"/> <copy todir="${promoteDropsLocation}/${teneo.version}/${build.type}${buildTimestamp}"> <fileset dir="${buildZipsPath}"> <include name="*.zip" /> @@ -181,7 +181,7 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu <available file="${tools}/buckminster/buckminster" property="buckminster.exists" /> <echo message="Using eclipse download: ${eclipse.download}"/> - + </target> <target name="get.director" unless="director.exists"> @@ -222,8 +222,6 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu <arg value="org.eclipse.buckminster.pde.headless.feature.feature.group" /> <arg value="-i" /> <arg value="org.eclipse.buckminster.git.headless.feature.feature.group" /> - <arg value="-i" /> - <arg value="org.eclipse.buckminster.emma.headless.feature.feature.group" /> </args> </eclipse.launch> </target> diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/test/teneo_test.xml b/build/org.eclipse.emf.teneo.releng.buckminster/test/teneo_test.xml index fe9738621..09793e020 100755 --- a/build/org.eclipse.emf.teneo.releng.buckminster/test/teneo_test.xml +++ b/build/org.eclipse.emf.teneo.releng.buckminster/test/teneo_test.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!-- +<!-- Copyright (c) 2010 Cloudsmith Inc, Martin Taal (Doorn, The Netherlands) and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 @@ -22,7 +22,7 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu toolsPath: path containing buckminster buildSitePath: the path to which the p2 site should be copied buildZipsPath: the path to the directory with zip files - + buckminster.output.root buckminster.temp.root --> @@ -38,14 +38,14 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu <mkdir dir="${targetPlatformPath}" /> <mkdir dir="${workspacePath}" /> - + <echo message="Setting jre to ${env.JAVA_HOME}"/> <buckminster command="installJRE" workspace="${workspacePath}"> <cmdargs> <arg value="--location" /> <arg value="${env.JAVA_HOME}" /> </cmdargs> - </buckminster> + </buckminster> <echo message="Using workspace ${workspacePath}" /> <echo message="Setting targetPlatformPath to ${targetPlatformPath}" /> @@ -67,11 +67,11 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu <buckminster command="build" workspace="${workspacePath}"> <cmdargs> <arg value="--thorough" /> - </cmdargs> + </cmdargs> </buckminster> <echo message="Running tests Hibernate" /> - <buckminster command="emma" workspace="${workspacePath}"> + <buckminster command="junit" workspace="${workspacePath}"> <cmdargs> <arg value="-l" /> <arg value="org.eclipse.emf.teneo.hibernate.test/AllTests.launch" /> @@ -81,8 +81,6 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu <arg value="${testResultsPath}/output/stdout.txt" /> <arg value="--stderr" /> <arg value="${testResultsPath}/output/stderr.txt" /> - <arg value="--xml" /> - <arg value="${testResultsPath}/output/hibernate-coverageReport.xml" /> <arg value="--flatXML"/> </cmdargs> </buckminster> |