diff options
| author | Artur Signell <artur@vaadin.com> | 2015-01-15 09:01:35 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2015-01-15 10:33:19 +0200 |
| commit | 3f46830b28100ed918570bf46523c592580643be (patch) | |
| tree | 5e1fefd231f210231a09d6a29a51757e6e0b59b2 /all | |
| parent | 8361d1379c49ef5ce03d329d4e5fdcf63579e652 (diff) | |
| download | vaadin-framework-3f46830b28100ed918570bf46523c592580643be.tar.gz vaadin-framework-3f46830b28100ed918570bf46523c592580643be.zip | |
Fix release build
Change-Id: Ie915aeb31aff7a0c2f655ad9b54e00a582770984
Diffstat (limited to 'all')
| -rw-r--r-- | all/build.xml | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/all/build.xml b/all/build.xml index 647ec3c970..37f728e529 100644 --- a/all/build.xml +++ b/all/build.xml @@ -41,14 +41,11 @@ </target> <target name="javadoc" depends="copy-jars"> - <!-- Ensure filtered webcontent files are available --> - <antcall target="common.filter.webcontent" /> - <antcontrib:if> <isset property="nojavadoc" /> <then> <jar file="${javadoc.jar}" compress="true"> - <fileset refid="common.files.for.all.jars" /> + <fileset dir="${common.jarfiles.dir}" /> </jar> </then> <else> @@ -83,7 +80,7 @@ <!-- Create a javadoc jar --> <jar file="${javadoc.jar}" compress="true"> <fileset dir="${javadoc.dir}" /> - <fileset refid="common.files.for.all.jars" /> + <fileset dir="${common.jarfiles.dir}" /> </jar> </else> </antcontrib:if> @@ -105,9 +102,6 @@ </target> <target name="zip" depends="copy-jars, javadoc"> - <!-- Ensure filtered webcontent files are available --> - <antcall target="common.filter.webcontent" /> - <zip destfile="${zip.file}"> <fileset dir="${temp.dir}"> <!-- Avoid conflicts with servlet and portlet API. They are @@ -121,9 +115,8 @@ <exclude name="*.pom" /> <exclude name="*-javadoc.jar" /> <exclude name="*-sources.jar" /> - </fileset> - <fileset refid="common.files.for.all.jars" /> + <fileset dir="${common.jarfiles.dir}" /> <fileset dir="${result.dir}/.."> <include name="README.TXT" /> </fileset> |