* [PATCH] gnu: ruby: Allow 'rake gem' in ruby-build-system.
@ 2015-07-13 12:59 Pjotr Prins
2015-07-13 13:42 ` Pjotr Prins
0 siblings, 1 reply; 2+ messages in thread
From: Pjotr Prins @ 2015-07-13 12:59 UTC (permalink / raw)
To: guix-devel@gnu.org
[-- Attachment #1: Type: text/plain, Size: 91 bytes --]
Modification of the Ruby build system preparing for the Nokogiri patch
(next mail).
Pj.
[-- Attachment #2: 0001-gnu-ruby-Allow-rake-gem-in-ruby-build-system.patch --]
[-- Type: text/x-diff, Size: 989 bytes --]
From 8bdeef9e44abc0ed5e8491d360cc1e9e9de72420 Mon Sep 17 00:00:00 2001
From: pjotrp <pjotr.public01@thebird.nl>
Date: Sun, 5 Jul 2015 18:00:22 +0200
Subject: [PATCH] gnu: ruby: Allow 'rake gem' in ruby-build-system.
* guix/build/ruby-build-system.scm (Ruby): Added 'rake gem' when gemspec is missing.
---
guix/build/ruby-build-system.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/guix/build/ruby-build-system.scm b/guix/build/ruby-build-system.scm
index 531cf38..ce0c17d 100644
--- a/guix/build/ruby-build-system.scm
+++ b/guix/build/ruby-build-system.scm
@@ -49,7 +49,10 @@ directory."
(define build
(lambda _
- (zero? (system* "gem" "build" (first-matching-file "\\.gemspec$")))))
+ (let ((fnlist (find-files "." "\\.gemspec$")))
+ (if (null? fnlist)
+ (zero? (system* "rake" "gem"))
+ (zero? (system* "gem" "build" (car fnlist)))))))
(define* (check #:key tests? test-target #:allow-other-keys)
(if tests?
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] gnu: ruby: Allow 'rake gem' in ruby-build-system.
2015-07-13 12:59 [PATCH] gnu: ruby: Allow 'rake gem' in ruby-build-system Pjotr Prins
@ 2015-07-13 13:42 ` Pjotr Prins
0 siblings, 0 replies; 2+ messages in thread
From: Pjotr Prins @ 2015-07-13 13:42 UTC (permalink / raw)
To: Pjotr Prins; +Cc: guix-devel@gnu.org
Please ignore this patch. It was already improved and submitted by
David. I am making a real hash of it today.
On Mon, Jul 13, 2015 at 02:59:58PM +0200, Pjotr Prins wrote:
> Modification of the Ruby build system preparing for the Nokogiri patch
> (next mail).
>
> Pj.
>
>
> From 8bdeef9e44abc0ed5e8491d360cc1e9e9de72420 Mon Sep 17 00:00:00 2001
> From: pjotrp <pjotr.public01@thebird.nl>
> Date: Sun, 5 Jul 2015 18:00:22 +0200
> Subject: [PATCH] gnu: ruby: Allow 'rake gem' in ruby-build-system.
>
> * guix/build/ruby-build-system.scm (Ruby): Added 'rake gem' when gemspec is missing.
> ---
> guix/build/ruby-build-system.scm | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/guix/build/ruby-build-system.scm b/guix/build/ruby-build-system.scm
> index 531cf38..ce0c17d 100644
> --- a/guix/build/ruby-build-system.scm
> +++ b/guix/build/ruby-build-system.scm
> @@ -49,7 +49,10 @@ directory."
>
> (define build
> (lambda _
> - (zero? (system* "gem" "build" (first-matching-file "\\.gemspec$")))))
> + (let ((fnlist (find-files "." "\\.gemspec$")))
> + (if (null? fnlist)
> + (zero? (system* "rake" "gem"))
> + (zero? (system* "gem" "build" (car fnlist)))))))
>
> (define* (check #:key tests? test-target #:allow-other-keys)
> (if tests?
> --
> 1.7.10.4
>
--
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-07-13 13:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-13 12:59 [PATCH] gnu: ruby: Allow 'rake gem' in ruby-build-system Pjotr Prins
2015-07-13 13:42 ` Pjotr Prins
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).