[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Chicken-hackers] [PATCH 2/2] Update makedist.scm and setversion for rec
From: |
Evan Hanson |
Subject: |
[Chicken-hackers] [PATCH 2/2] Update makedist.scm and setversion for recent module changes |
Date: |
Sat, 4 Mar 2017 12:35:06 +1300 |
Add a missing import and fix a bug in makedist.scm (`read-lines` no
longer opens files), fix buildversion handling and the use of `system*`
in setversion (it no longer sprintfs).
---
scripts/makedist.scm | 4 ++--
scripts/setversion | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/makedist.scm b/scripts/makedist.scm
index 3cca17b2..01898ba8 100644
--- a/scripts/makedist.scm
+++ b/scripts/makedist.scm
@@ -1,7 +1,7 @@
;;;; makedist.scm - Make distribution tarballs
-(use data-structures extras files irregex posix setup-api (chicken process))
+(use data-structures files io irregex pathname posix setup-api (chicken
process))
(include "mini-srfi-1.scm")
@@ -44,7 +44,7 @@
equal?) )
(define (release full?)
- (let* ((files (read-lines "distribution/manifest"))
+ (let* ((files (with-input-from-file "distribution/manifest" read-lines))
(distname (conc "chicken-" BUILDVERSION))
(distfiles (map (cut prefix distname <>) files))
(tgz (conc distname ".tar.gz")))
diff --git a/scripts/setversion b/scripts/setversion
index 9da23b91..923f8a5e 100755
--- a/scripts/setversion
+++ b/scripts/setversion
@@ -5,7 +5,7 @@ exec csi -s "$0" "$@"
(use data-structures files format io irregex (chicken process))
-(define buildversion (with-input-from-file "buildversion" read))
+(define buildversion (with-input-from-file "buildversion" read-line))
(define files '("README" "manual/The User's Manual"))
@@ -28,7 +28,7 @@ exec csi -s "$0" "$@"
(else
(let ((tmp (create-temporary-file)))
(patch (list which tmp) rx subst)
- (system* "mv ~S ~S" tmp which) ) ) ) )
+ (system* (format "mv ~S ~S" tmp which))))))
(define (parse-version v)
(let ((m (irregex-match "(\\d+)\\.(\\d+)\\.(\\d+)(.*)" v)))
--
2.11.0
- [Chicken-hackers] [PATCH 2/8] Rename chicken.ports module to chicken.port, (continued)
- [Chicken-hackers] [PATCH 2/8] Rename chicken.ports module to chicken.port, Evan Hanson, 2017/03/02
- [Chicken-hackers] [PATCH 7/8] Add chicken.process module, Evan Hanson, 2017/03/02
- [Chicken-hackers] [PATCH 3/8] Add posix.scm file that wraps platform-specific posix implementations, Evan Hanson, 2017/03/02
- [Chicken-hackers] [PATCH 6/8] Add chicken.time.posix module, Evan Hanson, 2017/03/02
- [Chicken-hackers] [PATCH 1/8] Add chicken.file module, Evan Hanson, 2017/03/02
- [Chicken-hackers] [PATCH 4/8] Deduplicate the Unix and Windows chicken.errno module definitions, Evan Hanson, 2017/03/02
- Re: [Chicken-hackers] [PATCH 1/8] Add chicken.file module, felix . winkelmann, 2017/03/02
- [Chicken-hackers] [PATCH 0/2] Move "compile-file" to egg and drop utils unit, Evan Hanson, 2017/03/03
- Re: [Chicken-hackers] [PATCH 0/2] Move "compile-file" to egg and drop utils unit, felix . winkelmann, 2017/03/04
- Re: [Chicken-hackers] [PATCH 0/8] Add posix replacement modules, Peter Bex, 2017/03/04
- Re: [Chicken-hackers] [PATCH 0/8] Add posix replacement modules, felix . winkelmann, 2017/03/05