From mboxrd@z Thu Jan  1 00:00:00 1970
From: Pjotr Prins <pjotr.public12@thebird.nl>
Subject: Re: [PATCH]   gnu: ruby: Allow 'rake gem' in ruby-build-system.
Date: Mon, 13 Jul 2015 15:42:31 +0200
Message-ID: <20150713134231.GA29163@thebird.nl>
References: <20150713125958.GA28969@thebird.nl>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34287)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pjotr2015@thebird.nl>) id 1ZEe18-0004gR-5D
	for guix-devel@gnu.org; Mon, 13 Jul 2015 09:43:35 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pjotr2015@thebird.nl>) id 1ZEe14-0000Dx-Au
	for guix-devel@gnu.org; Mon, 13 Jul 2015 09:43:34 -0400
Received: from mail.thebird.nl ([95.154.246.10]:42234)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pjotr2015@thebird.nl>) id 1ZEe14-0000Dj-4C
	for guix-devel@gnu.org; Mon, 13 Jul 2015 09:43:30 -0400
Content-Disposition: inline
In-Reply-To: <20150713125958.GA28969@thebird.nl>
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
To: Pjotr Prins <pjotr.public12@thebird.nl>
Cc: "guix-devel@gnu.org" <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
> 


--