Skip to content

GitLab

Commit 0aeec26c authored by zack's avatar zack
Browse files

maintainer-scripts: 

	* update_version: Do not check in files which are unchanged.
	* gcc_release: Only update the version in gcc/version.c.
gcc:
	* version.c (version_string): Now const char[].
	* version.h: Update to match.
gcc/ada:
	* Make-lang.in (EXTRA_GNATBIND_OBJS): Add version.o.
	* Makefile.in (TOOLS_LIBS): Add ../../version.o.
	* gnatvsn.ads: Gnat_Version_String is now a function.
	* gnatvsn.adb: New file.  When asked for Gnat_Version_String,
	copy the C version_string into a String and return it.
	* gnatcmd.adb, gnatkr.adb, gnatlbr.adb, gnatlink.adb,
	gnatls.adb,gnatmake.adb, gnatprep.adb, gnatpsta.adb:
	Remove pragma Ident (Gnat_Version_String).  If this was the
	sole use of package Gnatvsn, remove the with statement too.
	* gnat1drv.adb: Tweak -gnatv output.
gcc/f:
	* Make-lang.in (g77spec.o): Don't depend on f/version.h.
	(f/parse.o): Depend on version.h not f/version.h.
	(g77version.o, f/version.o): Delete all references.

	* com.c (ffecom_init_0): Fix transposed array indices in bsearch test.
	* g77spec.c: Don't include f/version.h or refer to ffe_version_string.
	* parse.c: Use version_string, not ffe_version_string.
	* version.c, version.h: Delete files.
