[Libreoffice-commits] .: Branch 'feature/download' - config_host.mk.in download.lst Makefile.fetch
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Nov 23 04:00:58 PST 2012
Makefile.fetch | 29 +++++++++++++++++++++++------
config_host.mk.in | 7 ++++---
download.lst | 10 +++++++---
3 files changed, 34 insertions(+), 12 deletions(-)
New commits:
commit cb15193e9fe67e4055dcb160a708c2de40f57a2f
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Nov 23 12:54:15 2012 +0100
download few tarballs directly without md5sum in name
..and add few fixes, like:
* use 'set -o pipefail' to fail meaningfully
* include download.lst at the end of config_host.mk
* MOZ_ZIP_* do not have md5sum, do not check for it
Change-Id: I23759aa2f5fdd55b662588fdb0a31568a686aef7
diff --git a/Makefile.fetch b/Makefile.fetch
index eb0e35d..3da38c6 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -35,16 +35,31 @@ fetch_Download__checksum_command :=
endif
-define fetch_Download_item
+# fetch__Download_item url tarball-name md5sum
+define fetch__Download_item
$(if $(wildcard $(TARFILE_LOCATION)/$2),, \
cd $(TARFILE_LOCATION)/tmp \
+&& set -o pipefail \
$(call fetch_Download__wget_command,$1,$2) \
-$(call fetch_Download__checksum_command,$2,$(firstword $(subst -, ,$2))) \
+$(if $3,$(call fetch_Download__checksum_command,$2,$3)) \
&& mv $2 ../ \
)
endef
+# fetch_Download_item url tarball-name no-sum?
+define fetch_Download_item
+$(call fetch__Download_item,$1,$2,$(if $3,,$(firstword $(subst -, ,$2))))
+
+endef
+
+# fetch_Download_item_special url variable-name
+define fetch_Download_item_special
+$(if $($(subst _TARBALL,_MD5SUM,$(2))),,$(error "fetch_Download_item_special: $2_MD5SUM can't be empty"))
+$(call fetch__Download_item,$1,$($2),$($(subst _TARBALL,_MD5SUM,$(2))))
+
+endef
+
fetch_BUILD_TYPE := $(sort $(BUILD_TYPE))
ifeq ($(CROSS_COMPILING),YES)
fetch_BUILD_TYPE := $(sort $(fetch_BUILD_TYPE) $(shell . $(SRCDIR)/bin/get_config_variables --build BUILD_TYPE && echo $$BUILD_TYPE))
@@ -56,6 +71,11 @@ endef
fetch :
$(foreach item, \
+ $(call fetch_Optional,CDR,CDR_TARBALL) \
+ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
+ $(call fetch_Optional,VISIO,VISIO_TARBALL) \
+ ,$(call fetch_Download_item_special,http://dev-www.libreoffice.org/src,$(item)))
+ $(foreach item, \
18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz \
7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz \
c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz \
@@ -68,7 +88,6 @@ fetch :
$(call fetch_Optional,BOOST,$(BOOST_TARBALL)) \
$(call fetch_Optional,BSH,$(BSH_TARBALL)) \
$(call fetch_Optional,CAIRO,$(CAIRO_TARBALL)) \
- $(call fetch_Optional,CDR,$(CDR_TARBALL)) \
$(call fetch_Optional,CLUCENE,$(CLUCENE_TARBALL)) \
$(call fetch_Optional,CMIS,$(CMIS_TARBALL)) \
$(call fetch_Optional,CPPUNIT,$(CPPUNIT_TARBALL)) \
@@ -116,7 +135,6 @@ fetch :
$(call fetch_Optional,LPSOLVE,$(LPSOLVE_TARBALL)) \
$(call fetch_Optional,MDDS,$(MDDS_TARBALL)) \
$(call fetch_Optional,MOZ,$(MOZ_TARBALL)) \
- $(call fetch_Optional,MSPUB,$(MSPUB_TARBALL)) \
$(call fetch_Optional,MYSQLCPPCONN,$(MYSQLCPPCONN_TARBALL)) \
$(call fetch_Optional,MYTHES,$(MYTHES_TARBALL)) \
$(call fetch_Optional,NEON,$(NEON_TARBALL)) \
@@ -136,7 +154,6 @@ fetch :
$(call fetch_Optional,TOMCAT,$(TOMCAT_TARBALL)) \
$(call fetch_Optional,UCPP,$(UCPP_TARBALL)) \
$(call fetch_Optional,VIGRA,$(VIGRA_TARBALL)) \
- $(call fetch_Optional,VISIO,$(VISIO_TARBALL)) \
$(call fetch_Optional,WPD,$(WPD_TARBALL)) \
$(call fetch_Optional,WPG,$(WPG_TARBALL)) \
$(call fetch_Optional,WPS,$(WPS_TARBALL)) \
@@ -173,6 +190,6 @@ fetch :
$(call fetch_Optional,MOZ,$(MOZ_ZIP_INC)) \
$(call fetch_Optional,MOZ,$(MOZ_ZIP_LIB)) \
$(call fetch_Optional,MOZ,$(MOZ_ZIP_RUNTIME)) \
- ,$(call fetch_Download_item,http://dev-www.libreoffice.org/mozilla,$(item)))
+ ,$(call fetch_Download_item,http://dev-www.libreoffice.org/mozilla,$(item),no-sum))
# vim: set noet sw=4 ts=4:
diff --git a/config_host.mk.in b/config_host.mk.in
index ce5de21..4531ce8 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -3,9 +3,6 @@
# and not to be sourced in a shell session
#
-# tarball names
-include @SRC_ROOT@/download.lst
-
# Horrible hack to prepend spaces to expansions
# Spaces are usually eaten by make parser but not if variable expands to space.
# Space prefix is desirable because system CFLAGS may be completely empty,
@@ -635,3 +632,7 @@ export XRENDER_LIBS=$(gb_SPACE)@XRENDER_LIBS@
export XSLTPROC=@XSLTPROC@
export ZLIB_CFLAGS=$(gb_SPACE)@ZLIB_CFLAGS@
export ZLIB_LIBS=$(gb_SPACE)@ZLIB_LIBS@
+
+# tarball names
+# does use some of the variables defined above
+include @SRC_ROOT@/download.lst
diff --git a/download.lst b/download.lst
index f9b0edd..258a635 100644
--- a/download.lst
+++ b/download.lst
@@ -1,3 +1,10 @@
+CDR_MD5SUM := 3c0037fb07dea2f0bbae8386fa7c6a9a
+export CDR_TARBALL := libcdr-0.0.9.tar.bz2
+MSPUB_MD5SUM := b2db54b6e96287ac995d7ed654ace4fc
+export MSPUB_TARBALL := libmspub-0.0.3.tar.bz2
+VISIO_MD5SUM := 1e961f0112e5986105749640c2b9bc41
+export VISIO_TARBALL := libvisio-0.0.21.tar.bz2
+
export AFMS_TARBALL := 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
export APACHE_COMMONS_CODEC_TARBALL := af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
export APACHE_COMMONS_HTTPCLIENT_TARBALL := 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
@@ -6,7 +13,6 @@ export APACHE_COMMONS_LOGGING_TARBALL := 3c219630e4302863a9a83d0efde889db-common
export BOOST_TARBALL := f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
export BSH_TARBALL := ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
export CAIRO_TARBALL := f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
-export CDR_TARBALL := 3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2
export CLUCENE_TARBALL := 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
export CMIS_TARBALL := b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
export CPPUNIT_TARBALL := fa9aa839145cdf860bf596532bb8af97-cppunit-1.13.1.tar.gz
@@ -53,7 +59,6 @@ export LIBXSLT_TARBALL := e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
export MDDS_TARBALL := 9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2
export MOZ_TARBALL := a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
-export MSPUB_TARBALL := b2db54b6e96287ac995d7ed654ace4fc-libmspub-0.0.3.tar.bz2
export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
@@ -73,7 +78,6 @@ export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
export TOMCAT_TARBALL := 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
export VIGRA_TARBALL := ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
-export VISIO_TARBALL := 1e961f0112e5986105749640c2b9bc41-libvisio-0.0.21.tar.bz2
export WPD_TARBALL := e7f84e3199dfee9122949448cab3823f-libwpd-0.9.6.tar.bz2
export WPG_TARBALL := 9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2
export WPS_TARBALL := d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
More information about the Libreoffice-commits
mailing list