[Emacs-diffs] /srv/bzr/emacs/trunk r103047: Merge: src/emacs.c now gets version number from configure.in

[Paul Eggert]

------------------------------------------------------------
revno: 103047 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2011-01-31 00:15:13 -0800
message:
  Merge: src/emacs.c now gets version number from configure.in
modified:
  ChangeLog
  admin/ChangeLog
  admin/admin.el
  admin/quick-install-emacs
  configure
  configure.in
  lib-src/ChangeLog
  lib-src/ebrowse.c
  make-dist
  src/ChangeLog
  src/emacs.c

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-01-30 23:34:18 +0000
+++ b/ChangeLog 2011-01-31 08:12:52 +0000
@@ -1,3 +1,11 @@
+2011-01-31  Paul Eggert  <address@hidden>
+
+       src/emacs.c now gets version number from configure.in
+       * configure.in (version): Set this from $PACKAGE_VERSION,
+       which is set from AC_INIT, rather than scouting through src/emacs.c.
+       * configure: Regenerate.
+       * make-dist (version): Get it from configure.in, not src/emacs.c.
+
 2011-01-30  Paul Eggert  <address@hidden>
 
        strftime: import from gnulib

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2011-01-30 23:34:18 +0000
+++ b/admin/ChangeLog   2011-01-31 08:12:52 +0000
@@ -1,3 +1,10 @@
+2011-01-31  Paul Eggert  <address@hidden>
+
+       src/emacs.c now gets version number from configure.in
+       * admin.el (set-version): Don't update src/emacs.c.
+       * quick-install-emacs (VERSION): Get it from configure.in, not from
+       src/emacs.c.
+
 2011-01-30  Paul Eggert  <address@hidden>
 
        strftime: import from gnulib

=== modified file 'admin/admin.el'
--- a/admin/admin.el    2011-01-25 04:08:28 +0000
+++ b/admin/admin.el    2011-01-31 08:12:52 +0000
@@ -59,9 +59,6 @@
   (interactive "DEmacs root directory: \nsVersion number: ")
   (unless (file-exists-p (expand-file-name "src/emacs.c" root))
     (error "%s doesn't seem to be the root of an Emacs source tree" root))
