From d8e84ada12b2fee286f9b1cafdfde888111760c7 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Tue, 22 Jul 2003 02:19:51 +0000 Subject: [PATCH] Remove version.h and all references to its bindings. Instead use PACKAGE_* variables provided by autoconf. --- v7/src/microcode/boot.c | 18 +++++------- v7/src/microcode/confshared.h | 5 +--- v7/src/microcode/ntutl/config.h | 19 ++++++++++-- v7/src/microcode/ntutl/makefile | 16 +++++------ v7/src/microcode/ntutl/makefile.wcc | 16 +++++------ v7/src/microcode/ntutl/ntgui.rc | 16 ++++------- v7/src/microcode/os2pmcon.c | 11 ++----- v7/src/microcode/os2utl/config.h | 19 ++++++++++-- v7/src/microcode/os2utl/makefile.cmn | 12 ++++---- v7/src/microcode/version.h | 43 ---------------------------- 10 files changed, 73 insertions(+), 102 deletions(-) delete mode 100644 v7/src/microcode/version.h diff --git a/v7/src/microcode/boot.c b/v7/src/microcode/boot.c index 402acabf3..491e37118 100644 --- a/v7/src/microcode/boot.c +++ b/v7/src/microcode/boot.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Id: boot.c,v 9.115 2003/03/21 17:28:21 cph Exp $ +$Id: boot.c,v 9.116 2003/07/22 02:19:51 cph Exp $ Copyright 1986,1987,1988,1989,1990,1991 Massachusetts Institute of Technology Copyright 1992,1993,1994,1995,1996,1997 Massachusetts Institute of Technology @@ -29,7 +29,6 @@ USA. #include "scheme.h" #include "prims.h" -#include "version.h" #include "option.h" #ifndef islower #include @@ -140,8 +139,7 @@ DEFUN (main_name, (argc, argv), compiler_reset (compiler_utilities); if (!option_band_specified) { - outf_console ("Scheme Microcode Version %d.%d\n", - SCHEME_VERSION, SCHEME_SUBVERSION); + outf_console ("Scheme Microcode Version %s\n", PACKAGE_VERSION); OS_initialize (); Enter_Interpreter (); } @@ -595,16 +593,14 @@ DEFUN (stack_death, (name), CONST char * name) DEFINE_PRIMITIVE ("MICROCODE-IDENTIFY", Prim_microcode_identify, 0, 0, 0) { - fast SCHEME_OBJECT Result; + SCHEME_OBJECT Result; PRIMITIVE_HEADER (0); Result = (make_vector (IDENTITY_LENGTH, SHARP_F, true)); + FAST_VECTOR_SET (Result, ID_RELEASE, SHARP_F); FAST_VECTOR_SET - (Result, ID_RELEASE, - (char_pointer_to_string ((unsigned char *) SCHEME_RELEASE))); - FAST_VECTOR_SET - (Result, ID_MICRO_VERSION, (LONG_TO_UNSIGNED_FIXNUM (SCHEME_VERSION))); - FAST_VECTOR_SET - (Result, ID_MICRO_MOD, (LONG_TO_UNSIGNED_FIXNUM (SCHEME_SUBVERSION))); + (Result, ID_MICRO_VERSION, + (char_pointer_to_string ((unsigned char *) PACKAGE_VERSION))); + FAST_VECTOR_SET (Result, ID_MICRO_MOD, SHARP_F); FAST_VECTOR_SET (Result, ID_PRINTER_WIDTH, (LONG_TO_UNSIGNED_FIXNUM (OS_tty_x_size ()))); FAST_VECTOR_SET diff --git a/v7/src/microcode/confshared.h b/v7/src/microcode/confshared.h index 3d1d04f64..df2c1aa8d 100644 --- a/v7/src/microcode/confshared.h +++ b/v7/src/microcode/confshared.h @@ -1,6 +1,6 @@ /* -*-C-*- -$Id: confshared.h,v 11.6 2003/05/17 02:21:13 cph Exp $ +$Id: confshared.h,v 11.7 2003/07/22 02:19:51 cph Exp $ Copyright 2000,2002,2003 Massachusetts Institute of Technology @@ -212,8 +212,6 @@ typedef unsigned long SCHEME_OBJECT; #define ADDRESS_TO_DATUM(address) \ ((SCHEME_OBJECT) (((unsigned long) (address)) & (~(HPPA_QUAD_MASK)))) -#if (SCHEME_VERSION > 11) - /* SHARP_F is a magic value: Typecode TC_CONSTANT, high datum bits #b100, low datum bits are the top TYPE_CODE_LENGTH bits of HPPA_QUAD_BIT @@ -226,7 +224,6 @@ typedef unsigned long SCHEME_OBJECT; See also cmpauxmd/hppa.m4. */ #define SHARP_F 0x22000010 -#endif /* (SCHEME_VERSION > 11) */ #endif /* hp9000s800 */ diff --git a/v7/src/microcode/ntutl/config.h b/v7/src/microcode/ntutl/config.h index 7fcc90d5e..4ab9c49aa 100644 --- a/v7/src/microcode/ntutl/config.h +++ b/v7/src/microcode/ntutl/config.h @@ -1,8 +1,8 @@ /* -*-C-*- -$Id: config.h,v 1.6 2003/02/14 18:28:31 cph Exp $ +$Id: config.h,v 1.7 2003/07/22 02:19:51 cph Exp $ -Copyright (c) 2000-2001 Massachusetts Institute of Technology +Copyright 2000,2001,2003 Massachusetts Institute of Technology This file is part of MIT/GNU Scheme. @@ -84,6 +84,21 @@ typedef long ssize_t; /* Define if you have the header file. */ #define HAVE_MD5_H 1 +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "bug-mit-scheme@gnu.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "MIT/GNU Scheme" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "MIT/GNU Scheme 14.11" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "mit-scheme" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "14.11" + /* Include the shared configuration header. */ #include "confshared.h" diff --git a/v7/src/microcode/ntutl/makefile b/v7/src/microcode/ntutl/makefile index e2e1a25aa..81e53ded9 100644 --- a/v7/src/microcode/ntutl/makefile +++ b/v7/src/microcode/ntutl/makefile @@ -1,8 +1,9 @@ ### -*- Fundamental -*- ### -### $Id: makefile,v 1.30 2003/02/14 18:28:31 cph Exp $ +### $Id: makefile,v 1.31 2003/07/22 02:19:51 cph Exp $ ### -### Copyright (c) 1992-2001 Massachusetts Institute of Technology +### Copyright 1993,1994,1995,1996 Massachusetts Institute of Technology +### Copyright 1998,1999,2001,2003 Massachusetts Institute of Technology ### ### This file is part of MIT/GNU Scheme. ### @@ -25,9 +26,9 @@ #### Makefile for Scheme under Win32 compiled by Microsoft Visual C++. !include -#USER_PRIM_SOURCES = prbfish.c prgdbm.c prmd5.c -#USER_PRIM_OBJECTS = prbfish.obj prgdbm.obj prmd5.obj -#USER_LIBS = blowfish.lib gdbm.lib md5.lib +#USER_PRIM_SOURCES = prbfish.c prgdbm.c prmd5.c prpgsql.c +#USER_PRIM_OBJECTS = prbfish.obj prgdbm.obj prmd5.obj prpgsql.obj +#USER_LIBS = blowfish.lib gdbm.lib md5.lib pq.lib # **** Microsoft supplies their assembler as a separate product, and # **** we don't currently have a copy, so use the Watcom assembler. @@ -420,7 +421,6 @@ TRAP_H = trap.h TYPES_H = types.h USRDEF_H = usrdef.h $(SCHEME_H) $(PRIMS_H) UXSOCK_H = uxsock.h $(OSIO_H) -VERSION_H = version.h WINDER_H = winder.h ZONES_H = zones.h @@ -445,8 +445,7 @@ avltree.obj: avltree.c $(AVLTREE_H) bignum.obj: bignum.c $(SCHEME_H) $(BIGNMINT_H) $(LIMITS_H) bigprm.obj: bigprm.c $(SCHEME_H) $(PRIMS_H) $(ZONES_H) bitstr.obj: bitstr.c $(SCHEME_H) $(PRIMS_H) $(BITSTR_H) -boot.obj: boot.c $(SCHEME_H) $(PRIMS_H) $(VERSION_H) $(OPTION_H) $(OSTOP_H) \ - $(OSTTY_H) +boot.obj: boot.c $(SCHEME_H) $(PRIMS_H) $(OPTION_H) $(OSTOP_H) $(OSTTY_H) char.obj: char.c $(SCHEME_H) $(PRIMS_H) cmpauxmd.obj: cmpauxmd.asm cmpint.obj: cmpint.c $(CONFIG_H) $(DSTACK_H) $(OUTF_H) $(TYPES_H) $(CONST_H) \ @@ -505,6 +504,7 @@ wind.obj: wind.c $(OBSTACK_H) $(DSTACK_H) $(OUTF_H) prbfish.obj: prbfish.c $(SCHEME_H) $(PRIMS_H) prgdbm.obj: prgdbm.c $(SCHEME_H) $(PRIMS_H) $(OS_H) prmd5.obj: prmd5.c $(SCHEME_H) $(PRIMS_H) +prpgsql.obj: prpgsql.c $(SCHEME_H) $(PRIMS_H) $(USRDEF_H) $(OS_H) prosenv.obj: prosenv.c $(SCHEME_H) $(PRIMS_H) $(OSENV_H) $(OSTOP_H) $(LIMITS_H) prosfile.obj: prosfile.c $(SCHEME_H) $(PRIMS_H) $(OSFILE_H) prosfs.obj: prosfs.c $(SCHEME_H) $(PRIMS_H) $(OSFILE_H) $(OSFS_H) $(OSIO_H) diff --git a/v7/src/microcode/ntutl/makefile.wcc b/v7/src/microcode/ntutl/makefile.wcc index b136f67cb..36053d356 100644 --- a/v7/src/microcode/ntutl/makefile.wcc +++ b/v7/src/microcode/ntutl/makefile.wcc @@ -1,8 +1,9 @@ ### -*- Fundamental -*- ### -### $Id: makefile.wcc,v 1.19 2003/02/14 18:28:31 cph Exp $ +### $Id: makefile.wcc,v 1.20 2003/07/22 02:19:51 cph Exp $ ### -### Copyright (c) 1992-2001 Massachusetts Institute of Technology +### Copyright 1995,1996,1997,1999 Massachusetts Institute of Technology +### Copyright 2000,2001,2003 Massachusetts Institute of Technology ### ### This file is part of MIT/GNU Scheme. ### @@ -25,9 +26,9 @@ #### Makefile for Scheme under Win32 compiled by Watcom C/C++ ### This makefile is meant to be used with Watcom make. -#USER_PRIM_SOURCES = prbfish.c prgdbm.c prmd5.c -#USER_PRIM_OBJECTS = prbfish.obj prgdbm.obj prmd5.obj -#USER_LIBS = library blowfish.lib,gdbm.lib,md5.lib +#USER_PRIM_SOURCES = prbfish.c prgdbm.c prmd5.c prpgsql.c +#USER_PRIM_OBJECTS = prbfish.obj prgdbm.obj prmd5.obj prpgsql.obj +#USER_LIBS = library blowfish.lib,gdbm.lib,md5.lib,pq.lib CC = wcc386 M4 = m4 @@ -478,7 +479,6 @@ TRAP_H = trap.h TYPES_H = types.h USRDEF_H = usrdef.h $(SCHEME_H) $(PRIMS_H) UXSOCK_H = uxsock.h $(OSIO_H) -VERSION_H = version.h WINDER_H = winder.h ZONES_H = zones.h @@ -503,8 +503,7 @@ avltree.obj: avltree.c $(AVLTREE_H) bignum.obj: bignum.c $(SCHEME_H) $(BIGNMINT_H) $(LIMITS_H) bigprm.obj: bigprm.c $(SCHEME_H) $(PRIMS_H) $(ZONES_H) bitstr.obj: bitstr.c $(SCHEME_H) $(PRIMS_H) $(BITSTR_H) -boot.obj: boot.c $(SCHEME_H) $(PRIMS_H) $(VERSION_H) $(OPTION_H) $(OSTOP_H) & - $(OSTTY_H) +boot.obj: boot.c $(SCHEME_H) $(PRIMS_H) $(OPTION_H) $(OSTOP_H) $(OSTTY_H) char.obj: char.c $(SCHEME_H) $(PRIMS_H) cmpauxmd.obj: cmpauxmd.asm cmpint.obj: cmpint.c $(CONFIG_H) $(DSTACK_H) $(OUTF_H) $(TYPES_H) $(CONST_H) & @@ -563,6 +562,7 @@ wind.obj: wind.c $(OBSTACK_H) $(DSTACK_H) $(OUTF_H) prbfish.obj: prbfish.c $(SCHEME_H) $(PRIMS_H) prgdbm.obj: prgdbm.c $(SCHEME_H) $(PRIMS_H) $(OS_H) prmd5.obj: prmd5.c $(SCHEME_H) $(PRIMS_H) +prpgsql.obj: prpgsql.c $(SCHEME_H) $(PRIMS_H) $(USRDEF_H) $(OS_H) prosenv.obj: prosenv.c $(SCHEME_H) $(PRIMS_H) $(OSENV_H) $(OSTOP_H) $(LIMITS_H) prosfile.obj: prosfile.c $(SCHEME_H) $(PRIMS_H) $(OSFILE_H) prosfs.obj: prosfs.c $(SCHEME_H) $(PRIMS_H) $(OSFILE_H) $(OSFS_H) $(OSIO_H) diff --git a/v7/src/microcode/ntutl/ntgui.rc b/v7/src/microcode/ntutl/ntgui.rc index a2ee73e19..f59984db5 100644 --- a/v7/src/microcode/ntutl/ntgui.rc +++ b/v7/src/microcode/ntutl/ntgui.rc @@ -1,7 +1,6 @@ #include "windows.h" #include "ntgui.h" #include "ntdialog.h" -#include "version.h" SHIELD3_ICON ICON shield3.ico SHIELD4_ICON ICON shield4.ico @@ -22,12 +21,9 @@ BCH_ICO ICON bch.ico GC_CURSOR CURSOR gc.cur -#define MAKEFILEVERSIONSTRINGHELPER(a,b,c) #a b #c -#define MAKEFILEVERSIONSTRING(v,s) MAKEFILEVERSIONSTRINGHELPER(##v,".",##s) - 1 VERSIONINFO FILEVERSION 0,0,0,65 - PRODUCTVERSION 7,2,0,65 + PRODUCTVERSION 7,8,0,65 FILEOS VOS__WINDOWS32 FILETYPE VFT_APP BEGIN @@ -35,14 +31,14 @@ BEGIN BEGIN BLOCK "040904E4" BEGIN - VALUE "CompanyName", "Artifical Intelligence Lab, MIT" + VALUE "CompanyName", "GNU Project" VALUE "FileDescription", "MIT/GNU Scheme Microcode" - VALUE "FileVersion", MAKEFILEVERSIONSTRING(SCHEME_VERSION,SCHEME_SUBVERSION) + VALUE "FileVersion", PACKAGE_VERSION VALUE "InternalName", "SCHEME" - VALUE "LegalCopyright", "Copyright Massachusetts Institute of Technology 1993-2000" + VALUE "LegalCopyright", "Copyright Massachusetts Institute of Technology 1993-2003" VALUE "OriginalFilename", "SCHEME.EXE" - VALUE "ProductName", "MIT/GNU Scheme" - VALUE "ProductVersion", SCHEME_RELEASE + VALUE "ProductName", PACKAGE_NAME + VALUE "ProductVersion", PACKAGE_VERSION END END diff --git a/v7/src/microcode/os2pmcon.c b/v7/src/microcode/os2pmcon.c index 336cbfa92..3c1de8e51 100644 --- a/v7/src/microcode/os2pmcon.c +++ b/v7/src/microcode/os2pmcon.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Id: os2pmcon.c,v 1.30 2003/04/08 04:31:32 cph Exp $ +$Id: os2pmcon.c,v 1.31 2003/07/22 02:19:51 cph Exp $ Copyright 1994-2000 Massachusetts Institute of Technology @@ -27,9 +27,6 @@ USA. #include "os2.h" #include "os2pmcon.h" -/* For the "about" dialog box. */ -#include "version.h" - /* #define CONSOLE_WRAP */ static void grab_console_lock (void); @@ -428,10 +425,8 @@ process_events (int blockp) (void) WinMessageBox (HWND_DESKTOP, NULLHANDLE, - ("This is MIT/GNU Scheme Release " - SCHEME_RELEASE - ", the Uncommon Lisp"), - "MIT/GNU Scheme", + ("This is " PACKAGE_STRING), + PACKAGE_VERSION, 0, MB_OK); break; diff --git a/v7/src/microcode/os2utl/config.h b/v7/src/microcode/os2utl/config.h index 2da014525..f3f98568d 100644 --- a/v7/src/microcode/os2utl/config.h +++ b/v7/src/microcode/os2utl/config.h @@ -1,8 +1,8 @@ /* -*-C-*- -$Id: config.h,v 1.6 2003/02/14 18:28:31 cph Exp $ +$Id: config.h,v 1.7 2003/07/22 02:19:51 cph Exp $ -Copyright (c) 2000-2002 Massachusetts Institute of Technology +Copyright 2000,2001,2002,2003 Massachusetts Institute of Technology This file is part of MIT/GNU Scheme. @@ -80,6 +80,21 @@ typedef unsigned char cc_t; /* Define if you have the header file. */ #define HAVE_MD5_H 1 +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "bug-mit-scheme@gnu.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "MIT/GNU Scheme" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "MIT/GNU Scheme 14.11" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "mit-scheme" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "14.11" + /* Include the shared configuration header. */ #include "confshared.h" diff --git a/v7/src/microcode/os2utl/makefile.cmn b/v7/src/microcode/os2utl/makefile.cmn index 0a2cd497b..e49d2274c 100644 --- a/v7/src/microcode/os2utl/makefile.cmn +++ b/v7/src/microcode/os2utl/makefile.cmn @@ -1,8 +1,9 @@ ### -*- Fundamental -*- ### -### $Id: makefile.cmn,v 1.15 2003/02/14 18:28:31 cph Exp $ +### $Id: makefile.cmn,v 1.16 2003/07/22 02:19:51 cph Exp $ ### -### Copyright (c) 1994-2000 Massachusetts Institute of Technology +### Copyright 1995,1996,1997,1999,2000 Massachusetts Institute of Technology +### Copyright 2003 Massachusetts Institute of Technology ### ### This file is part of MIT/GNU Scheme. ### @@ -356,7 +357,6 @@ TRAP_H = trap.h TYPES_H = types.h USRDEF_H = usrdef.h $(SCHEME_H) $(PRIMS_H) UXSOCK_H = uxsock.h $(OSIO_H) -VERSION_H = version.h WINDER_H = winder.h ZONES_H = zones.h @@ -382,8 +382,7 @@ avltree.$(OBJ): avltree.c $(AVLTREE_H) bignum.$(OBJ): bignum.c $(SCHEME_H) $(BIGNMINT_H) $(LIMITS_H) bigprm.$(OBJ): bigprm.c $(SCHEME_H) $(PRIMS_H) $(ZONES_H) bitstr.$(OBJ): bitstr.c $(SCHEME_H) $(PRIMS_H) $(BITSTR_H) -boot.$(OBJ): boot.c $(SCHEME_H) $(PRIMS_H) $(VERSION_H) $(OPTION_H) \ - $(OSTOP_H) $(OSTTY_H) +boot.$(OBJ): boot.c $(SCHEME_H) $(PRIMS_H) $(OPTION_H) $(OSTOP_H) $(OSTTY_H) char.$(OBJ): char.c $(SCHEME_H) $(PRIMS_H) cmpauxmd.$(OBJ): cmpauxmd.$(ASM) cmpauxmd.$(ASM): cmpauxmd.m4 @@ -444,6 +443,7 @@ wind.$(OBJ): wind.c $(OBSTACK_H) $(DSTACK_H) $(OUTF_H) prbfish.$(OBJ): prbfish.c $(SCHEME_H) $(PRIMS_H) prgdbm.$(OBJ): prgdbm.c $(SCHEME_H) $(PRIMS_H) $(OS_H) prmd5.$(OBJ): prmd5.c $(SCHEME_H) $(PRIMS_H) +prpgsql.$(OBJ): prpgsql.c $(SCHEME_H) $(PRIMS_H) $(USRDEF_H) $(OS_H) prosenv.$(OBJ): prosenv.c $(SCHEME_H) $(PRIMS_H) $(OSENV_H) $(OSTOP_H) \ $(LIMITS_H) prosfile.$(OBJ): prosfile.c $(SCHEME_H) $(PRIMS_H) $(OSFILE_H) @@ -485,7 +485,7 @@ os2io.$(OBJ): os2io.c $(OS2_H) os2msg.$(OBJ): os2msg.c $(OS2_H) os2pipe.$(OBJ): os2pipe.c $(OS2_H) os2pm.$(OBJ): os2pm.c $(OS2_H) os2pm-id.h os2pm-mi.h os2pm-dc.h os2pm-rp.h -os2pmcon.$(OBJ): os2pmcon.c $(OS2_H) $(OS2PMCON_H) $(VERSION_H) +os2pmcon.$(OBJ): os2pmcon.c $(OS2_H) $(OS2PMCON_H) os2proc.$(OBJ): os2proc.c $(OS2_H) $(OSPROC_H) $(OSENV_H) os2sock.$(OBJ): os2sock.c $(SCHEME_H) $(PRIMS_H) $(OSSCHEME_H) $(OS2_H) \ $(UXSOCK_H) diff --git a/v7/src/microcode/version.h b/v7/src/microcode/version.h deleted file mode 100644 index 21ce7ff7c..000000000 --- a/v7/src/microcode/version.h +++ /dev/null @@ -1,43 +0,0 @@ -/* -*-C-*- - -$Id: version.h,v 11.189 2003/04/25 03:57:00 cph Exp $ - -Copyright 1986,1987,1988,1989,1990,1991 Massachusetts Institute of Technology -Copyright 1993,1994,1995,1996,1997,1999 Massachusetts Institute of Technology -Copyright 2000,2001,2002,2003 Massachusetts Institute of Technology - -This file is part of MIT/GNU Scheme. - -MIT/GNU Scheme is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at -your option) any later version. - -MIT/GNU Scheme is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -USA. - -*/ - -/* This file contains version information for the microcode. */ - -/* Scheme system release version */ - -#ifndef SCHEME_RELEASE -# define SCHEME_RELEASE "7.8.0" -#endif - -/* Microcode release version */ - -#ifndef SCHEME_VERSION -# define SCHEME_VERSION 14 -#endif -#ifndef SCHEME_SUBVERSION -# define SCHEME_SUBVERSION 11 -#endif -- 2.25.1