diff options
| author | Artur Signell <artur@vaadin.com> | 2012-01-27 17:25:29 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-01-27 17:26:40 +0200 |
| commit | 2373c668d7a9f57e639ae8fad658a9ab20616d46 (patch) | |
| tree | d2e26f9d19dc449d1ce1b544fab658246a95e518 /build | |
| parent | e0b996b88593a82507fb4b7e8010551d6ba55594 (diff) | |
| download | vaadin-framework-2373c668d7a9f57e639ae8fad658a9ab20616d46.tar.gz vaadin-framework-2373c668d7a9f57e639ae8fad658a9ab20616d46.zip | |
Corrected classpath related problems introduced during merge from 6.8
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/build.xml b/build/build.xml index 05d3a931ad..5e9d203ab9 100644 --- a/build/build.xml +++ b/build/build.xml @@ -404,7 +404,7 @@ <echo>Compiling src (server-side)</echo> <!-- Compile core sources first as the other sources depend on these --> <mkdir dir="${result-classes-core}" /> - <javac source="1.5" target="1.5" classpathref="compile.classpath.server-side" destdir="${result-classes-core}" debug="true" encoding="UTF-8" includeantruntime="false"> + <javac source="1.5" target="1.5" classpathref="compile.classpath" destdir="${result-classes-core}" debug="true" encoding="UTF-8" includeantruntime="false"> <src path="${result-src-core}"/> </javac> </target> @@ -413,7 +413,7 @@ <echo>Compiling src (Server and client side JUnit tests)</echo> <!-- Compile server and client side JUnit tests --> <mkdir dir="${result-classes-junit}" /> - <javac source="1.5" target="1.5" classpathref="compile.classpath.server-side" destdir="${result-classes-junit}" debug="true" encoding="UTF-8" includeantruntime="false"> + <javac source="1.5" target="1.5" classpathref="compile.classpath" destdir="${result-classes-junit}" debug="true" encoding="UTF-8" includeantruntime="false"> <classpath path="${result-classes-core}"></classpath> <src path="${result-src-junit}"/> </javac> @@ -421,7 +421,7 @@ <echo>Compiling src (TestBench tests)</echo> <!-- Compile TestBench tests --> <mkdir dir="${result-classes-testbench}" /> - <javac source="1.5" target="1.5" classpathref="compile.classpath.server-side" destdir="${result-classes-testbench}" debug="true" encoding="UTF-8" includeantruntime="false"> + <javac source="1.5" target="1.5" classpathref="compile.classpath" destdir="${result-classes-testbench}" debug="true" encoding="UTF-8" includeantruntime="false"> <classpath path="${result-classes-junit}"></classpath> <classpath path="${result-classes-core}"></classpath> <src path="${result-src-testbench}"/> @@ -652,7 +652,7 @@ <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"> + <javadoc destdir="${javadoc.destdir}" author="true" version="true" use="true" windowtitle="${product-name}" classpathref="client-side.compile.classpath"> <packageset dir="${result-src-core}"/> <doctitle>${javadoc.doctitle}</doctitle> <!-- <header><![CDATA[<script type="text/javascript" src=".html-style/style.js"></script>]]></header> --> |