[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.7.1-20110619-253-g523f5bd)
The branch, master has been updated
via 523f5bd65a7cea56bdfca7cab5650832273e24bc (commit)
via 11f91c04a33ed79eb4ed51f30027127ddc2d9bf4 (commit)
via 4342002fa639bc2f18bc4f776920ea540c6d2de3 (commit)
via cee0d8874a0a3a3e76e247f1ebd4f999d7a0d1b0 (commit)
from ed520a7824eef460c3924e064330ccef3696592e (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
=========
examples/TwoStageAmp/TwoStageAmp.sch | 2 +-
gnetlist/tests/Makefile.am | 1 +
gnetlist/tests/drc2/Makefile.am | 1 +
gnetlist/tests/hierarchy/Makefile.am | 1 +
gnetlist/tests/hierarchy2/Makefile.am | 1 +
gnetlist/tests/runtest.sh | 1 +
libgeda/libgeda.pc.in | 6 +-
m4/geda-guile.m4 | 74 ++++-----------------------------
8 files changed, 17 insertions(+), 70 deletions(-)
=================
Commit Messages
=================
commit 523f5bd65a7cea56bdfca7cab5650832273e24bc
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Fix tests for internationalised Scheme API.
Missed some places where the Scheme load path needed extending in
commit 8d4c574efc3a. This broke distcheck.
:100644 100644 2bd1117... b4ced22... M gnetlist/tests/Makefile.am
:100644 100644 3d3665e... 4c5d117... M gnetlist/tests/drc2/Makefile.am
:100644 100644 33a6889... 2504cd0... M gnetlist/tests/hierarchy/Makefile.am
:100644 100644 8fb1ecd... e9b0550... M gnetlist/tests/hierarchy2/Makefile.am
:100755 100755 713e5ae... 6a10fca... M gnetlist/tests/runtest.sh
commit 11f91c04a33ed79eb4ed51f30027127ddc2d9bf4
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
examples: Update TwoStageAmp.sch
Commit d5d1a98f0e95 removed special handling for attributes with the
value "?" in the spice-sdb gnetlist backend. However, the TwoStageAmp
example had an embedded copy of spice-directive-1.sym with a "file=?"
attribute.
Reported-by: Vladimir Zhbanov <vzhbanov@xxxxxxxxx>
:100644 100644 3b8eca4... cae92b9... M examples/TwoStageAmp/TwoStageAmp.sch
commit 4342002fa639bc2f18bc4f776920ea540c6d2de3
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: Only look for Guile using pkg-config.
This makes it possible for `pkg-config --libs libgeda' to give the
correct output.
:100644 100644 0249898... 827c601... M libgeda/libgeda.pc.in
:100644 100644 085aa66... 48b1128... M m4/geda-guile.m4
commit cee0d8874a0a3a3e76e247f1ebd4f999d7a0d1b0
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: List gio-2.0 as one of the pkg-config requirements.
The new picture handling code uses GIO with GdkPixbuf to load images
from memory buffers. We don't need to update the configure checks
because we already require a version of GdkPixbuf that requires GIO.
:100644 100644 0778d45... 0249898... M libgeda/libgeda.pc.in
=========
Changes
=========
commit 523f5bd65a7cea56bdfca7cab5650832273e24bc
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Fix tests for internationalised Scheme API.
Missed some places where the Scheme load path needed extending in
commit 8d4c574efc3a. This broke distcheck.
diff --git a/gnetlist/tests/Makefile.am b/gnetlist/tests/Makefile.am
index 2bd1117..b4ced22 100644
--- a/gnetlist/tests/Makefile.am
+++ b/gnetlist/tests/Makefile.am
@@ -139,6 +139,7 @@ tests_ales:
# switcap (does not work with make distcheck due to local test.ana file)
$(GNETLIST) -L $(top_srcdir)/libgeda/scheme \
+ -L $(top_builddir)/libgeda/scheme \
-o $(BUILDDIR)/new_skt.switcap -g switcap \
$(SRCDIR)/../examples/switcap/ckt.sch \
$(SRCDIR)/../examples/switcap/clocks.sch \
diff --git a/gnetlist/tests/drc2/Makefile.am b/gnetlist/tests/drc2/Makefile.am
index 3d3665e..4c5d117 100644
--- a/gnetlist/tests/drc2/Makefile.am
+++ b/gnetlist/tests/drc2/Makefile.am
@@ -66,6 +66,7 @@ tests:
SCMDIR=${top_builddir}/gnetlist/scheme \
SYMDIR=${top_srcdir}/symbols \
$(GNETLIST) -L$(top_srcdir)/libgeda/scheme \
+ -L$(top_builddir)/libgeda/scheme \
-g drc2 \
-o $(BUILDDIR)/new_$$file_basename.drc2 \
$$file ); \
diff --git a/gnetlist/tests/hierarchy/Makefile.am b/gnetlist/tests/hierarchy/Makefile.am
index 33a6889..2504cd0 100644
--- a/gnetlist/tests/hierarchy/Makefile.am
+++ b/gnetlist/tests/hierarchy/Makefile.am
@@ -22,6 +22,7 @@ tests:
SYMDIR=$(top_srcdir)/symbols \
$(GNETLIST) \
-L $(top_srcdir)/libgeda/scheme \
+ -L $(top_builddir)/libgeda/scheme \
-o $(BUILDDIR)/new_hierarchy.geda \
-g geda $(SRCDIR)/top.sch )
diff $(SRCDIR)/hierarchy.geda $(BUILDDIR)/new_hierarchy.geda;
diff --git a/gnetlist/tests/hierarchy2/Makefile.am b/gnetlist/tests/hierarchy2/Makefile.am
index 8fb1ecd..e9b0550 100644
--- a/gnetlist/tests/hierarchy2/Makefile.am
+++ b/gnetlist/tests/hierarchy2/Makefile.am
@@ -19,6 +19,7 @@ tests:
SYMDIR=${top_srcdir}/symbols \
$(GNETLIST) \
-L $(top_srcdir)/libgeda/scheme \
+ -L $(top_builddir)/libgeda/scheme \
-o $(BUILDDIR)/new_hierarchy2.geda -g geda \
$(SRCDIR)/top.sch )
diff $(SRCDIR)/hierarchy2.geda $(BUILDDIR)/new_hierarchy2.geda;
diff --git a/gnetlist/tests/runtest.sh b/gnetlist/tests/runtest.sh
index 713e5ae..6a10fca 100755
--- a/gnetlist/tests/runtest.sh
+++ b/gnetlist/tests/runtest.sh
@@ -15,6 +15,7 @@ SCMDIR=$SRCDIR/../scheme \
SYMDIR=$SRCDIR/../../symbols \
GEDADATARC=$BUILDDIR/../lib \
../src/gnetlist -L ${SRCDIR}/../../libgeda/scheme \
+ -L ${BUILDDIR}/../../libgeda/scheme \
-o ${BUILDDIR}/new_${schbasename}.$BACKEND -g $BACKEND $INPUT
status=$?
commit 11f91c04a33ed79eb4ed51f30027127ddc2d9bf4
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
examples: Update TwoStageAmp.sch
Commit d5d1a98f0e95 removed special handling for attributes with the
value "?" in the spice-sdb gnetlist backend. However, the TwoStageAmp
example had an embedded copy of spice-directive-1.sym with a "file=?"
attribute.
Reported-by: Vladimir Zhbanov <vzhbanov@xxxxxxxxx>
diff --git a/examples/TwoStageAmp/TwoStageAmp.sch b/examples/TwoStageAmp/TwoStageAmp.sch
index 3b8eca4..cae92b9 100644
--- a/examples/TwoStageAmp/TwoStageAmp.sch
+++ b/examples/TwoStageAmp/TwoStageAmp.sch
@@ -166,7 +166,7 @@ value=.options TEMP=25
T 26600 54000 5 10 0 1 0 0 1
device=directive
T 26600 53800 5 10 1 1 0 0 1
-file=?
+file=unknown
}
N 27000 49700 28100 49700 4
{
commit 4342002fa639bc2f18bc4f776920ea540c6d2de3
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: Only look for Guile using pkg-config.
This makes it possible for `pkg-config --libs libgeda' to give the
correct output.
diff --git a/libgeda/libgeda.pc.in b/libgeda/libgeda.pc.in
index 0249898..827c601 100644
--- a/libgeda/libgeda.pc.in
+++ b/libgeda/libgeda.pc.in
@@ -7,9 +7,9 @@ gedadatadir=@GEDADATADIR@
Name: libgeda
Description: gEDA/gaf's core library
-Requires: glib-2.0 gdk-pixbuf-2.0 gio-2.0
+Requires: glib-2.0 gdk-pixbuf-2.0 gio-2.0 @GUILE_PKG@
Requires.private:
Version: @DATE_VERSION@
Libs: -L${libdir} -lgeda
-Libs.private: @GUILE_LIBS@
-Cflags: -I${includedir} @GUILE_CFLAGS@
+Libs.private:
+Cflags: -I${includedir}
diff --git a/m4/geda-guile.m4 b/m4/geda-guile.m4
index 085aa66..48b1128 100644
--- a/m4/geda-guile.m4
+++ b/m4/geda-guile.m4
@@ -1,5 +1,5 @@
# geda-guile.m4 -*-Autoconf-*-
-# serial 2
+# serial 3
dnl Check for guile
dnl Copyright (C) 2009 Dan McMahill <dan@xxxxxxxxxxxx>
@@ -35,78 +35,20 @@ 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-2.0] , ,
- [_found_pkg_config_guile=no])
+ PKG_CHECK_MODULES(GUILE, [guile-2.0 >= $GUILE_MIN_VER],
+ [GUILE_PKG=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-1.8] , ,
- [_found_pkg_config_guile=no])
+ PKG_CHECK_MODULES(GUILE, [guile-1.8 >= $GUILE_MIN_VER],
+ [GUILE_PKG=guile-1.8], [_found_pkg_config_guile=no])
fi
if test "${_found_pkg_config_guile}" = "no" ; then
- AC_PATH_PROG([GUILE_CONFIG], [guile-config], [notfound])
-
- if test "${GUILE_CONFIG}" = "notfound" ; then
- AC_ERROR([${PKG_CONFIG} could not locate guile and guile-config was not found])
- fi
-
- AC_MSG_CHECKING([if guile is version ${GUILE_MIN_VER} or later])
- GUILE_VER=`${GUILE_CONFIG} --version 2>&1 | awk '{print $NF}'`
-
- GUILE_MAJOR=`echo ${GUILE_VER} | sed 's;\..*;;g'`
- # the double brackets are to get past m4's expansion
- GUILE_MINOR=`echo ${GUILE_VER} | sed -e 's;[[^\.]]*\.;;' -e 's;\..*;;g'`
- GUILE_TEENY=`echo ${GUILE_VER} | sed -e 's;.*\.;;'`
-
- _guile_ok=no
- if test ${GUILE_MAJOR} -lt ${GUILE_MIN_MAJOR} ; then
- # Our installed major version is less than the min major version
-
- _guile_ok=no
-
- elif test ${GUILE_MAJOR} -eq ${GUILE_MIN_MAJOR} ; then
- # Our installed major version is equal the min major version
- # so we need to check the minor version
-
- if test ${GUILE_MINOR} -lt ${GUILE_MIN_MINOR} ; then
- # majors match, minor is too small
- _guile_ok=no
- elif test ${GUILE_MINOR} -eq ${GUILE_MIN_MINOR} ; then
- # majors match, minors match, check teeny
- if test ${GUILE_TEENY} -lt ${GUILE_MIN_TEENY} ; then
- _guile_ok=no
- else
- _guile_ok=yes
- fi
- else
- # majors match, minor is larger than min
- _guile_ok=yes
- fi
-
- else
- # Our installed major version is greater than the min major version
-
- _guile_ok=yes
- fi
-
- if test "${_guile_ok}" = "yes" ; then
- AC_MSG_RESULT([yes (${GUILE_VER})])
- AC_MSG_CHECKING([for guile CFLAGS])
- GUILE_CFLAGS=`${GUILE_CONFIG} compile`
- AC_MSG_RESULT([${GUILE_CFLAGS}])
-
- AC_MSG_CHECKING([for guile libs])
- GUILE_LIBS=`${GUILE_CONFIG} link`
- AC_MSG_RESULT([$GUILE_LIBS])
- else
- AC_MSG_ERROR([you need at least version ${GUILE_MIN_VER} of guile])
- fi
- AC_SUBST(GUILE_VER)
- AC_SUBST(GUILE_CFLAGS)
- AC_SUBST(GUILE_LIBS)
+ AC_MSG_ERROR([you need at least version ${GUILE_MIN_VER} of guile])
fi
+ AC_SUBST([GUILE_PKG])
+
# Check for the `guile' executable
# --------------------------------
AC_ARG_VAR([GUILE], [Path to guile executable])
commit cee0d8874a0a3a3e76e247f1ebd4f999d7a0d1b0
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: List gio-2.0 as one of the pkg-config requirements.
The new picture handling code uses GIO with GdkPixbuf to load images
from memory buffers. We don't need to update the configure checks
because we already require a version of GdkPixbuf that requires GIO.
diff --git a/libgeda/libgeda.pc.in b/libgeda/libgeda.pc.in
index 0778d45..0249898 100644
--- a/libgeda/libgeda.pc.in
+++ b/libgeda/libgeda.pc.in
@@ -7,7 +7,7 @@ gedadatadir=@GEDADATADIR@
Name: libgeda
Description: gEDA/gaf's core library
-Requires: glib-2.0 gdk-pixbuf-2.0
+Requires: glib-2.0 gdk-pixbuf-2.0 gio-2.0
Requires.private:
Version: @DATE_VERSION@
Libs: -L${libdir} -lgeda
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs