diff options
| author | Artur Signell <artur@vaadin.com> | 2012-09-19 15:33:59 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-09-19 15:34:28 +0300 |
| commit | b9164cf83032f43dfcd5fe5e96dd430e4f3120df (patch) | |
| tree | 9a6f8233aefb572ec9d49f5911218a8a0cb62035 | |
| parent | c1e82529b1191d9c41de0dc8a4cde8caf9754329 (diff) | |
| download | vaadin-framework-b9164cf83032f43dfcd5fe5e96dd430e4f3120df.tar.gz vaadin-framework-b9164cf83032f43dfcd5fe5e96dd430e4f3120df.zip | |
Fixed dependencies so files are copied before used (#9613)
| -rw-r--r-- | all/build.xml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/all/build.xml b/all/build.xml index e09b7a55b7..d381c03b1c 100644 --- a/all/build.xml +++ b/all/build.xml @@ -34,7 +34,7 @@ <unzip src="${file}" dest="${javadoc.temp.dir}" /> </target> - <target name="javadoc"> + <target name="javadoc" depends="copy-jars"> <!-- Unpack all source files to javadoc.temp.dir--> <antcontrib:foreach list="${modules.to.publish.to.maven}" target="unzip.to.javadoctemp" param="module" /> @@ -62,7 +62,7 @@ </target> - <target name="zip" depends="javadoc"> + <target name="copy-jars"> <delete dir="${temp.dir}" /> <antcontrib:foreach list="${modules.to.publish.to.maven}" target="fetch.module.and.dependencies" param="module" /> <!-- All jars are now in temp.dir. Still need to separate vaadin and deps --> @@ -73,6 +73,9 @@ </fileset> </move> + + </target> + <target name="zip" depends="copy-jars, javadoc"> <zip destfile="${zip.file}"> <fileset dir="${temp.dir}"> <!-- Avoid conflicts with servlet and portlet API. They are provided by the container --> |