diff options
Diffstat (limited to 'build/build.xml')
| -rw-r--r-- | build/build.xml | 345 |
1 files changed, 190 insertions, 155 deletions
diff --git a/build/build.xml b/build/build.xml index 5349dcf126..ba9b93a2ab 100644 --- a/build/build.xml +++ b/build/build.xml @@ -26,10 +26,12 @@ <target name="init-deps" depends="common.init-deps" > <property name="ivy.resolved" value="1" /> - <ivy:resolve file="build/ivy/ivy.xml" resolveid="common" conf="ss.compile, cs.compile, ss.test.compile"/> - <ivy:cachepath pathid="ivy.compile.classpath.server-side" conf="ss.compile"/> - <ivy:cachepath pathid="ivy.compile.classpath.client-side" conf="cs.compile"/> - <ivy:cachepath pathid="ivy.compile.classpath.server-side-tests" conf="ss.test.compile"/> + <ivy:resolve file="build/ivy/ivy.xml" resolveid="common" conf="server.extdep, shared.extdep, client.extdep, client-compiler.extdep, server.tests.extdep,client-compiler.extdep"/> + <ivy:cachepath pathid="ivy.compile.classpath.server" conf="server.extdep"/> + <ivy:cachepath pathid="ivy.compile.classpath.shared" conf="shared.extdep"/> + <ivy:cachepath pathid="ivy.compile.classpath.client" conf="client.extdep"/> + <ivy:cachepath pathid="ivy.compile.classpath.client-compiler" conf="client-compiler.extdep"/> + <ivy:cachepath pathid="ivy.compile.classpath.server-tests" conf="server.tests.extdep"/> <ivy:cachepath pathid="buildhelpers.dependencies" resolveId="buildhelpers" conf="compile" file="build/ivy/buildhelpers-ivy.xml"/> @@ -55,50 +57,43 @@ <property name="gwt.user.dir" value="${gwt.root}/user"/> <property name="gwt.user.bin" value="${gwt.build.dir}/out/user/bin"/> - <property name="jarjar-jar" value="${gwt.tools.lib}/tonicsystems/jarjar-1.0rc8.jar"/> - - <path id="compile.classpath.server-side"> - <path refid="additional.jar.path" /> - <!-- GWT --> + <path id="gwt.dev.user.jars"> <pathelement location="${gwt.user.jar}" /> <pathelement location="${gwt.dev.jar}" /> - - <path refid="ivy.compile.classpath.server-side" /> </path> - <path id="compile.classpath.client-side"> + <path id="compile.classpath.server"> <path refid="additional.jar.path" /> - - <!-- GWT user --> - <!-- - <pathelement path="${gwt.user.dir}/src" /> - <pathelement path="${gwt.user.dir}/super" /> - <pathelement path="${gwt.user.dir}/out/user/bin"/> - --> - <!-- GWT --> - <pathelement location="${gwt.user.jar}" /> - <pathelement location="${gwt.dev.jar}" /> - - <path refid="ivy.compile.classpath.client-side" /> + <path refid="ivy.compile.classpath.server" /> </path> - <path id="compile.classpath.server-side-tests"> + <path id="compile.classpath.shared"> <path refid="additional.jar.path" /> - - <!-- GWT --> - <pathelement location="${gwt.user.jar}" /> - <!-- needed at least for Apache Commons --> - <pathelement location="${gwt.dev.jar}" /> - - <path refid="ivy.compile.classpath.server-side-tests" /> + <path refid="ivy.compile.classpath.shared" /> + </path> + <path id="compile.classpath.client"> + <path refid="additional.jar.path" /> + <path refid="gwt.dev.user.jars"/> + <path refid="ivy.compile.classpath.client" /> + </path> + <path id="compile.classpath.client-compiler"> + <path refid="additional.jar.path" /> + <path refid="gwt.dev.user.jars"/> + <path refid="ivy.compile.classpath.client-compiler" /> + </path> + <path id="compile.classpath.sass"> + <path refid="additional.jar.path" /> + <path refid="ivy.compile.classpath.server" /> + <path refid="gwt.dev.user.jars"/> + </path> + <path id="compile.classpath.server-tests"> + <path refid="additional.jar.path" /> + <path refid="gwt.dev.user.jars"/> + <path refid="ivy.compile.classpath.server-tests" /> </path> <path id="compile.classpath.buildhelpers"> <path refid="additional.jar.path" /> - - <!-- GWT --> - <pathelement location="${gwt.user.jar}" /> - <pathelement location="${gwt.dev.jar}" /> - + <path refid="gwt.dev.user.jars"/> <path refid="buildhelpers.dependencies" /> </path> </target> @@ -117,26 +112,41 @@ <property file="build/GWT-VERSION.properties" /> <!-- result source and classes folders --> - <property name="result-src-core" value="${result-path}/src/core"/> + <property name="result-src-server" value="${result-path}/src/server"/> + <property name="result-src-client" value="${result-path}/src/client"/> + <property name="result-src-client-compiler" value="${result-path}/src/client-compiler"/> + <property name="result-src-shared" value="${result-path}/src/shared"/> <property name="result-src-junit" value="${result-path}/src/junit"/> <property name="result-src-testbench" value="${result-path}/src/testbench"/> <property name="result-src-sass" value="${result-path}/src/sass"/> <property name="result-src-sass-junit" value="${result-path}/src/sass-junit"/> - <property name="result-classes-core" value="${result-path}/classes/core"/> + <property name="result-classes-server" value="${result-path}/classes/server"/> + <property name="result-classes-client" value="${result-path}/classes/client"/> + <property name="result-classes-client-compiler" value="${result-path}/classes/client-compiler"/> + <property name="result-classes-shared" value="${result-path}/classes/shared"/> <property name="result-classes-junit" value="${result-path}/classes/junit"/> <property name="result-classes-testbench" value="${result-path}/classes/testbench"/> <property name="result-classes-sass" value="${result-path}/classes/sass"/> <property name="result-classes-sass-junit" value="${result-path}/classes/sass-junit"/> <property name="result-precompiled-widgetsets" value="${result-path}/classes/widgetsets"/> - <!-- Folder where Emma instrumented classes are placed (if Emma is used)--> - <property name="result-classes-core-for-emma-war" value="${result-path}/classes/emma-war"/> - <property name="result-classes-core-for-emma-junit" value="${result-path}/classes/emma-junit"/> <!-- Default classpath for building widgetsets, overridden for testing widgetset --> <path id="compile.classpath.widgetset"> - <path refid="compile.classpath.client-side" /> - <pathelement location="${result-classes-core}" /> - <pathelement location="${result-src-core}" /> + <path refid="compile.classpath.client" /> + <!-- Needed to resolve classes which @Connect refers to --> + <pathelement location="${result-src-server}" /> + <!-- Needed to resolve imports in connector classes --> + <pathelement location="${result-classes-server}" /> + + <!-- The actual sources we want to compile --> + <pathelement location="${result-src-client}" /> + <pathelement location="${result-src-shared}" /> + <!-- Contains compiled generators --> + <pathelement location="${result-classes-client-compiler}" /> + <!-- Generators depend on shared and client interfaces --> + <pathelement location="${result-classes-shared}" /> + <pathelement location="${result-classes-client}" /> + <pathelement location="${result-precompiled-widgetsets}" /> </path> </target> @@ -196,11 +206,6 @@ <!-- Create result dir unless already exists --> <mkdir dir="${result-path}" /> - <!-- Create dirs that might be used by the test coverage generation --> - <mkdir dir="${result-classes-core-for-emma-war}" /> - <mkdir dir="${result-classes-core-for-emma-junit}" /> - <mkdir dir="${result-path}/coverage" /> - <echo>We are using gwt version ${gwt-version}.</echo> <!-- Destination files --> @@ -250,9 +255,9 @@ <include name="${vaadin-package}/tests/**/*" /> <include name="${vaadin-package}/launcher/**" /> </fileset> - <fileset dir="${result-classes-junit}"> - <!-- VaadinClasses and data classes are used by TestBench tests also --> - </fileset> + <fileset dir="${result-classes-shared}" /> + <!-- VaadinClasses and data classes are used by TestBench tests also --> + <fileset dir="${result-classes-junit}" /> <!-- test resources --> <fileset dir="tests/testbench"> <include name="${vaadin-package}/tests/**/*" /> @@ -331,7 +336,7 @@ description="Build package required files, without packing them."> </target> - <target name="compile-server-side" depends="compile-gwt, compile-core, webcontent"/> + <target name="compile-server-side" depends="compile-gwt, compile-server, compile-client, webcontent"/> <!-- Copy and preprocess sources for packaging NOTE: Replaces <version></version> tags with build version tag for some "textual" files @@ -365,7 +370,10 @@ <mkdir dir="${result-path}/src" /> <mkdir dir="${result-src-sass}/src" /> - <mkdir dir="${result-src-core}" /> + <mkdir dir="${result-src-server}" /> + <mkdir dir="${result-src-client}" /> + <mkdir dir="${result-src-client-compiler}" /> + <mkdir dir="${result-src-shared}" /> <mkdir dir="${result-src-testbench}" /> <mkdir dir="${result-src-junit}" /> <mkdir dir="${result-src-sass-junit}" /> @@ -395,10 +403,31 @@ <echo>Copying src directory and processing copied files.</echo> <echo>Replacing <version> tag with build version for java/html/css/xml files.</echo> - <copy todir="${result-src-core}" overwrite="yes"> + <copy todir="${result-src-server}" overwrite="yes"> + <filterset refid="version-and-license"/> + <filterset refid="pre-css-style"/> + <fileset dir="server/src"> + <patternset refid="preprocessable-files" /> + </fileset> + </copy> + <copy todir="${result-src-shared}" overwrite="yes"> + <filterset refid="version-and-license"/> + <filterset refid="pre-css-style"/> + <fileset dir="shared/src"> + <patternset refid="preprocessable-files" /> + </fileset> + </copy> + <copy todir="${result-src-client}" overwrite="yes"> <filterset refid="version-and-license"/> <filterset refid="pre-css-style"/> - <fileset dir="src"> + <fileset dir="client/src"> + <patternset refid="preprocessable-files" /> + </fileset> + </copy> + <copy todir="${result-src-client-compiler}" overwrite="yes"> + <filterset refid="version-and-license"/> + <filterset refid="pre-css-style"/> + <fileset dir="client-compiler/src"> <patternset refid="preprocessable-files" /> </fileset> </copy> @@ -435,11 +464,30 @@ <!-- Add other files such as images, these are not filtered or processed by fixcrlf task --> <echo>Copying non java/html/css/xml files such as images.</echo> - <copy todir="${result-src-core}"> - <fileset dir="src"> + <copy todir="${result-src-server}"> + <fileset dir="server/src"> + <patternset refid="non-preprocessable-files" /> + </fileset> + </copy> + + <copy todir="${result-src-shared}"> + <fileset dir="shared/src"> + <patternset refid="non-preprocessable-files" /> + </fileset> + </copy> + + <copy todir="${result-src-client}"> + <fileset dir="client/src"> + <patternset refid="non-preprocessable-files" /> + </fileset> + </copy> + + <copy todir="${result-src-client-compiler}"> + <fileset dir="client-compiler/src"> <patternset refid="non-preprocessable-files" /> </fileset> </copy> + <copy todir="${result-src-sass}"> <fileset dir="${sass-src}"> <patternset refid="non-preprocessable-files" /> @@ -529,28 +577,63 @@ </copy> </target> - <target name="compile-core" depends="init, preprocess-src"> - <echo>Compiling src (server-side)</echo> + <target name="compile-server" depends="init, preprocess-src, compile-shared"> + <echo>Compiling server/src</echo> + <!-- Compile core sources first as the other sources depend on these --> + <mkdir dir="${result-classes-server}" /> + <javac destdir="${result-classes-server}" source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server" debug="true" encoding="UTF-8" includeantruntime="false"> + <classpath location="${result-classes-shared}"></classpath> + <src path="${result-src-server}"/> + </javac> + </target> + + <target name="compile-client" depends="init, preprocess-src, compile-server, compile-shared"> + <echo>Compiling client/src</echo> + <!-- Compile core sources first as the other sources depend on these --> + <mkdir dir="${result-classes-client}" /> + <javac destdir="${result-classes-client}" source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.client" debug="true" encoding="UTF-8" includeantruntime="false"> + <classpath location="${result-classes-shared}"></classpath> + <classpath location="${result-classes-server}"></classpath> + <src path="${result-src-client}"/> + </javac> + </target> + + <target name="compile-client-compiler" depends="init, preprocess-src, compile-client, compile-server, compile-shared"> + <echo>Compiling client-compiler/src</echo> + <mkdir dir="${result-classes-client-compiler}" /> + <javac destdir="${result-classes-client-compiler}" source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.client-compiler" debug="true" encoding="UTF-8" includeantruntime="false"> + <src path="${result-src-client-compiler}"/> + <!-- These could be removed by using class names instead of class references in generators --> + <classpath location="${result-classes-shared}"></classpath> + <classpath location="${result-classes-client}"></classpath> + <classpath location="${result-classes-server}"></classpath> + </javac> + </target> + + <target name="compile-shared" depends="init, preprocess-src"> + <echo>Compiling shared/src</echo> <!-- Compile core sources first as the other sources depend on these --> - <mkdir dir="${result-classes-core}" /> - <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server-side" destdir="${result-classes-core}" debug="true" encoding="UTF-8" includeantruntime="false"> - <src path="${result-src-core}"/> + <mkdir dir="${result-classes-shared}" /> + <javac destdir="${result-classes-shared}" source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.shared" debug="true" encoding="UTF-8" includeantruntime="false"> + <src path="${result-src-shared}"/> </javac> </target> - <target name="compile-tests" depends="compile-core"> + <target name="compile-tests" depends="compile-server,compile-client,compile-sass"> <echo>Compiling src (Server and client side JUnit tests)</echo> <!-- Compile server and client side JUnit tests --> <mkdir dir="${result-classes-junit}" /> - <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server-side-tests" destdir="${result-classes-junit}" debug="true" encoding="UTF-8" includeantruntime="false"> - <classpath path="${result-classes-core}"></classpath> + <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server-tests" destdir="${result-classes-junit}" debug="true" encoding="UTF-8" includeantruntime="false"> + <classpath path="${result-classes-shared}"></classpath> + <classpath path="${result-classes-server}"></classpath> + <classpath path="${result-classes-client}"></classpath> <src path="${result-src-junit}"/> </javac> <echo>Compiling SASS JUnit tests</echo> <!-- Compile server and client side JUnit tests --> <mkdir dir="${result-classes-sass-junit}" /> - <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server-side-tests" destdir="${result-classes-sass-junit}" debug="true" encoding="UTF-8" includeantruntime="false"> + <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server-tests" destdir="${result-classes-sass-junit}" debug="true" encoding="UTF-8" includeantruntime="false"> <classpath path="${result-classes-sass}"></classpath> <src path="${result-src-sass-junit}"/> </javac> @@ -558,9 +641,12 @@ <echo>Compiling src (TestBench tests)</echo> <!-- Compile TestBench tests --> <mkdir dir="${result-classes-testbench}" /> - <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server-side" destdir="${result-classes-testbench}" debug="true" encoding="UTF-8" includeantruntime="false"> + <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server" destdir="${result-classes-testbench}" debug="true" encoding="UTF-8" includeantruntime="false"> <classpath path="${result-classes-junit}"></classpath> - <classpath path="${result-classes-core}"></classpath> + <classpath path="${result-classes-server}"></classpath> + <classpath path="${result-classes-shared}"></classpath> + <classpath path="${result-classes-client}"></classpath> + <classpath refid="gwt.dev.user.jars"/> <src path="${result-src-testbench}"/> </javac> @@ -580,7 +666,7 @@ <!-- TODO also perform javacc compilation of the parser --> <mkdir dir="${result-classes-sass}" /> <javac source="${required.java.version}" target="${required.java.version}" includeantruntime="false" srcdir="${result-src-sass}" - classpathref="compile.classpath.server-side" destdir="${result-classes-sass}" debug="true" encoding="UTF-8" /> + classpathref="compile.classpath.sass" destdir="${result-classes-sass}" debug="true" encoding="UTF-8" /> </target> <target name="defaulttheme" depends="init, compile-sass, compile-helpers" description="Compile all included themes"> @@ -624,10 +710,11 @@ </target> <!-- The widgetset generator is currently compiled along with rest of server-side Java. --> - <target name="compile-widgetset-generator" depends="compile-core"/> + <target name="compile-widgetset-generator" depends="compile-server,compile-client, compile-client-compiler"/> <!-- Compiles the widgetset given as the first parameter --> - <target name="compile-widgetset" depends="init-deps"> + <!-- Caller must ensure necessary classes have been compiled --> + <target name="compile-widgetset"> <fail unless="widgetset" message="No widgetset parameter set"/> <property name="widgetset-style" value="OBF" /> <property name="widgetset-localWorkers" value="2" /> @@ -681,7 +768,7 @@ </target> <target name="compile-widgetset-testing"> - <!-- Crate a path reference containing default widgetset classpath + testbench files --> + <!-- Create a path reference containing default widgetset classpath + testbench files --> <path id="compile.classpath.testingwidgetset"> <path refid="compile.classpath.widgetset" /> <pathelement location="${result-classes-testbench}" /> @@ -703,7 +790,7 @@ <!-- Compiles all widgetsets. --> <!-- This is called when building packages and when compiling all --> <!-- widgetsets, but not when compiling individual widgetsets. --> - <target name="compile-client-side" depends="compile-gwt, compile-server-side, compile-tests"> + <target name="compile-client-side" depends="compile-gwt, compile-server-side, compile-tests, compile-client-compiler"> <echo>Compiling widget sets in parallel.</echo> <parallel threadsperprocessor="1"> <antcall inheritrefs="true" target="compile-widgetset-default"/> @@ -717,7 +804,7 @@ <!-- Definitions for building the client-side. --> <property name="widgetsets-output-dir" value="WebContent/VAADIN/widgetsets" /> - <echo>We are using ${lib-gwt-dev}.</echo> + <echo>We are using ${gwt.dev.jar}.</echo> <echo>Widget sets output dir: ${widgetsets-output-dir}</echo> </target> @@ -761,21 +848,6 @@ <mkdir dir="${output-dir}/META-INF"/> <echo file="${output-dir}/META-INF/VERSION">${version.full}</echo> - <emma enabled="${emma.enabled}" > - <instr instrpath="${result-classes-core}" - destdir="${result-classes-core-for-emma-war}" - mode="copy" - metadatafile="${result-path}/war.es" - merge="false" - > - <filter includes="com.vaadin.*" /> - <filter excludes="com.vaadin.terminal.gwt.*" /> - </instr> - </emma> - - <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" - classpath="${jarjar-jar}"/> - <jarjar jarfile="${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}" compress="true" manifest="build/package/META-INF/MANIFEST.MF" duplicate="preserve" index="true"> <metainf dir="${output-dir}/META-INF"/> @@ -790,13 +862,17 @@ <attribute name="GWT-Version-Dependencies" value="${gwt-version-dependencies}" /> <attribute name="Bundle-Version" value="${version.full}" /> </manifest> - <!-- Include any instrumented class files before the normal classes --> - <fileset dir="${result-classes-core-for-emma-war}" /> - <fileset dir="${result-classes-core}"/> + <fileset dir="${result-classes-server}"/> + <fileset dir="${result-classes-client}"/> + <fileset dir="${result-classes-shared}"/> <fileset dir="${result-classes-sass}"/> + <fileset dir="${result-classes-client-compiler}"/> <!-- add sources --> - <fileset dir="${result-src-core}"/> + <fileset dir="${result-src-server}"/> + <fileset dir="${result-src-client}"/> + <fileset dir="${result-src-shared}"/> <fileset dir="${result-src-sass}"/> + <fileset dir="${result-src-client-compiler}"/> <fileset dir="${output-dir}/WebContent"> <patternset> <include name="VAADIN/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/**/*" /> @@ -912,7 +988,17 @@ <target name="vaadin-sources.jar" depends="init"> <jar file="${result-path}/${lib-sources-jar-name}" compress="true"> - <fileset dir="${result-src-core}"> + <fileset dir="${result-src-server}"> + <patternset> + <include name="**/*.java" /> + </patternset> + </fileset> + <fileset dir="${result-src-shared}"> + <patternset> + <include name="**/*.java" /> + </patternset> + </fileset> + <fileset dir="${result-src-client}"> <patternset> <include name="**/*.java" /> </patternset> @@ -943,8 +1029,10 @@ <target name="javadoc" depends="init, preprocess-src"> <property name="javadoc.destdir" value="${output-dir}/WebContent/docs/api"/> - <javadoc destdir="${javadoc.destdir}" author="true" version="true" use="true" windowtitle="${product-name}" classpathref="compile.classpath.client-side"> - <packageset dir="${result-src-core}"/> + <javadoc destdir="${javadoc.destdir}" author="true" version="true" use="true" windowtitle="${product-name}" classpathref="compile.classpath.client"> + <packageset dir="${result-src-server}"/> + <packageset dir="${result-src-client}"/> + <packageset dir="${result-src-shared}"/> <doctitle>${javadoc.doctitle}</doctitle> <!-- <header><![CDATA[<script type="text/javascript" src=".html-style/style.js"></script>]]></header> --> <bottom>${javadoc.bottom}</bottom> @@ -1180,65 +1268,23 @@ <antcall inheritrefs="true" inheritall="true" target="server-side-tests"></antcall> <antcall inheritrefs="true" inheritall="true" target="sass-tests"></antcall> </parallel> - - <!-- Create a combined report from each test's sub report --> - <emma enabled="${emma.enabled}" > - <merge file="${result-path}/combined.es"> - <fileset dir="${result-path}" > - <include name="*.ec" /> - <include name="*.em" /> - </fileset> - </merge> - <report sourcepath="${result-src-core}" > - <fileset dir="${result-path}" > - <include name="combined.es" /> - </fileset> - - <txt outfile="../${result-path}/coverage/coverage-combined/coverage.txt" /> - <html outfile="../${result-path}/coverage/coverage-combined/coverage.html" /> - </report> - </emma> - <echo>##teamcity[publishArtifacts '${result-path}/coverage']</echo> </target> <!-- Assumes java classes have been compiled but depends does not work out well as this is run from a <parallel> task--> <target name="server-side-tests" unless="tests.serverside.skip" depends="compile-tests"> - <emma enabled="${emma.enabled}" > - <instr instrpath="${result-classes-core}" - destdir="${result-classes-core-for-emma-junit}" - mode="copy" - metadatafile="${result-path}/unittests.em" - merge="false" - > - <filter includes="com.vaadin.*" /> - <filter excludes="com.vaadin.terminal.gwt.*" /> - </instr> - </emma> <junit printsummary="yes"> <classpath> - <pathelement path="${result-classes-core-for-emma-junit}" /> - <pathelement path="${result-classes-core}" /> + <pathelement path="${result-classes-server}" /> + <pathelement path="${result-classes-shared}" /> <pathelement path="${result-classes-junit}" /> - <path refid="compile.classpath.server-side-tests"></path> + <path refid="compile.classpath.server-tests"></path> </classpath> - <jvmarg value="-Demma.coverage.out.file=../${result-path}/unittests.ec" /> <batchtest fork="yes"> <fileset dir="tests/server-side" includes="**/*.java" excludes="**/Abstract*.java,com/vaadin/tests/data/bean/*.java,com/vaadin/tests/util/*.java,**/VaadinClasses.java" /> <fileset dir="tests/client-side" includes="**/*.java" excludes="**/Abstract*.java" /> </batchtest> </junit> - <emma enabled="${emma.enabled}" > - <report sourcepath="${result-src-core}" > - <fileset dir="${result-path}" > - <include name="unittests.*" /> - </fileset> - - <txt outfile="../${result-path}/coverage/coverage-unittests/unittests_coverage.txt" /> - <html outfile="../${result-path}/coverage/coverage-unittests/unittests_coverage.html" /> - </report> - </emma> - <echo>##teamcity[publishArtifacts '${result-path}/coverage']</echo> </target> <!-- Assumes java classes have been compiled but depends does not work out well as this is run from a <parallel> task--> @@ -1248,7 +1294,7 @@ <pathelement path="${result-src-sass-junit}" /> <pathelement path="${result-classes-sass}" /> <pathelement path="${result-classes-sass-junit}" /> - <path refid="compile.classpath.server-side-tests"></path> + <path refid="compile.classpath.server-tests"></path> </classpath> <batchtest fork="yes"> @@ -1299,17 +1345,6 @@ </ant> - <emma enabled="${emma.enabled}" > - <report sourcepath="${result-src-core}" > - <fileset dir="${result-path}" > - <include name="war.*" /> - </fileset> - - <txt outfile="../${result-path}/coverage/coverage-testbench/testbench_coverage.txt" /> - <html outfile="../${result-path}/coverage/coverage-testbench/testbench_coverage.html" /> - </report> - </emma> - <echo>##teamcity[publishArtifacts '${result-path}/coverage/']</echo> </target> <!-- Assumes java classes have been compiled but depends does not work out well as this is run from a <parallel> task--> |