[Libreoffice-commits] core.git: Makefile.fetch
Makefile.fetch |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e8db364c1db90177aa02650b608860244c0fb0be Author: Andras Timar AuthorDate: Fri Feb 22 15:35:44 2019 +0100 Commit: Andras Timar CommitDate: Mon Feb 25 13:18:14 2019 +0100 cURL: follow redirects Change-Id: I58d25348f4b43145a19ca0edbc5cde2e9a57f468 Reviewed-on: https://gerrit.libreoffice.org/68209 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/Makefile.fetch b/Makefile.fetch index 3f8250a98cb0..522a4e22bc72 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -16,7 +16,7 @@ endef else define fetch_Download__wget_command -&& echo fetching $2 && bash -c '$(CURL) -O $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]' +&& echo fetching $2 && bash -c '$(CURL) -L -O $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]' endef endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Makefile.fetch
Makefile.fetch |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 84151f7aa93521070fe405c60cbd0eaab4305805 Author: Kacper Kasper AuthorDate: Sun Aug 5 21:18:33 2018 +0200 Commit: Michael Meeks CommitDate: Wed Aug 29 11:16:23 2018 +0200 Fetch xmlsec only if necessary Change-Id: I4c5fe29c539d0f64c6cfede79a832f68feee1205 Reviewed-on: https://gerrit.libreoffice.org/58629 Tested-by: Jenkins Reviewed-by: Michael Meeks diff --git a/Makefile.fetch b/Makefile.fetch index 2d1aa0481735..59aadccaffe3 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -161,7 +161,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,LIBPNG,LIBPNG_TARBALL) \ $(call fetch_Optional,LIBTOMMATH,LIBTOMMATH_TARBALL) \ $(call fetch_Optional,LIBXML2,LIBXML_TARBALL) \ - XMLSEC_TARBALL \ + $(call fetch_Optional,XMLSEC,XMLSEC_TARBALL) \ $(call fetch_Optional,LIBXSLT,LIBXSLT_TARBALL) \ $(call fetch_Optional,LPSOLVE,LPSOLVE_TARBALL) \ $(call fetch_Optional,LXML,LXML_TARBALL) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Makefile.fetch Makefile.in
Makefile.fetch |2 +- Makefile.in|2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) New commits: commit fe3fb5ecd3b66e32cc5aa64a2afffa572353740e Author: Michael Stahl Date: Mon May 22 17:21:51 2017 +0200 Makefile: try to fix downloading externals for build platform When cross-compiling, it's possible that an external is only used on the build platform and not the host platform. Attempt to fix this by invoking "make fetch" twice; it looks like this should not be combined with the exising "build-tools" invocation because that needs to be delayed until everything is fetched. Change-Id: I42626a30359d54dce3c0a5a8ea07045c099cea59 Reviewed-on: https://gerrit.libreoffice.org/37912 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/Makefile.fetch b/Makefile.fetch index 3b0cf56facd6..25c77f5a02cd 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -96,7 +96,7 @@ endef download: $(WORKDIR)/download -$(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)/Makefile.fetch +$(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(SRCDIR)/Makefile.fetch -@mkdir -p $(TARFILE_LOCATION)/tmp @date >> $(fetch_LOGFILE) $(foreach item, \ diff --git a/Makefile.in b/Makefile.in index 0af8a53373a3..63c404fce3be 100644 --- a/Makefile.in +++ b/Makefile.in @@ -275,6 +275,8 @@ help showmodules gbuildtojson: $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ cross-toolset: bootstrap fetch + # fetch again in case there are externals only needed on build platform + $(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile fetch $(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build-tools ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Makefile.fetch
Makefile.fetch |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 2f3060d40a7c6972a2054514e59cea36e0437951 Author: Caolán McNamara Date: Fri Apr 28 11:41:44 2017 +0100 download via https rather than http Change-Id: I2840d116d1a59e19f5869c0550c6ed3d1b911304 Reviewed-on: https://gerrit.libreoffice.org/37063 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/Makefile.fetch b/Makefile.fetch index 5958db10db09..3b0cf56facd6 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -212,14 +212,14 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,XSLTML,XSLTML_TARBALL) \ $(call fetch_Optional,ZLIB,ZLIB_TARBALL) \ $(call fetch_Optional,ZMF,ZMF_TARBALL) \ - ,$(call fetch_Download_item,http://dev-www.libreoffice.org/src,$(item))) + ,$(call fetch_Download_item,https://dev-www.libreoffice.org/src,$(item))) $(foreach item, \ $(call fetch_Optional,ODK,UNOWINREG_DLL) \ $(call fetch_Optional,ODFVALIDATOR,ODFVALIDATOR_JAR) \ $(call fetch_Optional,OFFICEOTRON,OFFICEOTRON_JAR) \ - ,$(call fetch_Download_item,http://dev-www.libreoffice.org/extern,$(item))) + ,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item))) $(if $(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL) \ - , $(call fetch_Download_item,http://dev-www.libreoffice.org/src/libgltf,$(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL))) + , $(call fetch_Download_item,https://dev-www.libreoffice.org/src/libgltf,$(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL))) @mkdir -p $(dir $@) && touch $@ # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Makefile.fetch
Makefile.fetch |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit 48670533998f078525f7dad94b89bc371a5b3947 Author: Khaled Hosny Date: Sat Mar 11 04:09:21 2017 +0200 Ignore the checksum embedded in the file name That is always MD5 sum, but we expect SHA256 now. Change-Id: I8edf61b9a663f6f1ecc5cf23c93211e0b3201631 Reviewed-on: https://gerrit.libreoffice.org/35067 Tested-by: Jenkins Reviewed-by: Khaled Hosny diff --git a/Makefile.fetch b/Makefile.fetch index 3091c5e..de929d8 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -59,10 +59,7 @@ endef define fetch_Download_item $(if $(strip $($(2))),,$(error fetch__Download_item: $(2) is empty)) $(if $(filter undefined,$(origin $(call fetch_Download__subst_var,$(2,\ - $(if $(call fetch_Download__is_checksum,$(firstword $(subst -, ,$($(2),\ - $(call fetch__Download_item,$1,$($2),$(firstword $(subst -, ,$($(2),\ - $(error "fetch_Download_item: no checksum found for $($(2)). Please define $(call fetch_Download__subst_var,$(2)) in download.lst.") \ - ),\ + $(error "fetch_Download_item: no checksum found for $($(2)). Please define $(call fetch_Download__subst_var,$(2)) in download.lst."),\ $(call fetch__Download_item,$(1),$($2),$($(call fetch_Download__subst_var,$(2 \ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Makefile.fetch
Makefile.fetch |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 424897ba348093ab1697c676a3e44b9060c5b2da Author: Bryan Quigley Date: Wed Jan 25 15:13:25 2017 -0500 Stop working around broken IPv6 site This basically reverts 324212ce01c10a8811d25c95d1ae6a83d8214f3d which forced wget to only use IPv4. dev-www.libreoffice.org's IPv6 support was broken for a while. It appears to be back to working. Change-Id: Ib235ddd5719089eaf9d4559bd913571fc46069d1 Reviewed-on: https://gerrit.libreoffice.org/33558 Reviewed-by: jan iversen Tested-by: jan iversen diff --git a/Makefile.fetch b/Makefile.fetch index db62719..a350b2f 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -11,7 +11,7 @@ fetch_LOGFILE := $(TARFILE_LOCATION)/fetch.log ifneq (,$(WGET)) define fetch_Download__wget_command -&& bash -c '$(WGET) --progress=dot:mega -4 -Q 0 -P "." -l 0 -nd -nH -N --no-use-server-timestamps $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]' +&& bash -c '$(WGET) --progress=dot:mega -Q 0 -P "." -l 0 -nd -nH -N --no-use-server-timestamps $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]' endef else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Makefile.fetch
Makefile.fetch |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2f79c760b48965a04c260745fb9a23a6e1086faa Author: Michael Stahl Date: Fri Jan 8 15:08:32 2016 +0100 Makefile.fetch: don't use server side time stamps The wget download apparently uses the time stamp of the file on the server by default, which breaks incremental builds. If wget downloads the file and it does not get the current timestamp at the time of download but the one the file happens to have on the server, then if you built from the previous version of the tarball at a later time than the timestamp of the new tarball, make won't detect that it has to unpack the new tarball. The curl download should not be affected since curl requires an explicit -R to use the server side time stamp. Change-Id: I6bab51d20b8ab5e485fe68d3f27c31aaddc99f68 diff --git a/Makefile.fetch b/Makefile.fetch index 4816ed6..8d63d25 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -11,7 +11,7 @@ fetch_LOGFILE := $(TARFILE_LOCATION)/fetch.log ifneq (,$(WGET)) define fetch_Download__wget_command -&& bash -c '$(WGET) --progress=dot:mega -4 -Q 0 -P "." -l 0 -nd -nH -N $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]' +&& bash -c '$(WGET) --progress=dot:mega -4 -Q 0 -P "." -l 0 -nd -nH -N --no-use-server-timestamps $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]' endef else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Makefile.fetch
Makefile.fetch |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 884606e74bee007c0286a16fb8aa8fc8af9a8779 Author: Michael Stahl Date: Mon Oct 5 17:44:10 2015 +0200 Makefile.fetch: explicitly invoke bash for $PIPESTATUS Since commit 5067d31364695d892d4290afb039a9877450fccb the SHELL variable is no longer set to bash in Makefile.in, so $PIPESTATUS is empty and the fetch command fails due to syntax error (as reported by Olivier Hallot). Since i have no idea how to implement the equivalent of $PIPESTATUS for shells that lack it, just invoke bash explicitly here. Change-Id: I7e27377e54c7e19175abcbec0beefca31a55a2bd Reviewed-on: https://gerrit.libreoffice.org/19164 Reviewed-by: Eike Rathke Tested-by: Eike Rathke diff --git a/Makefile.fetch b/Makefile.fetch index 8429228..44d8aad 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -11,12 +11,12 @@ fetch_LOGFILE := $(TARFILE_LOCATION)/fetch.log ifneq (,$(WGET)) define fetch_Download__wget_command -&& $(WGET) --progress=dot:mega -4 -Q 0 -P "." -l 0 -nd -nH -N $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ] +&& bash -c '$(WGET) --progress=dot:mega -4 -Q 0 -P "." -l 0 -nd -nH -N $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]' endef else define fetch_Download__wget_command -&& echo fetching $2 && $(CURL) -O $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ] +&& echo fetching $2 && bash -c '$(CURL) -O $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]' endef endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Makefile.fetch
Makefile.fetch |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 324212ce01c10a8811d25c95d1ae6a83d8214f3d Author: Bryan Quigley Date: Fri Oct 2 00:40:15 2015 -0400 Workaround broken ipv6 site This just forces wget to use ipv4 when downloading more context here: http://lists.freedesktop.org/archives/libreoffice/2015-October/070412.html Change-Id: Id7e6a2ccd2301aa0fd1456d20309fe4936b4a20b Reviewed-on: https://gerrit.libreoffice.org/19090 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/Makefile.fetch b/Makefile.fetch index 87c8b8a..8429228 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -11,7 +11,7 @@ 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) && [ $$PIPESTATUS -eq 0 ] +&& $(WGET) --progress=dot:mega -4 -Q 0 -P "." -l 0 -nd -nH -N $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ] endef else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Makefile.fetch
Makefile.fetch |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ca13d1f6988bc1671000a30af483b00eb15bcdb8 Author: Zolnai Tamás Date: Mon Jul 14 10:53:11 2014 +0200 libgltf: download from libgltf subfolder Change-Id: If535d4c8075adf610575a5a5adf0dcad0b8f182a diff --git a/Makefile.fetch b/Makefile.fetch index 1c0d53e..e42ea40 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -156,7 +156,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,LIBATOMIC_OPS,LIBATOMIC_OPS_TARBALL) \ $(call fetch_Optional,LIBEOT,LIBEOT_TARBALL) \ $(call fetch_Optional,LIBEXTTEXTCAT,LIBEXTTEXTCAT_TARBALL) \ - $(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL) \ $(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \ $(call fetch_Optional,LIBLANGTAG,LIBLANGTAG_TARBALL) \ $(call fetch_Optional,LIBPNG,PNG_TARBALL) \ @@ -236,6 +235,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,MOZ,$(MOZ_ZIP_LIB)) \ $(call fetch_Optional,MOZ,$(MOZ_ZIP_RUNTIME)) \ ,$(call fetch_Download_item_unchecked,http://dev-www.libreoffice.org/mozilla,$(item))) + $(call fetch_Download_item,http://dev-www.libreoffice.org/src/libgltf,$(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL)) @mkdir -p $(dir $@) && touch $@ # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Makefile.fetch
Makefile.fetch |1 + 1 file changed, 1 insertion(+) New commits: commit e2c0e024d6466c991330a77b20be5334cb31b716 Author: David Tardon Date: Fri Jun 27 11:07:06 2014 +0200 download libpagemaker tarball Change-Id: Ib0ad5408078308bf790cbffe10ff1399c6c95dbe diff --git a/Makefile.fetch b/Makefile.fetch index 204c8f8..1c0d53e 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -189,6 +189,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,OPENLDAP,OPENLDAP_TARBALL) \ $(call fetch_Optional,OPENSSL,OPENSSL_TARBALL) \ $(call fetch_Optional,ORCUS,ORCUS_TARBALL) \ + $(call fetch_Optional,PAGEMAKER,PAGEMAKER_TARBALL) \ $(call fetch_Optional,POPPLER,POPPLER_TARBALL) \ $(call fetch_Optional,POSTGRESQL,POSTGRESQL_TARBALL) \ $(call fetch_Optional,PYTHON,PYTHON_TARBALL) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Makefile.fetch
Makefile.fetch | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) New commits: commit 5409010efc6d7f81d2e87e6156a6bd0604355d24 Author: David Tardon Date: Thu May 15 08:23:15 2014 +0200 fix downloading unowinreg.dll Change-Id: I24b30ce4f53894796cadd9164f2930523a5f1123 diff --git a/Makefile.fetch b/Makefile.fetch index 3683fdf..b9f500f 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -51,15 +51,19 @@ define fetch_Download__is_checksum $(filter 32,$(words $(shell echo $(1) | sed -e 's/./& /g'))) endef +define fetch_Download__subst_var +$(subst _DLL,_MD5SUM,$(subst _TARBALL,_MD5SUM,$(subst _PACK,_MD5SUM,$(1 +endef + # fetch_Download_item url variable-name define fetch_Download_item $(if $(strip $($(2))),,$(error fetch__Download_item: $(2) is empty)) -$(if $(filter undefined,$(origin $(subst _TARBALL,_MD5SUM,$(subst _PACK,_MD5SUM,$(2),\ +$(if $(filter undefined,$(origin $(call fetch_Download__subst_var,$(2,\ $(if $(call fetch_Download__is_checksum,$(firstword $(subst -, ,$($(2),\ $(call fetch__Download_item,$1,$($2),$(firstword $(subst -, ,$($(2),\ - $(error "fetch_Download_item: no checksum found for $($(2)). Please define $(subst _TARBALL,_MD5SUM,$(subst _PACK,_MD5SUM,$(2))) in download.lst.") \ + $(error "fetch_Download_item: no checksum found for $($(2)). Please define $(call fetch_Download__subst_var,$(2)) in download.lst.") \ ),\ - $(call fetch__Download_item,$(1),$($2),$($(subst _TARBALL,_MD5SUM,$(subst _PACK,_MD5SUM,$(2) \ + $(call fetch__Download_item,$(1),$($2),$($(call fetch_Download__subst_var,$(2 \ ) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Makefile.fetch
Makefile.fetch |1 - 1 file changed, 1 deletion(-) New commits: commit 6b1b65a1651980861f921b5dcfca2d609fc4127b Author: David Tardon Date: Sun May 11 15:45:33 2014 +0200 drop another nonexistent tarball from download list Change-Id: I1b209f5f016a8596a7ec0e51fc33d67be21a61d8 diff --git a/Makefile.fetch b/Makefile.fetch index 46bbc36..9364ac4 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -192,7 +192,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,RHINO,RHINO_TARBALL) \ $(call fetch_Optional,RHINO,SWING_TARBALL) \ $(call fetch_Optional,SERF,SERF_TARBALL) \ - $(call fetch_Optional,TOMCAT,TOMCAT_TARBALL) \ $(call fetch_Optional,UCPP,UCPP_TARBALL) \ $(call fetch_Optional,VIGRA,VIGRA_TARBALL) \ $(call fetch_Optional,VISIO,VISIO_TARBALL) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Makefile.fetch
Makefile.fetch |1 + 1 file changed, 1 insertion(+) New commits: commit 717ca9ca1097b528bfff166ab9c5363f29a70ea4 Author: David Tardon Date: Sun May 11 15:30:35 2014 +0200 check for empty tarball var. Change-Id: I62a75f75594437a55b12b56617517b4db50ae9c2 diff --git a/Makefile.fetch b/Makefile.fetch index cdac3ae..46bbc36 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -53,6 +53,7 @@ endef # fetch_Download_item url variable-name define fetch_Download_item +$(if $(strip $($(2))),,$(error fetch__Download_item: $(2) is empty)) $(if $(filter undefined,$(origin $(subst _TARBALL,_MD5SUM,$(subst _PACK,_MD5SUM,$(2),\ $(if $(call fetch_Download__is_checksum,$(firstword $(subst -, ,$($(2),\ $(call fetch__Download_item,$1,$($2),$(firstword $(subst -, ,$($(2),\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Makefile.fetch
Makefile.fetch |1 - 1 file changed, 1 deletion(-) New commits: commit 8c35902cc66794e0eec5899413b24b98d25cbc5d Author: David Tardon Date: Sun May 11 15:26:58 2014 +0200 drop nonexistent tarball from download list Change-Id: I55c45d13eb11f17b3f8bbfaad74b8f510bc85f35 diff --git a/Makefile.fetch b/Makefile.fetch index c347775..cdac3ae 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -132,7 +132,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,HSQLDB,HSQLDB_TARBALL) \ $(call fetch_Optional,HUNSPELL,HUNSPELL_TARBALL) \ $(call fetch_Optional,HYPHEN,HYPHEN_TARBALL) \ - $(call fetch_Optional,ICU,ICU_51_LAYOUT_FIX_TARBALL) \ $(call fetch_Optional,ICU,ICU_TARBALL) \ $(call fetch_Optional,JFREEREPORT,JFREEREPORT_FLOW_ENGINE_TARBALL) \ $(call fetch_Optional,JFREEREPORT,JFREEREPORT_FLUTE_TARBALL) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Makefile.fetch
Makefile.fetch |2 ++ 1 file changed, 2 insertions(+) New commits: commit 4da1e31b833a2bff190dc3c6bc807e35ee724ecc Author: Caolán McNamara Date: Thu Oct 24 09:56:49 2013 +0100 is this the foo we need now to download automatically Change-Id: I156c2a2d645c140bfd716f41d8c81c0656ceee56 diff --git a/Makefile.fetch b/Makefile.fetch index 61dfe6c..60ce0ae 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -99,6 +99,8 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,EPM,$(EPM_TARBALL)) \ $(call fetch_Optional,EXPAT,$(EXPAT_TARBALL)) \ $(call fetch_Optional,MARIADB,$(MARIADB_TARBALL)) \ + $(call fetch_Optional,MORE_FONTS,$(FONT_CALADEA_TARBALL)) \ + $(call fetch_Optional,MORE_FONTS,$(FONT_CARLITO_TARBALL)) \ $(call fetch_Optional,MORE_FONTS,$(FONT_DEJAVU_TARBALL)) \ $(call fetch_Optional,MORE_FONTS,$(FONT_GENTIUM_TARBALL)) \ $(call fetch_Optional,MORE_FONTS,$(FONT_LIBERATION_NARROW_TARBALL)) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Makefile.fetch
Makefile.fetch |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3c15edaed5b11e13843081d22ef637f03a7c8d73 Author: Tor Lillqvist Date: Wed Jul 24 20:44:52 2013 +0300 Ignore error in mkdir -p It can fail in some cases on Cygwin even if nothing is wrong. Change-Id: I5714f79f0d8182ff89826286138264d28be805c4 diff --git a/Makefile.fetch b/Makefile.fetch index 815ac23..2ea9ac8 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -71,7 +71,7 @@ endef download: $(WORKDIR)/download $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)/Makefile.fetch - @mkdir -p $(TARFILE_LOCATION)/tmp + -@mkdir -p $(TARFILE_LOCATION)/tmp @date >> $(fetch_LOGFILE) $(foreach item, \ $(call fetch_Optional,LIBATOMIC_OPS,LIBATOMIC_OPS_TARBALL) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
