move ooo.lst and download parts to Makefile.fetch

Change-Id: I2d27341566d383002446c23bdf60c7aa0cabf37d

7 files changed, 179 insertions, 143 deletions

diff --git a/.gitignore b/.gitignore
index f7978e0250f1..ddb84f78ec36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,7 +62,6 @@
 /desktop/scripts/soffice.sh
 /makefile.mk
 /src.downloaded
-/ooo.lst
 /intltool-extract.in
 /intltool-merge.in
 /intltool-update.in
diff --git a/Makefile b/Makefile
index 65be21f95cca..5bd79e1a73ba 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,6 @@ $(filter-out help,$(firstword $(MAKECMDGOALS))) : $(SRCDIR)/config_host.mk
 # run configure in an environment not polluted by config_host.mk
 $(SRCDIR)/config_host.mk : \
 		$(SRCDIR)/config_host.mk.in \
-		$(SRCDIR)/ooo.lst.in \
 		$(SRCDIR)/configure.ac \
 		$(SRCDIR)/autogen.lastrun
 	./autogen.sh
diff --git a/Makefile.fetch b/Makefile.fetch
new file mode 100644
index 000000000000..bf2a6720c93b
--- /dev/null
+++ b/Makefile.fetch
@@ -0,0 +1,170 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+fetch_LOGFILE := $(TARFILE_LOCATION)/fetch.log
+
+ifneq (,$(WGET))
+define fetch_Download__wget_command
+&& $(WGET) --progress=dot:mega -Q 0 -P "." -l 0 -nd -nH -N $1/$2 2>&1 | tee -a $(fetch_LOGFILE)
+endef
+
+else
+define fetch_Download__wget_command
+&& echo fetching $2 && $(CURL) -O $1/$2 2>&1 | tee -a $(fetch_LOGFILE)
+endef
+
+endif
+
+ifneq (,$(MD5SUM))
+define fetch_Download__checksum_command
+&& SUM=`$(MD5SUM) $1 | sed "s/ .*//"` \
+&& if test "$$SUM" != "$2"; then \
+	echo ERROR: expected checksum for $1 is $2 2>&1 | tee -a $(fetch_LOGFILE); \
+	false; \
+fi
+endef
+
+else
+fetch_Download__checksum_command :=
+
+endif
+
+define fetch_Download_item
+$(if $(wildcard $(TARFILE_LOCATION)/$2),, \
+cd $(TARFILE_LOCATION)/tmp \
+$(call fetch_Download__wget_command,$1,$2) \
+$(call fetch_Download__checksum_command,$2,$(firstword $(subst -, ,$2))) \
+&& mv $2 ../ \
+)
+
+endef
+
+fetch :
+	$(foreach item, \
+		$(BUILD_TARBALLS) \
+		18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz \
+		7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz \
+		c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz \
+		4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz \
+		$(AFMS_TARBALL) \
+		$(APACHE_COMMONS_CODEC_TARBALL) \
+		$(APACHE_COMMONS_HTTPCLIENT_TARBALL) \
+		$(APACHE_COMMONS_LANG_TARBALL) \
+		$(APACHE_COMMONS_LOGGING_TARBALL) \
+		$(BOOST_TARBALL) \
+		$(BSH_TARBALL) \
+		$(CAIRO_TARBALL) \
+		$(CDR_TARBALL) \
+		$(CLUCENE_TARBALL) \
+		$(CMIS_TARBALL) \
+		$(CPPUNIT_TARBALL) \
+		$(CT2N_TARBALL) \
+		$(CURL_TARBALL) \
+		$(EPM_TARBALL) \
+		$(EXPAT_TARBALL) \
+		$(FONT_DEJAVU_TARBALL) \
+		$(FONT_GENTIUM_TARBALL) \
+		$(FONT_LIBERATION_NARROW_TARBALL) \
+		$(FONT_LIBERATION_TARBALL) \
+		$(FONT_LINLIBERTINEG_TARBALL) \
+		$(FONT_PTSERIF_TARBALL) \
+		$(FONT_OPENSANS_TARBALL) \
+		$(FONT_SOURCESANS_TARBALL) \
+		$(FONT_SOURCECODE_TARBALL) \
+		$(FONTCONFIG_TARBALL) \
+		$(FREETYPE_TARBALL) \
+		$(GOOGLE_DOCS_EXTENSION_PACK) \
+		$(GRAPHITE_TARBALL) \
+		$(HSQLDB_TARBALL) \
+		$(HUNSPELL_TARBALL) \
+		$(HYPHEN_TARBALL) \
+		$(ICU_TARBALL) \
+		$(ICU_DATA_SUBSET_ZIP) \
+		$(JFREEREPORT_FLOW_ENGINE_TARBALL) \
+		$(JFREEREPORT_FLUTE_TARBALL) \
+		$(JFREEREPORT_LIBBASE_TARBALL) \
+		$(JFREEREPORT_LIBFONTS_TARBALL) \
+		$(JFREEREPORT_LIBFORMULA_TARBALL) \
+		$(JFREEREPORT_LIBLAYOUT_TARBALL) \
+		$(JFREEREPORT_LIBLOADER_TARBALL) \
+		$(JFREEREPORT_LIBREPOSITORY_TARBALL) \
+		$(JFREEREPORT_LIBSERIALIZER_TARBALL) \
+		$(JFREEREPORT_LIBXML_TARBALL) \
+		$(JFREEREPORT_SAC_TARBALL) \
+		$(JPEG_TARBALL) \
+		$(LANGUAGETOOL_TARBALL) \
+		$(LCMS2_TARBALL) \
+		$(LIBEXTTEXTCAT_TARBALL) \
+		$(LIBLANGTAG_TARBALL) \
+		$(LIBXML_TARBALL) \
+		$(LIBXMLSEC_TARBALL) \
+		$(LIBXSLT_TARBALL) \
+		$(LPSOLVE_TARBALL) \
+		$(MDDS_TARBALL) \
+		$(MOZ_TARBALL) \
+		$(MSPUB_TARBALL) \
+		$(MYSQLCPPCONN_TARBALL) \
+		$(MYTHES_TARBALL) \
+		$(NEON_TARBALL) \
+		$(NSS_TARBALL) \
+		$(OPENLDAP_TARBALL) \
+		$(OPENSSL_TARBALL) \
+		$(ORCUS_TARBALL) \
+		$(PIXMAN_TARBALL) \
+		$(PNG_TARBALL) \
+		$(POSTGRESQL_TARBALL) \
+		$(PYTHON_TARBALL) \
+		$(RAPTOR_TARBALL) \
+		$(RASQAL_TARBALL) \
+		$(REDLAND_TARBALL) \
+		$(RHINO_TARBALL) \
+		$(SWING_TARBALL) \
+		$(TOMCAT_TARBALL) \
+		$(UCPP_TARBALL) \
+		$(VIGRA_TARBALL) \
+		$(VISIO_TARBALL) \
+		$(WPD_TARBALL) \
+		$(WPG_TARBALL) \
+		$(WPS_TARBALL) \
+		$(XPDF_TARBALL) \
+		$(XSLTML_TARBALL) \
+		$(ZLIB_TARBALL) \
+	,$(call fetch_Download_item,http://dev-www.libreoffice.org/src,$(item)))
+	$(foreach item, \
+		$(DBGHELP_DLL) \
+		$(UNOWINREG_DLL) \
+	,$(call fetch_Download_item,http://dev-www.libreoffice.org/extern,$(item)))
+	$(foreach item, \
+		$(BARCODE_EXTENSION_PACK) \
+		$(DIAGRAM_EXTENSION_PACK) \
+		$(HUNART_EXTENSION_PACK) \
+		$(NUMBERTEXT_EXTENSION_PACK) \
+		$(OOOBLOGGER_EXTENSION_PACK) \
+		$(OOOP_FONTS_PACK) \
+		$(OOOP_GALLERY_PACK) \
+		$(OOOP_SAMPLES_PACK) \
+		$(OOOP_TEMPLATES_PACK) \
+		$(OXYGENOFFICE_PACK) \
+		$(SUNTEMPLATES_DE_PACK) \
+		$(SUNTEMPLATES_EN_US_PACK) \
+		$(SUNTEMPLATES_ES_PACK) \
+		$(SUNTEMPLATES_FR_PACK) \
+		$(SUNTEMPLATES_HU_PACK) \
+		$(SUNTEMPLATES_IT_PACK) \
+		$(TYPO_EXTENSION_PACK) \
+		$(VALIDATOR_EXTENSION_PACK) \
+		$(WATCH_WINDOW_EXTENSION_PACK) \
+	,$(call fetch_Download_item,http://ooo.itc.hu/oxygenoffice/download/libreoffice,$(item)))
+	$(foreach item, \
+		$(MOZ_ZIP_INC) \
+		$(MOZ_ZIP_LIB) \
+		$(MOZ_ZIP_RUNTIME) \
+	,$(call fetch_Download_item,http://dev-www.libreoffice.org/mozilla,$(item)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/Makefile.top b/Makefile.top
index 283128e3ef9f..3d570f816e7f 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -351,7 +351,7 @@ ifeq ($(BUILD_DMAKE),YES)
 	rm -f solenv/*/bin/dmake*
 endif
 	rm -fr config_host.mk config_build.mk aclocal.m4 autom4te.cache \
-	config.log config.status configure ooo.lst \
+	config.log config.status configure \
 	config_host.mk.last config_host.mk.stamp src.downloaded warn
 	find $(SOLARENV)/gdb -name "*.pyc" -exec rm {} \;
 
@@ -368,11 +368,14 @@ ifneq ($(filter-out clean distclean,$(MAKECMDGOALS)),)
 #
 # Fetch
 #
-fetch: src.downloaded
+ifeq ($(DO_FETCH_TARBALLS),YES)
+include $(SRCDIR)/Makefile.fetch
+endif
+fetch: $(SRCDIR)/src.downloaded
 
-src.downloaded : Makefile.top download ooo.lst
+$(SRCDIR)/src.downloaded : $(SRCDIR)/download $(SRCDIR)/config_host.mk
 ifeq ($(DO_FETCH_TARBALLS),YES)
-	@./download $(SRCDIR)/ooo.lst && touch $@
+	@$< && touch $@
 else
 	@echo "Automatic fetching of external tarballs is disabled."
 endif
diff --git a/configure.ac b/configure.ac
index 1184729aff49..b0f7f357d0d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4113,7 +4113,6 @@ if test "$cross_compiling" = "yes"; then
         config.guess \
         config_host.mk.in \
         configure \
-        ooo.lst.in \
         oowintool \
         bin/get_config_variables \
         solenv/bin/getcompver.awk \
@@ -11196,7 +11195,7 @@ AC_SUBST(WITH_FONTS)
 
 
 # The agfa monotype fonts options seems broken
-# there is no assocaited entry in ooo.lst
+# there is no assocaited entry in Makefile.fetch
 # so we do not fetch the dependencies
 # there is no tie-up with MORE_FONTS, but in dmake mode
 # without more_fonts that option is meaningless
@@ -12575,7 +12574,7 @@ else
     echo > config_host.mk.last
 fi
 
-AC_CONFIG_FILES([config_host.mk ooo.lst])
+AC_CONFIG_FILES([config_host.mk])
 AC_OUTPUT
 
 # touch the config timestamp file
diff --git a/download b/download
index 90ec67e22e21..0a0e7d3a6201 100755
--- a/download
+++ b/download
@@ -71,12 +71,6 @@ if [ ! -d "$TARFILE_LOCATION" ]; then
     exit 1
 fi
 
-FILELIST="$1"
-if [ -z "$FILELIST" ]; then
-    echo "No filelist provided, using the default ooo.lst."
-    FILELIST="ooo.lst"
-fi
-
 start_dir=`pwd`
 logfile=$TARFILE_LOCATION/fetch.log
 date >> $logfile
@@ -122,22 +116,9 @@ downloaditem()
     fi
 }
 
-filelist=`cat $FILELIST`
 mkdir -p $TARFILE_LOCATION/tmp
 cd $TARFILE_LOCATION/tmp
 echo $$ > fetch-running
-for i in $filelist ; do
-#    echo $i
-    if [ "$i" != `echo $i | sed "s/^http:\///"` ]; then
-        tarurl=$i
-    # TODO: check for comment
-    else
-        if [ "$tarurl" != "" ]; then
-            sum=`echo $i | sed "s/-.*//"`
-            downloaditem $tarurl $i $sum
-        fi
-    fi
-done
 
 if [ -f $start_dir/sources.ver -a ! -d $start_dir/.git ] ; then
     # these sources are from a tarball, so get the other source tarballs
diff --git a/ooo.lst.in b/ooo.lst.in
deleted file mode 100644
index 2872ccf0a098..000000000000
--- a/ooo.lst.in
+++ /dev/null
@@ -1,115 +0,0 @@
-http://dev-www.libreoffice.org/src
-18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
-c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
-4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
-@AFMS_TARBALL@
-@APACHE_COMMONS_CODEC_TARBALL@
-@APACHE_COMMONS_HTTPCLIENT_TARBALL@
-@APACHE_COMMONS_LANG_TARBALL@
-@APACHE_COMMONS_LOGGING_TARBALL@
-@BOOST_TARBALL@
-@BSH_TARBALL@
-@CAIRO_TARBALL@
-@CDR_TARBALL@
-@CLUCENE_TARBALL@
-@CMIS_TARBALL@
-@CPPUNIT_TARBALL@
-@CT2N_TARBALL@
-@CURL_TARBALL@
-@EPM_TARBALL@
-@EXPAT_TARBALL@
-@FONT_DEJAVU_TARBALL@
-@FONT_GENTIUM_TARBALL@
-@FONT_LIBERATION_NARROW_TARBALL@
-@FONT_LIBERATION_TARBALL@
-@FONT_LINLIBERTINEG_TARBALL@
-@FONT_PTSERIF_TARBALL@
-@FONT_OPENSANS_TARBALL@
-@FONT_SOURCESANS_TARBALL@
-@FONT_SOURCECODE_TARBALL@
-@FONTCONFIG_TARBALL@
-@FREETYPE_TARBALL@
-@GOOGLE_DOCS_EXTENSION_PACK@
-@GRAPHITE_TARBALL@
-@HSQLDB_TARBALL@
-@HUNSPELL_TARBALL@
-@HYPHEN_TARBALL@
-@ICU_TARBALL@
-@ICU_DATA_SUBSET_ZIP@
-@JFREEREPORT_FLOW_ENGINE_TARBALL@
-@JFREEREPORT_FLUTE_TARBALL@
-@JFREEREPORT_LIBBASE_TARBALL@
-@JFREEREPORT_LIBFONTS_TARBALL@
-@JFREEREPORT_LIBFORMULA_TARBALL@
-@JFREEREPORT_LIBLAYOUT_TARBALL@
-@JFREEREPORT_LIBLOADER_TARBALL@
-@JFREEREPORT_LIBREPOSITORY_TARBALL@
-@JFREEREPORT_LIBSERIALIZER_TARBALL@
-@JFREEREPORT_LIBXML_TARBALL@
-@JFREEREPORT_SAC_TARBALL@
-@JPEG_TARBALL@
-@LANGUAGETOOL_TARBALL@
-@LCMS2_TARBALL@
-@LIBEXTTEXTCAT_TARBALL@
-@LIBLANGTAG_TARBALL@
-@LIBXML_TARBALL@
-@LIBXMLSEC_TARBALL@
-@LIBXSLT_TARBALL@
-@LPSOLVE_TARBALL@
-@MDDS_TARBALL@
-@MOZ_TARBALL@
-@MSPUB_TARBALL@
-@MYSQLCPPCONN_TARBALL@
-@MYTHES_TARBALL@
-@NEON_TARBALL@
-@NSS_TARBALL@
-@OPENLDAP_TARBALL@
-@OPENSSL_TARBALL@
-@ORCUS_TARBALL@
-@PIXMAN_TARBALL@
-@PNG_TARBALL@
-@POSTGRESQL_TARBALL@
-@PYTHON_TARBALL@
-@RAPTOR_TARBALL@
-@RASQAL_TARBALL@
-@REDLAND_TARBALL@
-@RHINO_TARBALL@
-@SWING_TARBALL@
-@TOMCAT_TARBALL@
-@UCPP_TARBALL@
-@VIGRA_TARBALL@
-@VISIO_TARBALL@
-@WPD_TARBALL@
-@WPG_TARBALL@
-@WPS_TARBALL@
-@XPDF_TARBALL@
-@XSLTML_TARBALL@
-@ZLIB_TARBALL@
-http://dev-www.libreoffice.org/extern
-@DBGHELP_DLL@
-@UNOWINREG_DLL@
-http://ooo.itc.hu/oxygenoffice/download/libreoffice/
-@BARCODE_EXTENSION_PACK@
-@DIAGRAM_EXTENSION_PACK@
-@HUNART_EXTENSION_PACK@
-@NUMBERTEXT_EXTENSION_PACK@
-@OOOBLOGGER_EXTENSION_PACK@
-@OOOP_FONTS_PACK@
-@OOOP_GALLERY_PACK@
-@OOOP_SAMPLES_PACK@
-@OOOP_TEMPLATES_PACK@
-@OXYGENOFFICE_PACK@
-@SUNTEMPLATES_DE_PACK@
-@SUNTEMPLATES_EN_US_PACK@
-@SUNTEMPLATES_ES_PACK@
-@SUNTEMPLATES_FR_PACK@
-@SUNTEMPLATES_HU_PACK@
-@SUNTEMPLATES_IT_PACK@
-@TYPO_EXTENSION_PACK@
-@VALIDATOR_EXTENSION_PACK@
-@WATCH_WINDOW_EXTENSION_PACK@
-http://dev-www.libreoffice.org/mozilla/
-@MOZ_ZIP_INC@
-@MOZ_ZIP_LIB@
-@MOZ_ZIP_RUNTIME@