emacs/gnu.emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2026-09-10 07:46:51 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

src/emacs.c now gets version number from configure.in

Browse source
This commit is contained in:
Paul Eggert 2011-01-31 00:12:52 -08:00
parent 3370edca83
commit 16fab14354
11 changed files with 38 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2011-01-31 Paul Eggert <eggert@cs.ucla.edu>
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 <eggert@cs.ucla.edu>
strftime: import from gnulib

7
admin/ChangeLog
View file

@ -1,3 +1,10 @@
2011-01-31 Paul Eggert <eggert@cs.ucla.edu>
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 <eggert@cs.ucla.edu>
strftime: import from gnulib

3
admin/admin.el
View file

@ -59,9 +59,6 @@ Root must be the root of an Emacs source tree."
(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."))))))

6
admin/quick-install-emacs
View file

@ -170,8 +170,10 @@ test x"$SRC" = x && { SRC="`get_config_var srcdir`" || exit 4 ; }
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"

11
configure vendored
View file

@ -16986,16 +16986,7 @@ if test "x$GCC" = xyes \
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.

10
configure.in
View file

@ -3070,15 +3070,7 @@ if test "x$GCC" = xyes \
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.

5
lib-src/ChangeLog
View file

@ -1,3 +1,8 @@
2011-01-31 Paul Eggert <eggert@cs.ucla.edu>
src/emacs.c now gets version number from configure.in
* ebrowse.c: Adjust comment to say that.
2011-01-30 Jim Meyering <meyering@redhat.com>
make-docfile: don't corrupt heap for an invalid .elc file

4
lib-src/ebrowse.c
View file

@ -3565,7 +3565,7 @@ usage (int error)
/* 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 @@ main (int argc, char **argv)
yyerror ("error getting size of file `%s'", out_filename);
exit (EXIT_FAILURE);
}
else if (rc == 0)
{
yyerror ("file `%s' is empty", out_filename);

4
make-dist
View file

@ -146,7 +146,9 @@ then
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

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2011-01-31 Paul Eggert <eggert@cs.ucla.edu>
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-30 Paul Eggert <eggert@cs.ucla.edu>
strftime: import from gnulib

4
src/emacs.c
View file

@ -88,9 +88,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#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. */