[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.7.0-20110116-92-g053960f)
The branch, master has been updated
via 053960f4f5c2c05ca0676fd74b6c5feea3b1b5d6 (commit)
via 7c203900136fb3f5cfdc70053aa52e87326226f4 (commit)
via f649a5ac09d943889ac49e8a8a68e2b627391c1a (commit)
via 8db0bdda749c1b30a1b2295db9e80d4dd98f67a9 (commit)
via 5dca3df37f41e828430d83e743628996ad7cf06c (commit)
from 5785b75e225b1876453a67799a0184830584e77a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
gnetlist/scheme/gnet-gsch2pcb.scm.in | 25 ++++++++++++++-----------
gnetlist/scheme/gnet-vams.scm | 5 ++---
gschem/scheme/gschem.scm | 7 ++++---
libgeda/src/g_basic.c | 2 +-
m4/geda-guile.m4 | 4 ++--
5 files changed, 23 insertions(+), 20 deletions(-)
=================
Commit Messages
=================
commit 053960f4f5c2c05ca0676fd74b6c5feea3b1b5d6
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Make vams backend worke with Guile 2.0.
:100644 100644 519a4cc... 04c3910... M gnetlist/scheme/gnet-vams.scm
commit 7c203900136fb3f5cfdc70053aa52e87326226f4
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Make gsch2pcb backend work with Guile 2.0.
:100644 100644 e059730... 77df925... M gnetlist/scheme/gnet-gsch2pcb.scm.in
commit f649a5ac09d943889ac49e8a8a68e2b627391c1a
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: Fix for running with Guile 2.x.
scm_display_error() requires a stack as first argument in Guile 1.8.x,
and a frame as first argument in Guile 2.0.x. Luckily, both versions
accept #f instead.
:100644 100644 6e1e397... 3bbd463... M libgeda/src/g_basic.c
commit 8db0bdda749c1b30a1b2295db9e80d4dd98f67a9
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Stricter R5RS definitions.
Guile 2.0 requires definitions to occur only at the top level of a
<program> and at the beginning of a <body>.
:100644 100644 f36ba46... d4ee404... M gschem/scheme/gschem.scm
commit 5dca3df37f41e828430d83e743628996ad7cf06c
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: Use Guile 2.0 by default if available.
:100644 100644 1bc4b11... abde61b... M m4/geda-guile.m4
=========
Changes
=========
commit 053960f4f5c2c05ca0676fd74b6c5feea3b1b5d6
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Make vams backend worke with Guile 2.0.
diff --git a/gnetlist/scheme/gnet-vams.scm b/gnetlist/scheme/gnet-vams.scm
index 519a4cc..04c3910 100644
--- a/gnetlist/scheme/gnet-vams.scm
+++ b/gnetlist/scheme/gnet-vams.scm
@@ -1054,12 +1054,11 @@
;;; set generate-mode to default (1), when not defined before.
-
-(if (not (defined? 'generate-mode)) (define generate-mode '1))
+(define generate-mode (if (defined? 'generate-mode) generate-mode '1))
;;; set to-attribs list empty, when not needed.
-(if (not (defined? 'top-attribs)) (define top-attribs '()))
+(define top-attribs (if (defined? 'top-attribs) top-attribs '()))
(display "loaded gnet-vams.scm\n")
commit 7c203900136fb3f5cfdc70053aa52e87326226f4
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Make gsch2pcb backend work with Guile 2.0.
diff --git a/gnetlist/scheme/gnet-gsch2pcb.scm.in b/gnetlist/scheme/gnet-gsch2pcb.scm.in
index e059730..77df925 100644
--- a/gnetlist/scheme/gnet-gsch2pcb.scm.in
+++ b/gnetlist/scheme/gnet-gsch2pcb.scm.in
@@ -23,6 +23,8 @@
;; Bill Wilson billw@xxxxxx
;; 6/17/2003
+(use-modules (ice-9 popen))
+(use-modules (ice-9 syncase))
;;
;;
@@ -117,16 +119,22 @@
(define gsch2pcb:use-m4 #f)
+;; Macro that defines and sets a variable only if it's not already defined.
+(define-syntax define-undefined
+ (syntax-rules ()
+ ((_ name expr)
+ (define name
+ (if (defined? (quote name))
+ name
+ expr)))))
;; Let the user override the m4 command, the directory
;; where pcb stores its m4 files and the pcb config directory.
-(if (not (defined? 'gsch2pcb:pcb-m4-command)) (define gsch2pcb:pcb-m4-command "@m4@"))
-(if (not (defined? 'gsch2pcb:pcb-m4-dir)) (define gsch2pcb:pcb-m4-dir "@pcbm4dir@"))
+(define-undefined gsch2pcb:pcb-m4-command "@m4@")
+(define-undefined gsch2pcb:pcb-m4-dir "@pcbm4dir@")
;; Let the user override the m4 search path
-(if (not (defined? 'gsch2pcb:pcb-m4-path))
- (define gsch2pcb:pcb-m4-path (list gsch2pcb:pcb-m4-dir "$HOME/.pcb" "."))
-)
+(define-undefined gsch2pcb:pcb-m4-path (list gsch2pcb:pcb-m4-dir "$HOME/.pcb" "."))
;; Build up the m4 command line
@@ -155,12 +163,7 @@
)
)
-(if (not (defined? 'gsch2pcb:pcb-m4-command-line))
- (define gsch2pcb:pcb-m4-command-line
- gsch2pcb:m4-command-line-tmp)
- )
-
-(use-modules (ice-9 popen))
+(define-undefined gsch2pcb:pcb-m4-command-line gsch2pcb:m4-command-line-tmp)
(define (gsch2pcb output-filename)
(let ((port (open-output-file output-filename)))
commit f649a5ac09d943889ac49e8a8a68e2b627391c1a
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: Fix for running with Guile 2.x.
scm_display_error() requires a stack as first argument in Guile 1.8.x,
and a frame as first argument in Guile 2.0.x. Luckily, both versions
accept #f instead.
diff --git a/libgeda/src/g_basic.c b/libgeda/src/g_basic.c
index 6e1e397..3bbd463 100644
--- a/libgeda/src/g_basic.c
+++ b/libgeda/src/g_basic.c
@@ -258,7 +258,7 @@ process_error_stack (SCM s_stack, SCM s_key, SCM s_args, GError **err) {
scm_display_backtrace (s_stack, s_port, SCM_BOOL_F, SCM_BOOL_F);
scm_puts ("\n", s_port);
}
- scm_display_error (s_stack, s_port, s_subr,
+ scm_display_error (SCM_BOOL_F, s_port, s_subr,
s_message, s_message_args, s_rest);
long_message = scm_to_locale_string (scm_get_output_string (s_port));
scm_close_output_port (s_port);
commit 8db0bdda749c1b30a1b2295db9e80d4dd98f67a9
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Stricter R5RS definitions.
Guile 2.0 requires definitions to occur only at the top level of a
<program> and at the beginning of a <body>.
diff --git a/gschem/scheme/gschem.scm b/gschem/scheme/gschem.scm
index f36ba46..d4ee404 100644
--- a/gschem/scheme/gschem.scm
+++ b/gschem/scheme/gschem.scm
@@ -22,9 +22,10 @@
; If this version of guile has an R5RS-compatible eval (that requires a
; second argument specfying the environment), and a current-module function
; (like 1.6) use them to define eval-cm. else define eval-cm to eval (for 1.4)
-(if (false-if-exception (eval 'display (current-module)))
- (define (eval-cm exp) (eval exp (current-module)))
- (define eval-cm eval))
+(define eval-cm
+ (if (false-if-exception (eval 'display (current-module)))
+ (lambda (exp) (eval exp (current-module)))
+ eval))
(define last-command-sequence #f)
(define current-command-sequence '())
commit 5dca3df37f41e828430d83e743628996ad7cf06c
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: Use Guile 2.0 by default if available.
diff --git a/m4/geda-guile.m4 b/m4/geda-guile.m4
index 1bc4b11..abde61b 100644
--- a/m4/geda-guile.m4
+++ b/m4/geda-guile.m4
@@ -31,12 +31,12 @@ AC_DEFUN([AX_CHECK_GUILE],
GUILE_MIN_TEENY=`echo ${GUILE_MIN_VER} | sed -e 's;.*\.;;'`
_found_pkg_config_guile=yes
- PKG_CHECK_MODULES(GUILE, [guile-1.8] , ,
+ PKG_CHECK_MODULES(GUILE, [guile-2.0] , ,
[_found_pkg_config_guile=no])
if test "${_found_pkg_config_guile}" = "no" ; then
_found_pkg_config_guile=yes
- PKG_CHECK_MODULES(GUILE, [guile-2.0] , ,
+ PKG_CHECK_MODULES(GUILE, [guile-1.8] , ,
[_found_pkg_config_guile=no])
fi
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs