[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.7.1-20110619-189-g579fbb4)
The branch, master has been updated
via 579fbb4828a71ae2c78f270c3e7d1779c52e8997 (commit)
via 50867f1f01c6fe2aaf20180db6d2626acbd3c8a0 (commit)
via 2171faf3ba82744a32aa17c0722262dc42bd062d (commit)
from fde0b77b96ef92d5e220dafeb31c92c03f7df0bf (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 | 14 ++++++--------
gnetlist/scheme/gnetlist/backend-getopt.scm | 2 +-
gnetlist/tests/common/Makefile.am | 9 ++++++---
utils/src/gsch2pcb.c | 9 +--------
4 files changed, 14 insertions(+), 20 deletions(-)
=================
Commit Messages
=================
commit 579fbb4828a71ae2c78f270c3e7d1779c52e8997
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gsch2pcb: Remove "m4-command" project file option.
The "m4-command" option permitted in gsch2pcb project files allows the
M4 command line generated by gsch2pcb to be replaced by an arbitrary
command line. This patch removes the option.
:100644 100644 77df925... cbde743... M gnetlist/scheme/gnet-gsch2pcb.scm.in
:100644 100644 76eed3e... 7c0e8fc... M utils/src/gsch2pcb.c
commit 50867f1f01c6fe2aaf20180db6d2626acbd3c8a0
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Correct comment typo in backend-getopt module.
:100644 100644 d8ff2da... 4fd4055... M gnetlist/scheme/gnetlist/backend-getopt.scm
commit 2171faf3ba82744a32aa17c0722262dc42bd062d
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: Correct `dist-hook' for gnetlist common tests.
In commit b0613e375ab8, it became valid for some common tests not to
generate output, and subsequently in commit fde0b77b96ef, some `bom2'
and `bom' backend golden files were removed to make use of this.
However, the `dist-hook' rule in the gnetlist common test Makefile.am
still assumed that all tests needed golden output files. This patch
corrects this, and un-breaks `make distcheck'.
:100644 100644 511d7dd... 1ea14dd... M gnetlist/tests/common/Makefile.am
=========
Changes
=========
commit 579fbb4828a71ae2c78f270c3e7d1779c52e8997
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gsch2pcb: Remove "m4-command" project file option.
The "m4-command" option permitted in gsch2pcb project files allows the
M4 command line generated by gsch2pcb to be replaced by an arbitrary
command line. This patch removes the option.
diff --git a/gnetlist/scheme/gnet-gsch2pcb.scm.in b/gnetlist/scheme/gnet-gsch2pcb.scm.in
index 77df925..cbde743 100644
--- a/gnetlist/scheme/gnet-gsch2pcb.scm.in
+++ b/gnetlist/scheme/gnet-gsch2pcb.scm.in
@@ -138,13 +138,13 @@
;; Build up the m4 command line
-(define gsch2pcb:m4-command-line-tmp (string-append
+(define gsch2pcb:m4-command-line (string-append
gsch2pcb:pcb-m4-command " -d ") )
(define gsch2pcb:pcb-m4-path-str #f)
(for-each (lambda (d)
- (set! gsch2pcb:m4-command-line-tmp (string-append
- gsch2pcb:m4-command-line-tmp
- " -I" d))
+ (set! gsch2pcb:m4-command-line (string-append
+ gsch2pcb:m4-command-line
+ " -I" d))
(if gsch2pcb:pcb-m4-path-str
(set! gsch2pcb:pcb-m4-path-str (string-append
gsch2pcb:pcb-m4-path-str
@@ -157,14 +157,12 @@
-(set! gsch2pcb:m4-command-line-tmp
- ( string-append gsch2pcb:m4-command-line-tmp
+(set! gsch2pcb:m4-command-line
+ ( string-append gsch2pcb:m4-command-line
" " gsch2pcb:pcb-m4-dir "/common.m4 - >> "
)
)
-(define-undefined gsch2pcb:pcb-m4-command-line gsch2pcb:m4-command-line-tmp)
-
(define (gsch2pcb output-filename)
(let ((port (open-output-file output-filename)))
(gsch2pcb:write-top-header port)
diff --git a/utils/src/gsch2pcb.c b/utils/src/gsch2pcb.c
index 76eed3e..7c0e8fc 100644
--- a/utils/src/gsch2pcb.c
+++ b/utils/src/gsch2pcb.c
@@ -67,8 +67,7 @@ static gchar *sch_basename;
static GList *schematics;
-static gchar *m4_command,
- *m4_pcbdir, *default_m4_pcbdir, *m4_files, *m4_override_file;
+static gchar *m4_pcbdir, *default_m4_pcbdir, *m4_files, *m4_override_file;
static gboolean use_m4 = TRUE;
@@ -99,8 +98,6 @@ create_m4_override_file ()
m4_override_file = NULL;
return;
}
- if (m4_command)
- fprintf (f, "(define m4-command \"%s\")\n", m4_command);
if (m4_pcbdir)
fprintf (f, "(define m4-pcbdir \"%s\")\n", m4_pcbdir);
if (m4_files)
@@ -111,8 +108,6 @@ create_m4_override_file ()
if (verbose) {
printf ("Default m4-pcbdir: %s\n", default_m4_pcbdir);
printf ("--------\ngnet-gsch2pcb-tmp.scm override file:\n");
- if (m4_command)
- printf (" (define m4-command \"%s\")\n", m4_command);
if (m4_pcbdir)
printf (" (define m4-pcbdir \"%s\")\n", m4_pcbdir);
if (m4_files)
@@ -1194,8 +1189,6 @@ parse_config (gchar * config, gchar * arg)
sch_basename = g_strdup (arg);
else if (!strcmp (config, "schematics"))
add_multiple_schematics (arg);
- else if (!strcmp (config, "m4-command"))
- m4_command = g_strdup (arg);
else if (!strcmp (config, "m4-pcbdir"))
m4_pcbdir = g_strdup (arg);
else if (!strcmp (config, "m4-file"))
commit 50867f1f01c6fe2aaf20180db6d2626acbd3c8a0
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Correct comment typo in backend-getopt module.
diff --git a/gnetlist/scheme/gnetlist/backend-getopt.scm b/gnetlist/scheme/gnetlist/backend-getopt.scm
index d8ff2da..4fd4055 100644
--- a/gnetlist/scheme/gnetlist/backend-getopt.scm
+++ b/gnetlist/scheme/gnetlist/backend-getopt.scm
@@ -104,7 +104,7 @@ the key `option-error'."
Search OPTIONS for a backend option named KEY and return its value,
if found. If the option has no value, but was given, return `#t'. If
the option was not given, return DEFAULT, or if DEFAULT was not
-specified, `#f'. OPTIONS must be the ruslt of a call to
+specified, `#f'. OPTIONS must be the result of a call to
`backend-getopt'."
(or (assoc-ref options key) default))
commit 2171faf3ba82744a32aa17c0722262dc42bd062d
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: Correct `dist-hook' for gnetlist common tests.
In commit b0613e375ab8, it became valid for some common tests not to
generate output, and subsequently in commit fde0b77b96ef, some `bom2'
and `bom' backend golden files were removed to make use of this.
However, the `dist-hook' rule in the gnetlist common test Makefile.am
still assumed that all tests needed golden output files. This patch
corrects this, and un-breaks `make distcheck'.
diff --git a/gnetlist/tests/common/Makefile.am b/gnetlist/tests/common/Makefile.am
index 511d7dd..1ea14dd 100644
--- a/gnetlist/tests/common/Makefile.am
+++ b/gnetlist/tests/common/Makefile.am
@@ -38,9 +38,12 @@ dist-hook: tests.list backends.list
dir=outputs/$$backend; \
$(MKDIR_P) $(distdir)/$$dir; \
for test in $$tests; do \
- cp -p $(srcdir)/$$dir/$$test.retcode \
- $(srcdir)/$$dir/$$test-output.net \
- $(distdir)/$$dir || exit $$?; \
+ cp -p $(srcdir)/$$dir/$$test.retcode $(distdir)/$$dir \
+ || exit $$?; \
+ if test -f $(srcdir)/$$dir/$$test-output.net ; then \
+ cp -p $(srcdir)/$$dir/$$test-output.net $(distdir)/$$dir \
+ || exit $$?; \
+ fi; \
done; \
done;
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs