|
From: Enrico B. <enr...@us...> - 2002-03-09 16:58:12
|
Update of /cvsroot/winbash/winbash In directory usw-pr-cvs1:/tmp/cvs-serv26871 Modified Files: .build .distribution .machine Makefile newversion.c version.h Log Message: applied newversion.exe changes to create build/release versions Index: .build =================================================================== RCS file: /cvsroot/winbash/winbash/.build,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .build 9 Mar 2002 04:43:15 -0000 1.2 +++ .build 9 Mar 2002 16:58:09 -0000 1.3 @@ -1 +1 @@ -7 +10 Index: .distribution =================================================================== RCS file: /cvsroot/winbash/winbash/.distribution,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- .distribution 9 Mar 2002 03:39:12 -0000 1.1.1.1 +++ .distribution 9 Mar 2002 16:58:09 -0000 1.2 @@ -1 +1 @@ -1.14 +1.14 Index: .machine =================================================================== RCS file: /cvsroot/winbash/winbash/.machine,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .machine 9 Mar 2002 04:43:15 -0000 1.2 +++ .machine 9 Mar 2002 16:58:09 -0000 1.3 @@ -1 +1,2 @@ -bash last made for a i386 running NT + + last made for a i386 running Windows_NT \ No newline at end of file Index: Makefile =================================================================== RCS file: /cvsroot/winbash/winbash/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 9 Mar 2002 04:17:14 -0000 1.3 +++ Makefile 9 Mar 2002 16:58:09 -0000 1.4 @@ -4,8 +4,9 @@ # by default creates a debuggable version of bash.exe (sh.exe) # type 'make RELEASE=1' if you do not want debugging info in the exe # +srcdir = . HERE=$(shell pwd) - +CC = cl.exe -nologo DEFS = -nologo -DMAINTAINER="\"no...@wi...\"" DEFS += -DHOSTTYPE="i386" -DOSTYPE="NT" -DWIN32 -D_CONSOLE DEFS += -DProgram=bash -DINITIALIZE_SIGLIST -DHAVE_VFPRINTF -DHAVE_UNISTD_H @@ -23,6 +24,8 @@ CPPFLAGS += $(DEFS) CFLAGS = -MT -W2 +Machine=i386 + LDFLAGS += -nologo -incremental:no -subsystem:console -machine:IX86 @@ -180,9 +183,29 @@ builtins/builtins.lib: $(BUILTIN_DEFS) cd builtins ; $(MAKE) +newversion.exe: newversion.c + $(CC) $(CPPFLAGS) $(CPPDEFS) $(CFLAGS) -o $@ $< + clean: $(RM) $(BASH-OBJS) y.tab.c y.tab.h bash.exe sh.exe bash.pdb cd builtins ; $(MAKE) clean + +.distribution: + ./newversion.exe -dir $(srcdir) -dist `./bash.exe -c 'echo $$BASH_VERSION'` + +.build: $(SOURCES) newversion.exe + if ./newversion.exe -dir $(srcdir) -build; then mv -f newversion.h version.h; fi + @echo + @echo " ***************************************************" + @echo " * *" + @echo " * Making Bash-`cat $(srcdir)/.distribution`.`cat $(srcdir)/.patchlevel` for a $(Machine) running $(OS)" + @echo " * *" + @echo " ***************************************************" + @echo + @echo "$(Program) last made for a $(Machine) running $(OS)" >.machine + +version.h: newversion.exe + if ./newversion.exe -dir $(srcdir) -build; then mv -f newversion.h version.h; fi y.tab.c: parse.y cd bison && $(HERE)/bison/bison.exe -d -o ../$@ ../$< Index: newversion.c =================================================================== RCS file: /cvsroot/winbash/winbash/newversion.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- newversion.c 9 Mar 2002 16:05:42 -0000 1.2 +++ newversion.c 9 Mar 2002 16:58:09 -0000 1.3 @@ -20,6 +20,8 @@ with Bash; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +#define FOPEN(name, mode) fopen(name, mode); + #include <sys/types.h> #include "posixstat.h" #include <stdio.h> Index: version.h =================================================================== RCS file: /cvsroot/winbash/winbash/version.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- version.h 9 Mar 2002 03:39:12 -0000 1.1.1.1 +++ version.h 9 Mar 2002 16:58:09 -0000 1.2 @@ -1,16 +1,16 @@ -/* Version control for the shell. This file gets changed when you say - `make newversion' to the Makefile. It is created by newversion.aux. */ - -/* The distribution version number of this shell. */ -#define DISTVERSION "1.14" - -/* The patch level of this version of the shell. */ -#define PATCHLEVEL 2 - -/* The last built version of this shell. */ -#define BUILDVERSION 14 - -/* A version string for use by sccs and the what command. */ - -#define SCCSVERSION "@(#)Bash version 1.14.2(14) GNU" - +/* Version control for the shell. This file gets changed when you say + `make newversion' to the Makefile. It is created by newversion.aux. */ + +/* The distribution version number of this shell. */ +#define DISTVERSION "1.14" + +/* The patch level of this version of the shell. */ +#define PATCHLEVEL 3 + +/* The last built version of this shell. */ +#define BUILDVERSION 10 + +/* A version string for use by sccs and the what command. */ + +#define SCCSVERSION "@(#)Bash version 1.14.3(10) GNU" + |
