[Guile-commits] GNU Guile branch, master, updated. release_1-9-11-268-g319b53d

[Thien-Thi Nguyen]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=319b53dd1c177891990d7436fd89f987abe0d1bc

The branch, master has been updated
       via  319b53dd1c177891990d7436fd89f987abe0d1bc (commit)
       via  b405cdb4c5ad31888a0a54b6fd98b466bf711a66 (commit)
      from  8996d00ee482e6d5fdea623f5fd4d32dd7da7638 (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.

- Log -----------------------------------------------------------------
commit 319b53dd1c177891990d7436fd89f987abe0d1bc
Author: Thien-Thi Nguyen <address@hidden>
Date:   Wed Aug 18 19:34:46 2010 +0200

    [build] Fix sed portability bug: Don't use '\n' in sed script.
    
    Regression introduced 2010-07-22, "[build] Overhaul
    <errno.h>, <signal.h> cpp symbol extraction/checking".
    See: <http://autobuild.josefsson.org/guile/log-201008181002653292000.txt>
    
    * libguile/Makefile.am (.syms.c): Convert
      one-liner sed script to while-read-echo loop.

commit b405cdb4c5ad31888a0a54b6fd98b466bf711a66
Author: Thien-Thi Nguyen <address@hidden>
Date:   Wed Jul 28 14:27:42 2010 +0200

    [build] Create libguile/version.h using the configure script.
    
    * configure.ac (AC_CONFIG_FILES): Add libguile/version.h.
    
    * libguile/Makefile.am (version.h): Delete target.
      (EXTRA_DIST): Remove version.h.in.
      (BUILT_SOURCES): Remove version.h.
      (MOSTLYCLEANFILES): Remove version.h, version.h.tmp.
    * libguile/version.h.in (SCM_MAJOR_VERSION): Use conventional
      @VAR@ instead of @-VAR-@ for ‘GUILE_MAJOR_VERSION’.
      (SCM_MINOR_VERSION, SCM_MICRO_VERSION, SCM_EFFECTIVE_VERSION): Likewise
      for ‘GUILE_MINOR_VERSION’, ‘GUILE_MICRO_VERSION’, 
‘GUILE_EFFECTIVE_VERSION’.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac          |    1 +
 libguile/Makefile.am  |   26 ++++++++++----------------
 libguile/version.h.in |    8 ++++----
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/configure.ac b/configure.ac
index f3afec3..3569868 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1620,6 +1620,7 @@ AC_CONFIG_FILES([
   emacs/Makefile
   examples/Makefile
   libguile/Makefile
+  libguile/version.h
   srfi/Makefile
   guile-readline/Makefile
   test-suite/Makefile
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 3045075..fbc1efd 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -413,7 +413,7 @@ DOT_I_FILES = vm-i-system.i vm-i-scheme.i vm-i-loader.i
        $(AM_V_GEN)$(GREP) '^VM_DEFINE' $< > $@
 
 BUILT_SOURCES = cpp-E.c cpp-SIG.c libpath.h \
-    version.h scmconfig.h \
+    scmconfig.h \
     $(DOT_I_FILES) $(DOT_X_FILES) $(EXTRA_DOT_X_FILES)
 
 address@hidden@_la_SOURCES = _scm.h            \
@@ -595,21 +595,11 @@ EXTRA_DIST = ChangeLog-scm ChangeLog-threads              
\
     ChangeLog-1996-1999 ChangeLog-2000 ChangeLog-2008  \
     guile-func-name-check                              \
     cpp-E.syms cpp-E.c cpp-SIG.syms cpp-SIG.c                  \
-    c-tokenize.lex version.h.in                                                
\
+    c-tokenize.lex                                             \
     scmconfig.h.top libgettext.h unidata_to_charset.pl libguile.map
 #    $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) \
 #    guile-procedures.txt guile.texi
 
-## We use @-...-@ as the substitution brackets here, instead of the
-## usual @...@, so autoconf doesn't go and substitute the values
-## directly into the left-hand sides of the sed substitutions.  *sigh*
-version.h: version.h.in $(top_builddir)/config.status
-       $(AM_V_GEN)sed < $(srcdir)/version.h.in > address@hidden \
-         -e s:@-GUILE_MAJOR_VERSION-@:${GUILE_MAJOR_VERSION}: \
-         -e s:@-GUILE_MINOR_VERSION-@:${GUILE_MINOR_VERSION}: \
-         -e s:@-GUILE_MICRO_VERSION-@:${GUILE_MICRO_VERSION}: \
-         -e s:@-GUILE_EFFECTIVE_VERSION-@:${GUILE_EFFECTIVE_VERSION}: && mv 
address@hidden $@
-
 ## FIXME: Consider using timestamp file, to avoid unnecessary rebuilds.
 libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        @rm -f libpath.tmp
@@ -731,10 +721,15 @@ MKDEP = gcc -M -MG $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(CFLAGS)
 #      #ifdef SYMBOL
 #      scm_c_define ("SYMBOL", scm_from_int (SYMBOL));
 #      #endif
-# writing output to foo.c.
+# writing output to foo.c.  We use a while-read loop instead of a
+# one-line sed script because some seds (e.g., FreeBSD) don't read
+# '\n' as a newline (like GNU sed does).  Sad, but true.
 .syms.c:
-       sed 's/.*/#ifdef &\nscm_c_define ("&", scm_from_int (&));\n#endif/' \
-         $< > address@hidden
+       cat $< | while read sym ; do                                    \
+         echo "#ifdef $$sym" ;                                         \
+         echo "scm_c_define (\"$$sym\", scm_from_int ($$sym));" ;      \
+         echo "#endif" ;                                               \
+       done > address@hidden
        mv address@hidden $@
 
 # Write $(srcdir)/cpp-{E,SIG}.syms.NEW if there are any not-yet-seen
@@ -758,7 +753,6 @@ chknew-E chknew-SIG:
 
 
 MOSTLYCLEANFILES = \
-       version.h version.h.tmp \
        scmconfig.h scmconfig.h.tmp
 
 CLEANFILES = libpath.h *.x *.doc guile-procedures.txt guile-procedures.texi 
guile.texi \
diff --git a/libguile/version.h.in b/libguile/version.h.in
index 49d26c2..427afae 100644
--- a/libguile/version.h.in
+++ b/libguile/version.h.in
@@ -27,10 +27,10 @@
 
 
 
-#define SCM_MAJOR_VERSION @-GUILE_MAJOR_VERSION-@
-#define SCM_MINOR_VERSION @-GUILE_MINOR_VERSION-@
-#define SCM_MICRO_VERSION @-GUILE_MICRO_VERSION-@
-#define SCM_EFFECTIVE_VERSION "@-GUILE_EFFECTIVE_VERSION-@"
+#define SCM_MAJOR_VERSION @GUILE_MAJOR_VERSION@
+#define SCM_MINOR_VERSION @GUILE_MINOR_VERSION@
+#define SCM_MICRO_VERSION @GUILE_MICRO_VERSION@
+#define SCM_EFFECTIVE_VERSION "@GUILE_EFFECTIVE_VERSION@"
 
 SCM_API SCM scm_major_version (void);
 SCM_API SCM scm_minor_version (void);


hooks/post-receive
-- 
GNU Guile