[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/11: build: Add 'DL' silent rule.
From: |
Mathieu Lirzin |
Subject: |
05/11: build: Add 'DL' silent rule. |
Date: |
Thu, 28 Jan 2016 15:32:42 +0000 |
mthl pushed a commit to branch master
in repository guix.
commit 8c3d8894562ac990e7b5f23e74e6f12ea14b1a87
Author: Mathieu Lirzin <address@hidden>
Date: Sun Jan 24 18:48:29 2016 +0100
build: Add 'DL' silent rule.
* Makefile.am (AM_V_DL, AM_V_DL_, AM_V_DL_0): New variables.
* gnu-system.am (gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz)
(gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz)
(gnu/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz)
(gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz): Use $(AM_V_DL).
* build-aux/download.scm: Print a line break between target and origin.
---
Makefile.am | 9 +++++++++
build-aux/download.scm | 2 +-
gnu-system.am | 21 +++++++++++++--------
3 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 1ede6d4..4e97ff1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@
# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
# Copyright © 2013 Andreas Enge <address@hidden>
# Copyright © 2015 Alex Kost <address@hidden>
+# Copyright © 2016 Mathieu Lirzin <address@hidden>
#
# This file is part of GNU Guix.
#
@@ -471,3 +472,11 @@ assert-final-inputs-self-contained:
.PHONY: sync-descriptions gen-ChangeLog gen-AUTHORS clean-go make-go
.PHONY: assert-no-store-file-names assert-binaries-available
.PHONY: assert-final-inputs-self-contained
+
+## -------------- ##
+## Silent rules. ##
+## -------------- ##
+
+AM_V_DL = $(AM_V_DL_$(V))
+AM_V_DL_ = $(AM_V_DL_$(AM_DEFAULT_VERBOSITY))
+AM_V_DL_0 = @echo " DL " $@;
diff --git a/build-aux/download.scm b/build-aux/download.scm
index a107a88..1e91e4b 100644
--- a/build-aux/download.scm
+++ b/build-aux/download.scm
@@ -56,7 +56,7 @@
(match (command-line)
((_ file expected-hash)
(let ((uri (file-name->uri file)))
- (format #t "downloading file `~a' from `~a'...~%"
+ (format #t "downloading file `~a'~%from `~a'...~%"
file (uri->string uri))
(let*-values (((resp data) (http-get uri #:decode-body? #f))
((hash) (bytevector->base16-string (sha256 data)))
diff --git a/gnu-system.am b/gnu-system.am
index ac38635..19f7ca7 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -1,6 +1,7 @@
# GNU Guix --- Functional package management for GNU
# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
# Copyright © 2013, 2014, 2015, 2016 Andreas Enge <address@hidden>
+# Copyright © 2016 Mathieu Lirzin <address@hidden>
# Copyright © 2013, 2014, 2015, 2016 Mark H Weaver <address@hidden>
#
# This file is part of GNU Guix.
@@ -834,14 +835,18 @@ DOWNLOAD_FILE =
\
"$(top_srcdir)/build-aux/download.scm"
gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz:
- $(MKDIR_P) `dirname "$@"`
- $(DOWNLOAD_FILE) "$@"
"037b103522a2d0d7d69c7ffd8de683dfe5bb4b59c1fafd70b4ffd397fd2f57f0"
+ $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \
+ $(DOWNLOAD_FILE) "$@" \
+ "037b103522a2d0d7d69c7ffd8de683dfe5bb4b59c1fafd70b4ffd397fd2f57f0"
gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz:
- $(MKDIR_P) `dirname "$@"`
- $(DOWNLOAD_FILE) "$@"
"b757cd46bf13ecac83fb8e955fb50096ac2d17bb610ca8eb816f29302a00a846"
+ $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \
+ $(DOWNLOAD_FILE) "$@" \
+ "b757cd46bf13ecac83fb8e955fb50096ac2d17bb610ca8eb816f29302a00a846"
gnu/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz:
- $(MKDIR_P) `dirname "$@"`
- $(DOWNLOAD_FILE) "$@"
"e551d05d4d385d6706ab8d574856a087758294dc90ab4c06e70a157a685e23d6"
+ $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \
+ $(DOWNLOAD_FILE) "$@" \
+ "e551d05d4d385d6706ab8d574856a087758294dc90ab4c06e70a157a685e23d6"
gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz:
- $(MKDIR_P) `dirname "$@"`
- $(DOWNLOAD_FILE) "$@"
"994680f0001346864aa2c2cc5110f380ee7518dcd701c614291682b8e948f73b"
+ $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \
+ $(DOWNLOAD_FILE) "$@" \
+ "994680f0001346864aa2c2cc5110f380ee7518dcd701c614291682b8e948f73b"
- branch master updated (03675ca -> 8a76e5f), Mathieu Lirzin, 2016/01/28
- 01/11: tests: Use 'dummy-origin' for lint tests when possible., Mathieu Lirzin, 2016/01/28
- 02/11: lint: Remove an unneeded clause in 'check-patch-file-names'., Mathieu Lirzin, 2016/01/28
- 06/11: build: Add 'DOT' silent rule., Mathieu Lirzin, 2016/01/28
- 08/11: build: Add 'HELP2MAN' silent rule., Mathieu Lirzin, 2016/01/28
- 07/11: build: Add 'EMACS' silent rule., Mathieu Lirzin, 2016/01/28
- 05/11: build: Add 'DL' silent rule.,
Mathieu Lirzin <=
- 11/11: Update .gitignore., Mathieu Lirzin, 2016/01/28
- 04/11: packages: Use '@' in package record printers., Mathieu Lirzin, 2016/01/28
- 10/11: build: Use 'GEN' and 'at' silent rules., Mathieu Lirzin, 2016/01/28
- 09/11: build: Remove guix-autoloads.el from the distribution., Mathieu Lirzin, 2016/01/28
- 03/11: lint: Rewrite 'check-patch-file-names'., Mathieu Lirzin, 2016/01/28