The goal is to have setenv.xml download, extract and source ant-contrib tasks. We want to be able to avoid the download and extract phases if they are unnecessary, and this requires creating a timestamp file.
Until now, this was required only in build.xml. Handling ant-contrib, which is done at the setup stage (therefore in setenv.xml), changes that. Therefore, move the necessary include and macro definition from build.xml to setenv.xml Signed-off-by: Francis Galiegue <[email protected]> --- build.xml | 13 ------------- setenv.xml | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.xml b/build.xml index 34f150c..3860d26 100644 --- a/build.xml +++ b/build.xml @@ -1,6 +1,5 @@ <project default="all" basedir="."> - <property file="buildpath.properties"/> <property file="build.properties"/> <property name="sourceDir" value="."/> @@ -15,18 +14,6 @@ </path> <!-- - Macro for creating a timestamp - --> - - <macrodef name="dostamp"> - <attribute name="stampfile"/> - <sequential> - <mkdir dir="${timestamp.dir}"/> - <touch file="${timestamp.dir}/@{stampfile}"/> - </sequential> - </macrodef> - - <!-- Import the setenv.xml file. It defines the setenv target, which init.taskdef below depends upon. --> diff --git a/setenv.xml b/setenv.xml index df8e40b..1d7d9e2 100644 --- a/setenv.xml +++ b/setenv.xml @@ -8,6 +8,7 @@ --> <taskdef resource="net/sf/antcontrib/antlib.xml"/> + <property file="buildpath.properties"/> <property file="antcontrib.properties"/> <!-- @@ -19,6 +20,18 @@ <tstamp/> <!-- + Macro for creating a timestamp + --> + + <macrodef name="dostamp"> + <attribute name="stampfile"/> + <sequential> + <mkdir dir="${timestamp.dir}"/> + <touch file="${timestamp.dir}/@{stampfile}"/> + </sequential> + </macrodef> + + <!-- Do we have QTDIR set at all? --> -- 1.6.6.rc3 _______________________________________________ Qt-jambi-interest mailing list [email protected] http://lists.trolltech.com/mailman/listinfo/qt-jambi-interest
