[ooo-build-commit] .: bin/build-ooo bin/setup.in download_external_sources.sh download.in

[René Engelhard]

 bin/build-ooo                |    2 ++
 bin/setup.in                 |    1 +
 download.in                  |    5 +++++
 download_external_sources.sh |   16 ++++++++++++++++
 4 files changed, 24 insertions(+)

New commits:
commit a07c06902f8dca878109d3fdfbebca23ec718dc5
Author: Rene Engelhard <rene at debian.org>
Date:   Fri May 14 13:07:40 2010 +0200

    download external upstream sources in download
    
    * bin/build-ooo:
    * bin/setup.in:
    * download.in:
    * download_external_sources.sh:

diff --git a/bin/build-ooo b/bin/build-ooo
index d90c159..6a4cd28 100755
--- a/bin/build-ooo
+++ b/bin/build-ooo
@@ -5,6 +5,8 @@
 #
 . ./setup
 
+export TARFILE_LOCATION
+
 if test "z$BUILD_WIN32" = "z" -a "z`uname -s`" != "zSunOS" -a "z`uname -s`" != "zDarwin"; then
     if ! test -f /proc/cpuinfo; then
         echo "Looks like proc isn't mounted - this means almost certain"
diff --git a/bin/setup.in b/bin/setup.in
index 12e59a1..e595dfe 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -84,6 +84,7 @@ GNUPATCH=@GNUPATCH@
 GNUTAR=@GNUTAR@
 DRINK="@DRINK@"
 OXYGEN_IMAGES_TAR='@OXYGEN_IMAGES_TAR@'
+if [ -z "$TARFILE_LOCATION" ]; then TARFILE_LOCATION=$SRCDIR; fi
 
 if test -f "$TOOLSDIR/distro-configs/Common.conf" ; then
     COMMON_OPTIONS="`cat $TOOLSDIR/distro-configs/Common.conf | xargs`";
diff --git a/download.in b/download.in
index 4d0416f..fa79933 100755
--- a/download.in
+++ b/download.in
@@ -54,6 +54,9 @@ sub trim($)
     return $string;
 }
 
+sub download_external_sources() {
+	system("./download_external_sources.sh")
+}
 
 %SRC_URLS = (
     'http:\/\/.*'                        => '',
@@ -573,6 +576,8 @@ if ($download_all ||
 
 download_files (\@files, \%SRC_URLS, '@SRCDIR@');
 
+download_external_sources();
+
 open (FILELIST, ">download.list");
 print FILELIST join ("\n", @files);
 print FILELIST "\n";
diff --git a/download_external_sources.sh b/download_external_sources.sh
new file mode 100644
index 0000000..c3fdadd
--- /dev/null
+++ b/download_external_sources.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+. ./bin/setup
+
+export TARFILE_LOCATION
+TAG=`echo $CVSTAG | tr a-z A-Z | sed -e s/-M/_m/`
+MWS=`echo $TAG | cut -d_ -f1`
+tmp=`mktemp -q -d`
+
+cd $tmp
+wget http://hg.services.openoffice.org/${MWS}/raw-file/${TAG}/fetch_tarballs.sh && chmod 755 ./fetch_tarballs.sh
+wget http://hg.services.openoffice.org/${MWS}/raw-file/${TAG}/ooo.lst
+./fetch_tarballs.sh ooo.lst &&  rm -f fetch_tarballs.sh ooo.lst
+cd ..
+rmdir $tmp
+