]> source.dussan.org Git - vaadin-framework.git/commitdiff
Fixed compilation of testing widgetset
authorArtur Signell <artur@vaadin.com>
Wed, 15 Aug 2012 12:30:27 +0000 (15:30 +0300)
committerArtur Signell <artur@vaadin.com>
Wed, 15 Aug 2012 12:30:42 +0000 (15:30 +0300)
build/build.xml

index 11b85d34ce2155e497d57e538293df9a03c6cf9c..7e380783af85503ac8e4740e4bd29d50da8381e7 100644 (file)
     <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, compile-client-compiler">
+       <!-- 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" />
         </antcall>
     </target>
     
-    <target name="compile-widgetset-testing">
-       <!-- Crate a path reference containing default widgetset classpath + testbench files -->
+    <target name="compile-widgetset-testing" depends="compile-tests">
+       <!-- 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}" />
-               <pathelement location="${result-src-testbench}" />
+                       <pathelement location="${result-src-testbench}" />
        </path>
         <antcall target="compile-widgetset">
             <reference refid="compile.classpath.testingwidgetset" torefid="compile.classpath.widgetset" />