[ooo-build-commit] .: bin/setup.in bin/unpack configure.in download.in

[Fridrich Strba]

 bin/setup.in |    2 ++
 bin/unpack   |    3 ---
 configure.in |    3 +++
 download.in  |    4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit d0dbbcd7f9b20715494d0f4d9144fa18187d2118
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Sep 20 10:31:48 2010 +0200

    Set the APACHE_ANT_TARBALL in a centralized place
    
    Avoid having the APACHE_ANT_TARBALL defined all around the place which makes an eventual upgrade tedious

diff --git a/bin/setup.in b/bin/setup.in
index 367d895..0af62b7 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -88,6 +88,8 @@ export GNUCP=@GNUCP@
 GNUPATCH=@GNUPATCH@
 GNUTAR=@GNUTAR@
 DRINK="@DRINK@"
+APACHE_ANT_TARBALL=@APACHE_ANT_TARBALL@
+
 if [ -z "$TARFILE_LOCATION" ]; then TARFILE_LOCATION=$SRCDIR; fi
 
 if test -f "$TOOLSDIR/distro-configs/Common.conf" ; then
diff --git a/bin/unpack b/bin/unpack
index 91076a4..fb3618c 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -612,9 +612,6 @@ else
 fi
 
 if test "z$DISTRO" != "zOOo4Kids"; then
-    APACHE_ANT='apache-ant-1.7.0'
-    APACHE_ANT_TARBALL=$APACHE_ANT-bin.tar.gz
-
     if test "z$BUILD_WIN32" != "z"; then
 	    check_file $SRCDIR/$APACHE_ANT_TARBALL
     else
diff --git a/configure.in b/configure.in
index c92ad2c..b739a6d 100644
--- a/configure.in
+++ b/configure.in
@@ -896,6 +896,9 @@ AC_SUBST(PREBUILT_EXTENSIONAIDS_TIMESTAMP)
 BUILD_MOZILLA_SOURCE='seamonkey-1.1.14.source.tar.gz'
 AC_SUBST(BUILD_MOZILLA_SOURCE)
 
+APACHE_ANT_TARBALL='apache-ant-1.7.0-bin.tar.gz'
+AC_SUBST(APACHE_ANT_TARBALL)
+
 AGFA_MONOTYPE_FONTS_SOURCE='agfa-monotype-fonts.tar.gz'
 AC_SUBST(AGFA_MONOTYPE_FONTS_SOURCE)
 
diff --git a/download.in b/download.in
index 044e404..39c8785 100755
--- a/download.in
+++ b/download.in
@@ -417,7 +417,7 @@ if ('@BUILD_WIN32@' ne '')
     source_file( 'instmsia.exe' ) unless '@DISTRO@' =~ m/NovellWin32|GoOoWin32/;
     # instmsiw.exe can't be downloaded without Genuine Windows validation
 
-    source_file( "apache-ant-1.7.0-bin.tar.gz" );
+    source_file( '@APACHE_ANT_TARBALL@' );
 
 # Comment out the Mozilla source bits until we can compile it
 # with MSVS2008
@@ -442,7 +442,7 @@ else
         source_file( 'ooo-cli-prebuilt-3.3.tar.bz2' );
     }
     if ( $download_all ) {
-        source_file( "apache-ant-1.7.0-bin.tar.gz" );
+        source_file( '@APACHE_ANT_TARBALL@' );
     }
 }