ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

utils: Introduce `substitute*', for easier sed-like syntax.

Browse source 
* guix/build/utils.scm (let-matches, substitute*): New macros.

* distro/base.scm (guile-1.8): Use `substitute*' instead of
  `substitute'.  Remove the #:modules argument.
This commit is contained in:
Ludovic Courtès 2012-07-07 16:25:10 +02:00
parent d767288490
commit 10c87717bd
2 changed files with 46 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
distro/base.scm
View file

@ -120,10 +120,7 @@ (define-public guile-1.8
(base32 (base32
"0l200a0v7h8bh0cwz6v7hc13ds39cgqsmfrks55b1rbj5vniyiy3")))) "0l200a0v7h8bh0cwz6v7hc13ds39cgqsmfrks55b1rbj5vniyiy3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments '(#:modules ((guix build gnu-build-system) (arguments '(#:configure-flags '("--disable-error-on-warning")
(guix build utils)
(ice-9 regex))
#:configure-flags '("--disable-error-on-warning")
#:patches (list (assoc-ref %build-inputs "patch/snarf")) #:patches (list (assoc-ref %build-inputs "patch/snarf"))
;; Insert a phase before `configure' to patch things up. ;; Insert a phase before `configure' to patch things up.
@ -134,13 +131,12 @@ (define-public guile-1.8
;; Add a call to `lt_dladdsearchdir' so that ;; Add a call to `lt_dladdsearchdir' so that
;; `libguile-readline.so' & co. are in the ;; `libguile-readline.so' & co. are in the
;; loader's search path. ;; loader's search path.
(substitute "libguile/dynl.c" (substitute* "libguile/dynl.c"
"lt_dlinit.*$" ("lt_dlinit.*$" match)
(lambda (m p) (format #f
(format p " ~a~% lt_dladdsearchdir(\"~a/lib\");~%"
" ~a~% //lt_dladdsearchdir(\"~a/lib\");~%" match
(match:substring m 0) (assoc-ref outputs "out"))))
(assoc-ref outputs "out")))))
%standard-phases))) %standard-phases)))
(inputs `(("patch/snarf" (inputs `(("patch/snarf"
,(search-path %load-path "distro/guile-1.8-cpp-4.5.patch")) ,(search-path %load-path "distro/guile-1.8-cpp-4.5.patch"))

40
guix/build/utils.scm
View file

@ -28,7 +28,8 @@ (define-module (guix build utils)
alist-cons-before alist-cons-before
alist-cons-after alist-cons-after
alist-replace alist-replace
substitute)) substitute
substitute*))
;;; ;;;
@ -175,6 +176,43 @@ (define (substitute file pattern match-proc)
(lambda (key . args) (lambda (key . args)
(false-if-exception (delete-file template)))))) (false-if-exception (delete-file template))))))
(define-syntax let-matches
;; Helper macro for `substitute*'.
(syntax-rules (_)
((let-matches index match (_ vars ...) body ...)
(let-matches (+ 1 index) match (vars ...)
body ...))
((let-matches index match (var vars ...) body ...)
(let ((var (match:substring match index)))
(let-matches (+ 1 index) match (vars ...)
body ...)))
((let-matches index match () body ...)
(begin body ...))))
(define-syntax-rule (substitute* file (regexp whole-match match ...)
body ...)
"Substitute REGEXP in FILE by the string returned by BODY. BODY is
evaluated with each MATCH-VAR bound to the corresponding positional regexp
sub-expression. For example:
(substitute* file (\"foo([a-z]+)bar(.*)$\" all letters end)
(string-append \"baz\" letters end))
Here, anytime a line of FILE matches the regexp, ALL is bound to the complete
match, LETTERS is bound to the first sub-expression, and END is bound to the
last one. Alternatively, given that `all' is not used, one can write:
(substitute* file (\"foo([a-z]+)bar(.*)$\" _ letters end)
(string-append \"baz\" letter end))
"
(substitute file regexp
(lambda (m p)
(let-matches 0 m (whole-match match ...)
(display (begin body ...) p)))))
;;; Local Variables: ;;; Local Variables:
;;; eval: (put 'call-with-output-file/atomic 'scheme-indent-function 1) ;;; eval: (put 'call-with-output-file/atomic 'scheme-indent-function 1)
;;; eval: (put 'with-throw-handler 'scheme-indent-function 1) ;;; eval: (put 'with-throw-handler 'scheme-indent-function 1)