-  (set-version-in-file root "src/emacs.c" version
-                      (rx (and "emacs_version" (0+ (not (in ?\")))
-                               ?\" (submatch (1+ (not (in ?\")))) ?\")))
   (set-version-in-file root "README" version
                       (rx (and "version" (1+ space)
                                (submatch (1+ (in "0-9."))))))

=== modified file 'admin/quick-install-emacs'
--- a/admin/quick-install-emacs 2011-01-25 04:08:28 +0000
+++ b/admin/quick-install-emacs 2011-01-31 08:12:52 +0000
@@ -170,8 +170,10 @@
 test x"$prefix" = x && { prefix="`get_config_var prefix`" || exit 4 ; }
 test x"$ARCH" = x && { ARCH="`get_config_var host`" || exit 4 ; }
 
-VERSION=`grep 'char emacs_version' $SRC/src/emacs.c \
-         | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
+VERSION=`
+  sed -n 's/^AC_INIT(emacs,[    ]*\([^  )]*\).*/\1/p' <$SRC/configure.in
+` || exit 4
+test -n "$VERSION" || { echo >&2 "$me: no version in configure.in"; exit 4; }
 
 DST_SHARE="$prefix/share/emacs/$VERSION"
 DST_BIN="$prefix/bin"

=== modified file 'configure'
--- a/configure 2011-01-30 23:34:18 +0000
+++ b/configure 2011-01-31 08:12:52 +0000
@@ -16986,16 +16986,7 @@
    as_fn_error $? "GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'." 
"$LINENO" 5
 fi
 
-#### Find out which version of Emacs this is.
-version=`grep 'const char emacs_version' ${srcdir}/src/emacs.c \
-        | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
-if test x"${version}" = x; then
-  as_fn_error $? "can't find current emacs version in 
\`${srcdir}/src/emacs.c'." "$LINENO" 5
-fi
-if test x"${version}" != x"$PACKAGE_VERSION"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: version mismatch between 
\`${srcdir}/configure.in' and \`${srcdir}/src/emacs.c'." >&5
-$as_echo "$as_me: WARNING: version mismatch between \`${srcdir}/configure.in' 
and \`${srcdir}/src/emacs.c'." >&2;}
-fi
+version=$PACKAGE_VERSION
 
 ### Specify what sort of things we'll be editing into Makefile and config.h.
 ### Use configuration here uncanonicalized to avoid exceeding size limits.

=== modified file 'configure.in'
--- a/configure.in      2011-01-30 23:34:18 +0000
+++ b/configure.in      2011-01-31 08:12:52 +0000
@@ -3070,15 +3070,7 @@
    AC_MSG_ERROR([GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'.])
 fi
 
-#### Find out which version of Emacs this is.
-[version=`grep 'const char emacs_version' ${srcdir}/src/emacs.c \
-        | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`]
-if test x"${version}" = x; then
-  AC_MSG_ERROR([can't find current emacs version in `${srcdir}/src/emacs.c'.])
-fi
-if test x"${version}" != x"$PACKAGE_VERSION"; then
-  AC_MSG_WARN([version mismatch between `${srcdir}/configure.in' and 
`${srcdir}/src/emacs.c'.])
-fi
+version=$PACKAGE_VERSION
 
 ### Specify what sort of things we'll be editing into Makefile and config.h.
 ### Use configuration here uncanonicalized to avoid exceeding size limits.

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2011-01-30 09:17:36 +0000
+++ b/lib-src/ChangeLog 2011-01-31 08:12:52 +0000
@@ -1,3 +1,8 @@
+2011-01-31  Paul Eggert  <address@hidden>
+
+       src/emacs.c now gets version number from configure.in
+       * ebrowse.c: Adjust comment to say that.
+
 2011-01-30  Jim Meyering  <address@hidden>
 
        make-docfile: don't corrupt heap for an invalid .elc file

=== modified file 'lib-src/ebrowse.c'
--- a/lib-src/ebrowse.c 2011-01-25 04:08:28 +0000
+++ b/lib-src/ebrowse.c 2011-01-31 08:12:52 +0000
@@ -3565,7 +3565,7 @@
 
 
 /* Display version and copyright info.  The VERSION macro is set
-   from the Makefile and contains the Emacs version.  */
+   from config.h and contains the Emacs version.  */
 
 #ifndef VERSION
 # define VERSION "21"
@@ -3812,7 +3812,7 @@
              yyerror ("error getting size of file `%s'", out_filename);
              exit (EXIT_FAILURE);
            }
-         
+
          else if (rc == 0)
            {
              yyerror ("file `%s' is empty", out_filename);

=== modified file 'make-dist'
--- a/make-dist 2011-01-25 04:08:28 +0000
+++ b/make-dist 2011-01-31 08:12:52 +0000
@@ -146,7 +146,9 @@
 fi
 
 ### Find out which version of Emacs this is.
-version=`sed -n '/char emacs_version/ s/^[^"]*"\([^"]*\)".*$/\1/p' src/emacs.c`
+version=`
+  sed -n 's/^AC_INIT(emacs,[    ]*\([^  )]*\).*/\1/p' <configure.in
+` || version=
 if [ ! "${version}" ]; then
   echo "${progname}: can't find current Emacs version in \`./src/emacs.c'" >&2
   exit 1

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-01-31 07:34:45 +0000
+++ b/src/ChangeLog     2011-01-31 08:15:13 +0000
@@ -1,3 +1,9 @@
+2011-01-31  Paul Eggert  <address@hidden>
+
+       src/emacs.c now gets version number from configure.in
+       * emacs.c (emacs_version): Set to VERSION so that it
+       is determined automatically from ../configure.in.
+
 2011-01-31  Jim Meyering  <address@hidden>
 
        * charset.c (load_charset_map): Don't deref NULL on failed malloc.

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2011-01-30 22:17:44 +0000
+++ b/src/emacs.c       2011-01-31 08:12:52 +0000
@@ -88,9 +88,7 @@
 #endif
 #endif
 
-/* If you change the following line, remember to update
-   msdos/mainmake.v2 which gleans the Emacs version from it!  */
-static const char emacs_version[] = "24.0.50";
+static const char emacs_version[] = VERSION;
 static const char emacs_copyright[] = "Copyright (C) 2011 Free Software 
Foundation, Inc.";
 
 /* Make these values available in GDB, which doesn't see macros.  */