[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.2-20090328-102-g3740182)
The branch, master has been updated
via 374018276325d7d9efa42fb060ccb3cfc58be397 (commit)
via 2f8006bf63db3e4d7f4e90b7730c627a506eaae4 (commit)
from 64cdf2bd7250e97749a308e19916c1d65c9a2c95 (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/Makefile.am | 16 ++++++++++++++++
gnetlist/tests/drc2/gnetlistrc.drc2 | 2 +-
gnetlist/tests/hierarchy/Makefile.am | 2 +-
gnetlist/tests/hierarchy2/Makefile.am | 2 +-
4 files changed, 19 insertions(+), 3 deletions(-)
=================
Commit Messages
=================
commit 2f8006bf63db3e4d7f4e90b7730c627a506eaae4
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>
Fix the testsuite when building outside the source tree.
Since gnetlist currently only looks in a single directory for scheme
files and since some of our scheme files are generated at build time
we need to copy over the other source .scm files to the build directory
for the testsuite to run. Longer term, we should either
a) consolidate all of the testsuite into a single master script that
starts by merging all the scheme files into a single directory
or
b) teach gnetlist to have a scheme search path. Even with this,
testsuite consolidation would be good.
:100644 100644 6f96601... 5206f1e... M gnetlist/scheme/Makefile.am
:100644 100644 43a5d83... 1854057... M gnetlist/tests/drc2/gnetlistrc.drc2
:100644 100644 d098c50... 30d1b0c... M gnetlist/tests/hierarchy/Makefile.am
:100644 100644 559c478... ae09a29... M gnetlist/tests/hierarchy2/Makefile.am
=========
Changes
=========
commit 2f8006bf63db3e4d7f4e90b7730c627a506eaae4
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>
Fix the testsuite when building outside the source tree.
Since gnetlist currently only looks in a single directory for scheme
files and since some of our scheme files are generated at build time
we need to copy over the other source .scm files to the build directory
for the testsuite to run. Longer term, we should either
a) consolidate all of the testsuite into a single master script that
starts by merging all the scheme files into a single directory
or
b) teach gnetlist to have a scheme search path. Even with this,
testsuite consolidation would be good.
diff --git a/gnetlist/scheme/Makefile.am b/gnetlist/scheme/Makefile.am
index 6f96601..5206f1e 100644
--- a/gnetlist/scheme/Makefile.am
+++ b/gnetlist/scheme/Makefile.am
@@ -50,3 +50,19 @@ DISTCLEANFILES = *.log core FILE *~ prototype.bak \
gnet-PCBboard.scm gnet-gsch2pcb.scm
MAINTAINERCLEANFILES = *.log *~ Makefile.in configure \
gnet-PCBboard.scm gnet-gsch2pcb.scm
+
+all-local:
+ if test "$(srcdir)" != "$(builddir)" ; then \
+ echo "copying scheme files" ; \
+ cp -f $(srcdir)/*.scm $(builddir) ; \
+ else \
+ echo "source directory = build directory" ; \
+ fi
+
+clean-local:
+ if test "$(srcdir)" != "$(builddir)" ; then \
+ echo "cleaning scheme files" ; \
+ rm -f $(builddir)/*.scm ; \
+ else \
+ echo "source directory = build directory" ; \
+ fi
diff --git a/gnetlist/tests/drc2/gnetlistrc.drc2 b/gnetlist/tests/drc2/gnetlistrc.drc2
index 43a5d83..1854057 100644
--- a/gnetlist/tests/drc2/gnetlistrc.drc2
+++ b/gnetlist/tests/drc2/gnetlistrc.drc2
@@ -1,4 +1,4 @@
;; We want to point at the scheme code that hasn't been installed yet so that
;; 'make check' during development can work correctly.
-(scheme-directory "@scheme_srcdir@")
+(scheme-directory "@scheme_builddir@")
diff --git a/gnetlist/tests/hierarchy/Makefile.am b/gnetlist/tests/hierarchy/Makefile.am
index d098c50..30d1b0c 100644
--- a/gnetlist/tests/hierarchy/Makefile.am
+++ b/gnetlist/tests/hierarchy/Makefile.am
@@ -18,7 +18,7 @@ tests: tests-job tests-clean
tests-job:
rm -f $(BUILDDIR)/new_*
cp -f $(SRCDIR)/gnetlistrc.hierarchy $(BUILDDIR)/gnetlistrc
- ( TESTDIR=$(SRCDIR); export TESTDIR ; SCMDIR=${top_srcdir}/scheme ; export SCMDIR ; \
+ ( TESTDIR=$(SRCDIR); export TESTDIR ; SCMDIR=${top_builddir}/scheme ; export SCMDIR ; \
echo $$TESTDIR; \
$(GNETLIST) \
-o $(BUILDDIR)/new_hierarchy.geda -g geda \
diff --git a/gnetlist/tests/hierarchy2/Makefile.am b/gnetlist/tests/hierarchy2/Makefile.am
index 559c478..ae09a29 100644
--- a/gnetlist/tests/hierarchy2/Makefile.am
+++ b/gnetlist/tests/hierarchy2/Makefile.am
@@ -15,7 +15,7 @@ tests: tests-job tests-clean
tests-job:
rm -f $(BUILDDIR)/new_*
cp -f $(SRCDIR)/gafrc.hierarchy2 $(BUILDDIR)/gafrc
- ( TESTDIR=$(SRCDIR); export TESTDIR ; SCMDIR=${top_srcdir}/scheme ; export SCMDIR ; \
+ ( TESTDIR=$(SRCDIR); export TESTDIR ; SCMDIR=${top_builddir}/scheme ; export SCMDIR ; \
echo $$TESTDIR; \
$(GNETLIST) \
-o $(BUILDDIR)/new_hierarchy2.geda -g geda \
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs