Re: [PATCH] gnu: Add Glulxe.

2014-12-03 Thread 宋文武
Mark H Weaver  writes:

> Eric Bavier  writes:
>
>> This is a bit terse, IMHO.  Perhaps something like:
>>
>> (let* ((out (assoc-ref outputs "out"))
>>(inc (string-append out "/include")))
>>   (begin
>> (mkdir-p inc)
>> (for-each
>>   (lambda (f) (copy-file f (string-append inc "/" f)))
>>   '("glk.h" "glkstart.h" "gi_blorb.h" "gi_dispa.h" "Make.glkterm"))
>> (mkdir-p lib)
>> (copy-file "libglkterm.a" (string-append out "/lib/libglkterm.a"
>
> It's not important, but FYI the 'begin' above is not needed.  The 'let*'
> includes an implicit 'begin'.
Thanks! I'll be care next time :)
>
>   Mark



Re: [PATCH] gnu: Add Glulxe.

2014-12-02 Thread Mark H Weaver
Eric Bavier  writes:

> This is a bit terse, IMHO.  Perhaps something like:
>
> (let* ((out (assoc-ref outputs "out"))
>(inc (string-append out "/include")))
>   (begin
> (mkdir-p inc)
> (for-each
>   (lambda (f) (copy-file f (string-append inc "/" f)))
>   '("glk.h" "glkstart.h" "gi_blorb.h" "gi_dispa.h" "Make.glkterm"))
> (mkdir-p lib)
> (copy-file "libglkterm.a" (string-append out "/lib/libglkterm.a"

It's not important, but FYI the 'begin' above is not needed.  The 'let*'
includes an implicit 'begin'.

  Mark



Re: [PATCH] gnu: Add Glulxe.

2014-11-19 Thread Eric Bavier

>> 宋文武 writes:
>>
>>> * gnu/packages/games.scm (glkterm, glulxe): New variables.
>>> ---
>>>  gnu/packages/games.scm | 79 
>>> ++
>>>  1 file changed, 79 insertions(+)

I pushed this as commit 77264d1.  Thanks!

-- 
Eric Bavier

Please avoid sending me Word or PowerPoint attachments.
See http://www.gnu.org/philosophy/no-word-attachments.html



Re: [PATCH] gnu: Add Glulxe.

2014-11-19 Thread 宋文武
Eric Bavier  writes:

> 宋文武 writes:
>
>> * gnu/packages/games.scm (glkterm, glulxe): New variables.
>> ---
>>  gnu/packages/games.scm | 79 
>> ++
>>  1 file changed, 79 insertions(+)
>>
>> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
>> index c9bb678..5859cbc 100644
>> --- a/gnu/packages/games.scm
>> +++ b/gnu/packages/games.scm
>> @@ -733,3 +733,82 @@ single player.  Mods and texture packs allow players to 
>> personalize the game
>>  in different ways.")
>>  (home-page "http://minetest.net";)
>>  (license license:lgpl2.1+)))
>> +
>> +(define glkterm
>> +  (package
>> +   (name "glkterm")
>> +   (version "1.0.4")
>> +   (source
>> +(origin
>> + (method url-fetch)
>> + (uri (string-append "http://www.ifarchive.org/if-archive/programming/";
>> + "glk/implementations/glkterm-104.tar.gz"))
>> + (sha256
>> +  (base32
>> +   "0zlj9nlnkdlvgbiliczinirqygiq8ikg5hzh5vgcmnpg9pvnwga7"
>> +   (build-system gnu-build-system)
>> +   (propagated-inputs `(("ncurses" ,ncurses)))
>
> Could you add a comment saying why ncurses needs to be propagated?
It's required by Make.glkterm, due to the staticly build of libglkterm.a?
>
>> +   (arguments
>> +'(#:tests? #f ; no check target
>> +  #:phases
>> +  (alist-replace
>> +   'install
>> +   (lambda* (#:key outputs #:allow-other-keys)
>> + (let ((out (assoc-ref outputs "out")))
>> +   (mkdir out)
>> +   (mkdir (string-append out "/include"))
>> +   (copy-file "glk.h" (string-append out "/include/glk.h"))
>> +   (copy-file "glkstart.h" (string-append out 
>> "/include/glkstart.h"))
>> +   (copy-file "gi_blorb.h" (string-append out 
>> "/include/gi_blorb.h"))
>> +   (copy-file "gi_dispa.h" (string-append out 
>> "/include/gi_dispa.h"))
>> +   (copy-file "Make.glkterm" (string-append out 
>> "/include/Make.glkterm"))
>> +   (mkdir (string-append out "/lib"))
>> +   (copy-file "libglkterm.a" (string-append out 
>> "/lib/libglkterm.a"
>
> This is a bit terse, IMHO.  Perhaps something like:
>
> (let* ((out (assoc-ref outputs "out"))
>(inc (string-append out "/include")))
>   (begin
> (mkdir-p inc)
> (for-each
>   (lambda (f) (copy-file f (string-append inc "/" f)))
>   '("glk.h" "glkstart.h" "gi_blorb.h" "gi_dispa.h" "Make.glkterm"))
> (mkdir-p lib)
> (copy-file "libglkterm.a" (string-append out "/lib/libglkterm.a"
>
>> +   (alist-delete 'configure %standard-phases
>> +   (home-page "http://www.eblong.com/zarf/glk/";)
>> +   (synopsis "Curses.h Implementation of the Glk API")
>
> "Curses implementation of the Glk API"?
Yes, this is better, thanks for reviewing!

New patch:
>From 59663e52e45181fec5f0a3c3bb5f9a5e9776150c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= 
Date: Tue, 18 Nov 2014 23:58:02 +0800
Subject: [PATCH] gnu: Add Glulxe.

* gnu/packages/games.scm (glkterm, glulxe): New variables.
---
 gnu/packages/games.scm | 78 ++
 1 file changed, 78 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index c9bb678..e79be3f 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -733,3 +733,81 @@ single player.  Mods and texture packs allow players to personalize the game
 in different ways.")
 (home-page "http://minetest.net";)
 (license license:lgpl2.1+)))
+
+(define glkterm
+  (package
+   (name "glkterm")
+   (version "1.0.4")
+   (source
+(origin
+ (method url-fetch)
+ (uri (string-append "http://www.ifarchive.org/if-archive/programming/";
+ "glk/implementations/glkterm-104.tar.gz"))
+ (sha256
+  (base32
+   "0zlj9nlnkdlvgbiliczinirqygiq8ikg5hzh5vgcmnpg9pvnwga7"
+   (build-system gnu-build-system)
+   (propagated-inputs `(("ncurses" ,ncurses))) ; required by Make.glkterm
+   (arguments
+'(#:tests? #f ; no check target
+  #:phases
+  (alist-replace
+   'install
+   (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+(inc (string-append out "/include")))
+   (mkdir-p inc)
+   (for-each
+(lambda (file)
+  (copy-file file (string-append inc "/" file)))
+'("glk.h" "glkstart.h" "gi_blorb.h" "gi_dispa.h" "Make.glkterm"))
+   (mkdir (string-append out "/lib"))
+   (copy-file "libglkterm.a" (string-append out "/lib/libglkterm.a"
+   (alist-delete 'configure %standard-phases
+   (home-page "http://www.eblong.com/zarf/glk/";)
+   (synopsis "Curses Implementation of the Glk API")
+   (description
+"Glk defines a portable API for applications with text UIs.  It was
+primarily designed for interactive fiction, but it should be suitable for many
+interactive text utilities, particularly those based on a co

Re: [PATCH] gnu: Add Glulxe.

2014-11-18 Thread Eric Bavier

宋文武 writes:

> * gnu/packages/games.scm (glkterm, glulxe): New variables.
> ---
>  gnu/packages/games.scm | 79 
> ++
>  1 file changed, 79 insertions(+)
>
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index c9bb678..5859cbc 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -733,3 +733,82 @@ single player.  Mods and texture packs allow players to 
> personalize the game
>  in different ways.")
>  (home-page "http://minetest.net";)
>  (license license:lgpl2.1+)))
> +
> +(define glkterm
> +  (package
> +   (name "glkterm")
> +   (version "1.0.4")
> +   (source
> +(origin
> + (method url-fetch)
> + (uri (string-append "http://www.ifarchive.org/if-archive/programming/";
> + "glk/implementations/glkterm-104.tar.gz"))
> + (sha256
> +  (base32
> +   "0zlj9nlnkdlvgbiliczinirqygiq8ikg5hzh5vgcmnpg9pvnwga7"
> +   (build-system gnu-build-system)
> +   (propagated-inputs `(("ncurses" ,ncurses)))

Could you add a comment saying why ncurses needs to be propagated?

> +   (arguments
> +'(#:tests? #f ; no check target
> +  #:phases
> +  (alist-replace
> +   'install
> +   (lambda* (#:key outputs #:allow-other-keys)
> + (let ((out (assoc-ref outputs "out")))
> +   (mkdir out)
> +   (mkdir (string-append out "/include"))
> +   (copy-file "glk.h" (string-append out "/include/glk.h"))
> +   (copy-file "glkstart.h" (string-append out "/include/glkstart.h"))
> +   (copy-file "gi_blorb.h" (string-append out "/include/gi_blorb.h"))
> +   (copy-file "gi_dispa.h" (string-append out "/include/gi_dispa.h"))
> +   (copy-file "Make.glkterm" (string-append out 
> "/include/Make.glkterm"))
> +   (mkdir (string-append out "/lib"))
> +   (copy-file "libglkterm.a" (string-append out 
> "/lib/libglkterm.a"

This is a bit terse, IMHO.  Perhaps something like:

(let* ((out (assoc-ref outputs "out"))
   (inc (string-append out "/include")))
  (begin
(mkdir-p inc)
(for-each
  (lambda (f) (copy-file f (string-append inc "/" f)))
  '("glk.h" "glkstart.h" "gi_blorb.h" "gi_dispa.h" "Make.glkterm"))
(mkdir-p lib)
(copy-file "libglkterm.a" (string-append out "/lib/libglkterm.a"

> +   (alist-delete 'configure %standard-phases
> +   (home-page "http://www.eblong.com/zarf/glk/";)
> +   (synopsis "Curses.h Implementation of the Glk API")

"Curses implementation of the Glk API"?

Thanks!

-- 
Eric Bavier

Please avoid sending me Word or PowerPoint attachments.
See http://www.gnu.org/philosophy/no-word-attachments.html