libf2c:
	* libF77/Version.c: Rename junk to __LIBF77_VERSION__.  Add
	external decls for __LIBI77_VERSION__ and __LIBU77_VERSION__.
	Delete __G77_LIBF77_VERSION__
	(g77__fvers__): Print all three __LIB*77_VERSION__ strings,
	and __VERSION__ if we have it; nothing else.

	* libI77/Version.c: Provide only __LIBI77_VERSION__ (formerly junk).
	* libU77/Version.c: Provide only __LIBU77_VERSION__ (formerly junk).


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@57461 138bc75d-0d04-0410-961f-82ee72b054a4
parent 579cfc1d
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 78 deletions
gcc/f/version.c deleted 100644 → 0
View file @ 579cfc1d
#include "ansidecl.h"
#include "f/version.h"
const char *const ffe_version_string = "3.3 20020923 (experimental)";
gcc/f/version.h deleted 100644 → 0
View file @ 579cfc1d
#ifndef GCC_F_VERSION_H
#define GCC_F_VERSION_H
extern const char *const ffe_version_string;
#endif /* ! GCC_F_VERSION_H */
gcc/version.c
View file @ 0aeec26c
#include "ansidecl.h"
#include "version.h"
const char *const version_string = "3.3 20020923 (experimental)";
const char version_string[] = "3.3 20020923 (experimental)";
gcc/version.h
View file @ 0aeec26c
#ifndef GCC_VERSION_H
#define GCC_VERSION_H
extern const char *const version_string;
extern const char version_string[];
#endif /* ! GCC_VERSION_H */
libf2c/ChangeLog
View file @ 0aeec26c
2002-09-23 Zack Weinberg <zack@codesourcery.com>
* libF77/Version.c: Rename junk to __LIBF77_VERSION__. Add
external decls for __LIBI77_VERSION__ and __LIBU77_VERSION__.
Delete __G77_LIBF77_VERSION__
(g77__fvers__): Print all three __LIB*77_VERSION__ strings,
and __VERSION__ if we have it; nothing else.
* libI77/Version.c: Provide only __LIBI77_VERSION__ (formerly junk).
* libU77/Version.c: Provide only __LIBU77_VERSION__ (formerly junk).
Sun Sep 22 23:43:37 2002 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* Makefile.in (all): Fix multilib parallel build.
......@@ -199,7 +210,7 @@ Mon May 20 13:03:54 2002 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
2002-05-02 Alexandre Oliva <aoliva@redhat.com>
* Makefile.in: Fix for multilibbed natives.
* Makefile.in: Fix for multilibbed natives.
2002-04-15 Loren J. Rittle <ljrittle@acm.org>
......@@ -353,7 +364,7 @@ Mon May 20 13:03:54 2002 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
of shared libf2c to 0:0:0.
2001-09-29 Juergen Pfeifer <juergen.pfeifer@gmx.net>
Toon Moene <toon@moene.indiv.nluug.nl>
Toon Moene <toon@moene.indiv.nluug.nl>
Make libf2c a shared library.
......@@ -427,7 +438,7 @@ Wed Jul 18 11:14:33 2001 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* libI77/Makefile.in: Add necessary dependencies on config.h.
2001-07-06 Toon Moene <toon@moene.indiv.nluug.nl>
Pedro Vazquez <vazquez@penelope.iqm.unicamp.br>
Pedro Vazquez <vazquez@penelope.iqm.unicamp.br>
* libI77/configure.in: Check for fseeko, ftello.
* libI77/configure: Rebuilt.
......@@ -454,7 +465,7 @@ Wed Jul 18 11:14:33 2001 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* libI77/fio.h: Include <sys/types.h> for off_t.
2001-07-01 Toon Moene <toon@moene.indiv.nluug.nl>
Pedro Vazquez <vazquez@penelope.iqm.unicamp.br>
Pedro Vazquez <vazquez@penelope.iqm.unicamp.br>
* libI77/fio.h: Use off_t when appropriate.
* libI77/backspace.c (f_back): Ditto.
......@@ -612,7 +623,7 @@ Wed Jul 18 11:14:33 2001 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
file atomically.
2000-07-03 Donn Terry (donnte@microsoft.com)
* libU77/aclocal.m4: check for 2 argument gettimeofday without
* libU77/aclocal.m4: check for 2 argument gettimeofday without
struct timezone
2000-07-02 Toon Moene <toon@moene.indiv.nluug.nl>
......
libf2c/libF77/Version.c
View file @ 0aeec26c
static char junk[] = "\n@(#)LIBF77 VERSION 20000929\n";
/*
*/
char __G77_LIBF77_VERSION__[] = "3.3 20020923 (experimental)";
const char __LIBF77_VERSION__[] = "@(#) LIBF77 VERSION 20000929\n";
extern const char __LIBI77_VERSION__[];
extern const char __LIBU77_VERSION__[];
/*
2.00 11 June 1980. File version.c added to library.
......@@ -87,6 +84,11 @@ char __G77_LIBF77_VERSION__[] = "3.3 20020923 (experimental)";
void
g77__fvers__ ()
{
fprintf (stderr, "__G77_LIBF77_VERSION__: %s", __G77_LIBF77_VERSION__);
fputs (junk, stderr);
fputs ("GNU Fortran library.\n", stderr);
#if defined __GNUC__ && defined __VERSION__
fprintf (stderr, "Compiled by GCC %s\n", __VERSION__);
#endif
fputs (__LIBF77_VERSION__, stderr);
fputs (__LIBI77_VERSION__, stderr);
fputs (__LIBU77_VERSION__, stderr);
}
libf2c/libI77/Version.c
View file @ 0aeec26c
static char junk[] = "\n@(#) LIBI77 VERSION pjw,dmg-mods 20001205\n";
/*
*/
char __G77_LIBI77_VERSION__[] = "3.3 20020923 (experimental)";
const char __LIBI77_VERSION__[] = "@(#) LIBI77 VERSION pjw,dmg-mods 20001205\n";
/*
2.01 $ format added
......@@ -324,17 +319,6 @@ wrtfmt.c:
/* treat Tstuff= and Fstuff= as new assignments rather than as */
/* logical constants. */
/* Changes for GNU Fortran (g77) version of libf2c: */
/* 17 June 1997: detect recursive I/O and call f__fatal explaining it. */
#include <stdio.h>
void
g77__ivers__ ()
{
fprintf (stderr, "__G77_LIBI77_VERSION__: %s", __G77_LIBI77_VERSION__);
fputs (junk, stderr);
}
libf2c/libU77/Version.c
View file @ 0aeec26c
static char junk[] = "\n@(#) LIBU77 VERSION 19980709\n";
char __G77_LIBU77_VERSION__[] = "3.3 20020923 (experimental)";
#include <stdio.h>
void
g77__uvers__ ()
{
fprintf (stderr, "__G77_LIBU77_VERSION__: %s", __G77_LIBU77_VERSION__);
fputs (junk, stderr);
}
const char __LIBU77_VERSION__[] = "@(#) LIBU77 VERSION 19980709\n";
maintainer-scripts/ChangeLog
View file @ 0aeec26c
2002-09-23 Zack Weinberg <zack@codesourcery.com>
* update_version: Do not check in files which are unchanged.
* gcc_release: Only update the version in gcc/version.c.
2002-09-17 Joseph S. Myers <jsm@polyomino.org.uk>
* update_web_docs (MANUALS): Add fastjar.
......
maintainer-scripts/gcc_release
View file @ 0aeec26c
......@@ -126,8 +126,7 @@ EOF
error "Could not commit ${x}"
done
# Update `gcc/version.c'. There are other version files
# as well, which should have release status updated.
# Update `gcc/version.c'.
for x in gcc/version.c; do
y=`basename ${x}`
(changedir `dirname ${SOURCE_DIRECTORY}/${x}` && \
......@@ -136,15 +135,6 @@ EOF
${CVS} ci -m 'Update version' ${y}) || \
error "Could not update ${x}"
done
for x in gcc/ada/gnatvsn.ads gcc/f/version.c libf2c/libF77/Version.c \
libf2c/libI77/Version.c libf2c/libU77/Version.c; do
y=`basename ${x}`
(changedir `dirname ${SOURCE_DIRECTORY}/${x}` && \
sed -e 's/experimental\|prerelease/release/g' < ${y} > ${y}.new && \
mv ${y}.new ${y} && \
${CVS} ci -m 'Update version' ${y}) || \
error "Could not update ${x}"
done
# Make sure we tag the sources for a final release.
TAG="gcc_`echo ${RELEASE} | tr . _`_release"
......
maintainer-scripts/update_version
View file @ 0aeec26c
......@@ -45,23 +45,29 @@ for BRANCH in $BRANCHES; do
for file in $textstring_FILES; do
if test -f $file; then
OLD_VERSION=`/bin/cat $file`
/bin/sed -e "s/\(.*\"[^ ]*\) [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]/\1 ${CURR_DATE}/" >${file} <<HERE
$OLD_VERSION
HERE
COMMIT_FILES="$COMMIT_FILES $file"
/bin/sed <$file >$file.new -e \
"s/\(.*\"[^ ]*\) [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]/\1 ${CURR_DATE}/"
if /usr/bin/cmp -s $file $file.new; then
rm -f $file.new
else
mv -f $file.new $file
COMMIT_FILES="$COMMIT_FILES $file"
fi
fi
done
for file in $cppdefine_FILES; do
if test -f $file; then
OLD_VERSION=`/bin/cat $file`
/bin/sed -e "s/\(#.*\) [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]/\1 ${CURR_DATE}/" >${file} <<HERE
$OLD_VERSION
HERE
COMMIT_FILES="$COMMIT_FILES $file"
if test -f $file; then
/bin/sed <$file >$file.new -e \
"s/\(#.*\) [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]/\1 ${CURR_DATE}/"
if /usr/bin/cmp -s $file $file.new; then
rm -f $file.new
else
mv -f $file.new $file
COMMIT_FILES="$COMMIT_FILES $file"
fi
fi
done
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Powered by Integricloud