From: Eric Bavier <ericbavier@gmail.com>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH] utils: Allow wrap-program to be called multiple times.
Date: Sat, 13 Sep 2014 01:12:08 -0500 [thread overview]
Message-ID: <87sijw122v.fsf@gmail.com> (raw)
In-Reply-To: <8738byti9p.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 1025 bytes --]
Ludovic Courtès writes:
> Eric Bavier <ericbavier@gmail.com> skribis:
>
>> Currently, if (@ (guix build utils) wrap-program) is called multiple
>> times for the same file, the original file ends up being overwritten.
>
> OK, you’ve convinced me that this improvement is welcome.
An updated patch is attached. I changed some of the wording in the
wrap-program docstring to bring it in a bit more in line with the new
behavior. Let me know if there should be any more adjustments there. I
also took the liberty of changing "/nix" to "/gnu". ;)
> It would be ideal if a test in tests/build-utils.scm made sure that
> ‘wrap-program’ uses the right file names when called multiple times,
> but I won’t object if the patch doesn’t have it.
See the new test included in this patch. Rather than checking for the
file outputs of wrap-program, it checks for correct behavior of the
wrapped program. I believe this is more consistent with how
wrap-program is used, and doesn't tie the test to the implementation.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-utils-Allow-wrap-program-to-be-called-multiple-times.patch --]
[-- Type: text/x-diff, Size: 7271 bytes --]
From 1b09db0a80d94d3a4c798cc6ee811891b34153e1 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Sat, 13 Sep 2014 01:05:03 -0500
Subject: [PATCH] utils: Allow wrap-program to be called multiple times.
* guix/build/utils.scm (wrap-program): Multiple invocations of
wrap-program for the same file create successive wrappers. Adjust
docstring.
* tests/build-utils.scm: Test new wrap-program behavior.
(%store): New variable.
---
guix/build/utils.scm | 44 ++++++++++++++++++++++++++----------
tests/build-utils.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 91 insertions(+), 13 deletions(-)
diff --git a/guix/build/utils.scm b/guix/build/utils.scm
index d169053..7257b30 100644
--- a/guix/build/utils.scm
+++ b/guix/build/utils.scm
@@ -687,8 +687,7 @@ known as `nuke-refs' in Nixpkgs."
result))))))
(define* (wrap-program prog #:rest vars)
- "Rename PROG to .PROG-real and make PROG a wrapper. VARS should look like
-this:
+ "Make a wrapper for PROG. VARS should look like this:
'(VARIABLE DELIMITER POSITION LIST-OF-DIRECTORIES)
@@ -697,23 +696,44 @@ where DELIMITER is optional. ':' will be used if DELIMITER is not given.
For example, this command:
(wrap-program \"foo\"
- '(\"PATH\" \":\" = (\"/nix/.../bar/bin\"))
- '(\"CERT_PATH\" suffix (\"/nix/.../baz/certs\"
+ '(\"PATH\" \":\" = (\"/gnu/.../bar/bin\"))
+ '(\"CERT_PATH\" suffix (\"/gnu/.../baz/certs\"
\"/qux/certs\")))
will copy 'foo' to '.foo-real' and create the file 'foo' with the following
contents:
#!location/of/bin/bash
- export PATH=\"/nix/.../bar/bin\"
- export CERT_PATH=\"$CERT_PATH${CERT_PATH:+:}/nix/.../baz/certs:/qux/certs\"
+ export PATH=\"/gnu/.../bar/bin\"
+ export CERT_PATH=\"$CERT_PATH${CERT_PATH:+:}/gnu/.../baz/certs:/qux/certs\"
exec location/of/.foo-real
This is useful for scripts that expect particular programs to be in $PATH, for
programs that expect particular shared libraries to be in $LD_LIBRARY_PATH, or
-modules in $GUILE_LOAD_PATH, etc."
- (let ((prog-real (string-append (dirname prog) "/." (basename prog) "-real"))
- (prog-tmp (string-append (dirname prog) "/." (basename prog) "-tmp")))
+modules in $GUILE_LOAD_PATH, etc.
+
+If PROG has previously been wrapped by wrap-program the wrapper will point to
+the previous wrapper."
+ (define (wrapper-file-name number)
+ (format #f "~a/.~a-wrap-~2'0d" (dirname prog) (basename prog) number))
+ (define (next-wrapper-number)
+ (let ((wrappers
+ (find-files (dirname prog)
+ (string-append "\\." (basename prog) "-wrap-.*"))))
+ (if (null? wrappers)
+ 0
+ (string->number (string-take-right (last wrappers) 2)))))
+ (define (wrapper-target number)
+ (if (zero? number)
+ (let ((prog-real (string-append (dirname prog) "/."
+ (basename prog) "-real")))
+ (copy-file prog prog-real)
+ prog-real)
+ (wrapper-file-name number)))
+ (let* ((number (next-wrapper-number))
+ (target (wrapper-target number))
+ (wrapper (wrapper-file-name (1+ number)))
+ (prog-tmp (string-append target "-tmp")))
(define (export-variable lst)
;; Return a string that exports an environment variable.
(match lst
@@ -736,8 +756,6 @@ modules in $GUILE_LOAD_PATH, etc."
(format #f "export ~a=\"$~a${~a:+:}~a\""
var var var (string-join rest ":")))))
- (copy-file prog prog-real)
-
(with-output-to-file prog-tmp
(lambda ()
(format #t
@@ -745,9 +763,11 @@ modules in $GUILE_LOAD_PATH, etc."
(which "bash")
(string-join (map export-variable vars)
"\n")
- (canonicalize-path prog-real))))
+ (canonicalize-path target))))
(chmod prog-tmp #o755)
+ (rename-file prog-tmp wrapper)
+ (symlink wrapper prog-tmp)
(rename-file prog-tmp prog)))
;;; Local Variables:
diff --git a/tests/build-utils.scm b/tests/build-utils.scm
index e94f04b..b82cd27 100644
--- a/tests/build-utils.scm
+++ b/tests/build-utils.scm
@@ -18,9 +18,27 @@
(define-module (test-build-utils)
+ #:use-module (guix store)
+ #:use-module (guix derivations)
#:use-module (guix build utils)
- #:use-module (srfi srfi-64))
+ #:use-module (guix packages)
+ #:use-module (guix build-system)
+ #:use-module (guix build-system trivial)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages bootstrap)
+ #:use-module (srfi srfi-34)
+ #:use-module (srfi srfi-64)
+ #:use-module (rnrs io ports)
+ #:use-module (ice-9 popen))
+(define %store
+ (false-if-exception (open-connection)))
+
+(when %store
+ ;; Make sure we build everything by ourselves.
+ (set-build-options %store #:use-substitutes? #f))
+
+\f
(test-begin "build-utils")
(test-equal "alist-cons-before"
@@ -80,6 +98,46 @@
port
cons)))))
+(test-assert "wrap-program, one input, multiple calls"
+ (let* ((p (package
+ (name "test-wrap-program") (version "0") (source #f)
+ (synopsis #f) (description #f) (license #f) (home-page #f)
+ (build-system trivial-build-system)
+ (arguments
+ `(#:guile ,%bootstrap-guile
+ #:modules ((guix build utils))
+ #:builder
+ (let* ((out (assoc-ref %outputs "out"))
+ (bash (assoc-ref %build-inputs "bash"))
+ (foo (string-append out "/foo")))
+ (begin
+ (use-modules (guix build utils))
+ (mkdir out)
+ (call-with-output-file foo
+ (lambda (p)
+ (format p
+ "#!~a~%echo \"${GUIX_FOO} ${GUIX_BAR}\"~%"
+ bash)))
+ (chmod foo #o777)
+ ;; wrap-program uses `which' to find bash for the wrapper
+ ;; shebang, but it can't know about the bootstrap bash in
+ ;; the store, since it's not named "bash". Help it out a
+ ;; bit by providing a symlink it this package's output.
+ (symlink bash (string-append out "/bash"))
+ (setenv "PATH" out)
+ (wrap-program foo `("GUIX_FOO" prefix ("hello")))
+ (wrap-program foo `("GUIX_BAR" prefix ("world")))
+ #t))))
+ (inputs `(("bash" ,(search-bootstrap-binary "bash"
+ (%current-system)))))))
+ (d (package-derivation %store p)))
+ (and (build-derivations %store (pk 'drv d (list d)))
+ (let* ((p (derivation->output-path d))
+ (foo (string-append p "/foo"))
+ (pipe (open-input-pipe foo))
+ (str (get-string-all pipe)))
+ (equal? str "hello world\n")))))
+
(test-end)
\f
--
1.7.9.5
[-- Attachment #3: Type: text/plain, Size: 133 bytes --]
--
Eric Bavier
Please avoid sending me Word or PowerPoint attachments.
See http://www.gnu.org/philosophy/no-word-attachments.html
next prev parent reply other threads:[~2014-09-13 6:11 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-09 22:56 [PATCH] utils: Allow wrap-program to be called multiple times Eric Bavier
2014-09-10 13:40 ` Ludovic Courtès
2014-09-10 19:16 ` Eric Bavier
2014-09-11 13:10 ` Ludovic Courtès
2014-09-13 6:12 ` Eric Bavier [this message]
2014-09-13 12:20 ` Ludovic Courtès
2014-09-14 4:05 ` mhw
2014-09-14 14:27 ` Ludovic Courtès
2014-09-14 15:16 ` Eric Bavier
2014-09-14 15:58 ` Mark H Weaver
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87sijw122v.fsf@gmail.com \
--to=ericbavier@gmail.com \
--cc=guix-devel@gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.