From d6ed09f8f1babe3d03f8751e01004c5463963c5e Mon Sep 17 00:00:00 2001
From: Simon Pepping <spepping@apache.org>
Date: Tue, 20 Jul 2010 18:48:53 +0000
Subject: Target dist-src need not depend on target all. A comment on the
 dependency of target dist on target distclean.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@965953 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 4bcfd213d..b833f573f 100644
--- a/build.xml
+++ b/build.xml
@@ -1222,7 +1222,8 @@ NOTE:
 <!-- =================================================================== -->
 <!-- Creates the distribution                                            -->
 <!-- =================================================================== -->
-  <target name="dist" depends="dist-prereq,dist-src,dist-bin" description="Generates the distribution package"/>
+<!-- It would be better to make dist depend on distclean. But as long as the forrest projectInfo plugin depends on a higher Java version (1.5) than we use for the compilation (1.4), leaving it out enables a workaround -->
+  <target name="dist" depends="dist-prereq,dist-src,dist-bin,maven-artifacts" description="Generates the distribution package"/>
   <target name="dist-prereq" depends="init,dist-get-jai">
     <fail message="A complete binary build requires JAI" unless="jai.present"/>
     <fail message="A complete binary build requires JCE" unless="jce.present"/>
@@ -1270,7 +1271,7 @@ NOTE:
     <gzip zipfile="${name}-${version}-bin.tar.gz" src="${name}-${version}-bin.tar"/>
     <delete file="${name}-${version}-bin.tar"/>
   </target>
-  <target name="dist-src" depends="all">
+  <target name="dist-src">
     <echo message="Building the source distribution files (zip,tar)"/>
     <mkdir dir="${dist.src.result.dir}"/>
     <copy todir="${dist.src.result.dir}">
-- 
cgit v1.2.3