display version and build info at startup (trunk only)

Tested on the unix port; I've updated as many other ports as I can figure
out but they're not tested.  See window.doc for info on the changed banner
lines.  Also adds the ability to override the generic "Unix" port - used now to get
"MacOSX" into the version line instead of "Unix" (so we don't scare people who don't
know what's going on).
This commit is contained in:
keni
2011-10-11 02:37:31 +00:00
parent bd172eb167
commit 4e5e720334
25 changed files with 82 additions and 33 deletions

View File

@@ -1244,7 +1244,7 @@ $(O)termcap.o: $(TTY)termcap.c $(HDEP) $(I)wintty.h $(I)tcap.h
$(O)topl.o: $(TTY)topl.c $(HDEP) $(I)wintty.h $(I)tcap.h
$(O)wintty.o: $(TTY)wintty.c $(HDEP) $(I)wintty.h $(I)tcap.h \
$(I)patchlevel.h
$(I)date.h $(I)patchlevel.h
$(O)amitty.o: $(AMI)amitty.c $(HDEP)

View File

@@ -1583,7 +1583,7 @@ $(O)termcap.o: $(TTY)termcap.c $(HDEP) $(I)wintty.h $(I)tcap.h
$(O)topl.o: $(TTY)topl.c $(HDEP) $(I)wintty.h $(I)tcap.h
$(O)wintty.o: $(TTY)wintty.c $(HDEP) $(I)wintty.h $(I)tcap.h \
$(I)patchlevel.h
$(I)date.h $(I)patchlevel.h
$(O)amitty.o: $(AMI)amitty.c $(HDEP)

View File

@@ -7,6 +7,7 @@
#include "NH:sys/amiga/winext.h"
#include "NH:sys/amiga/winproto.h"
#include "patchlevel.h"
#include "date.h"
extern struct TagItem scrntags[];
@@ -1304,6 +1305,7 @@ amii_init_nhwindows(argcp,argv)
amii_putstr( WIN_BASE, 0, COPYRIGHT_BANNER_A);
amii_putstr( WIN_BASE, 0, COPYRIGHT_BANNER_B);
amii_putstr( WIN_BASE, 0, COPYRIGHT_BANNER_C);
amii_putstr( WIN_BASE, 0, COPYRIGHT_BANNER_D);
amii_putstr( WIN_BASE, 0, "");
Initialized = 1;

View File

@@ -1629,7 +1629,7 @@ $(O)topl.B: $(PCHB) $(WTTY)\topl.c $(HACK_H) $(TERMCAP_H) $(WINTTY_H)
@echo $(BCOPTS2) $(CFLAGUB) >> $(VROOMMCFG)
$(CC) $(FLAGUB) $(COBJNAM)$@ $(WTTY)\topl.c
$(O)wintty.o: $(PCHO) $(CONFIG_H) $(WTTY)\wintty.c $(PATCHLEVEL_H)
$(O)wintty.o: $(PCHO) $(CONFIG_H) $(WTTY)\wintty.c $(PATCHLEVEL_H) $(DATE_H)
@type schema$(SCHEMA).bc | find "$(@B)_o" > $(VROOMMCFG)
@echo $(BCOPTS1) >> $(VROOMMCFG)
@echo $(BCOPTS2) $(CFLAGUO) >> $(VROOMMCFG)

View File

@@ -1068,7 +1068,7 @@ $(O)termcap.o: ../win/tty/termcap.c $(HACK_H) $(INCL)/tcap.h
$(O)topl.o: ../win/tty/topl.c $(HACK_H) $(INCL)/tcap.h
$(CC) $(cflags) -o$@ ../win/tty/topl.c
$(O)wintty.o: ../win/tty/wintty.c $(HACK_H) $(INCL)/dlb.h \
$(PATCHLEV_H) $(INCL)/tcap.h
$(INCL)/date.h $(PATCHLEV_H) $(INCL)/tcap.h
$(CC) $(cflags) -o$@ ../win/tty/wintty.c
$(O)Window.o: ../win/X11/Window.c $(INCL)/xwindowp.h $(INCL)/xwindow.h \
$(CONFIG_H)

View File

@@ -988,7 +988,7 @@ termcap.o: $(WIN)\termcap.c $(HACK_H) $(INCL)\tcap.h
topl.o: $(WIN)\topl.c $(HACK_H) $(INCL)\tcap.h
@$(CC) $(CFLAGS) $(SPECOPTS) /Fo$@ $(WIN)\topl.c
wintty.o: $(WIN)\wintty.c $(HACK_H) $(INCL)\dlb.h \
$(INCL)\patchlev.h $(INCL)\tcap.h
$(INCL)\date.h $(INCL)\patchlev.h $(INCL)\tcap.h
@$(CC) $(CFLAGS) $(SPECOPTS) /Fo$@ $(WIN)\wintty.c
# src dependencies

View File

@@ -1240,7 +1240,7 @@ $(OBJ)\termcap.o : $(WIN)\$(CB) $(HACK_H) $(INCL)\tcap.h
$(WINCC)
$(OBJ)\topl.o : $(WIN)\$(CB) $(HACK_H) $(INCL)\tcap.h
$(WINCC)
$(OBJ)\wintty.o : $(WIN)\$(CB) $(HACK_H) $(INCL)\tcap.h
$(OBJ)\wintty.o : $(WIN)\$(CB) $(HACK_H) $(INCL)\tcap.h $(INCL)\date.h
$(WINCC)
#

View File

@@ -6,6 +6,7 @@
#include "hack.h"
#include "dlb.h"
#include "date.h"
#ifdef SHORT_FILENAMES
#include "patchlev.h"
#else
@@ -278,9 +279,9 @@ char *argv[];
error("Your clock is incorrectly set!");
#endif
if (!dlb_init()) {
pline("%s\n%s\n%s\n\nNetHack was unable to open the required file \"%s\".%s",
pline("%s\n%s\n%s\n%s\n\nNetHack was unable to open the required file \"%s\".%s",
COPYRIGHT_BANNER_A, COPYRIGHT_BANNER_B,
COPYRIGHT_BANNER_C, DLBFILE,
COPYRIGHT_BANNER_C, COPYRIGHT_BANNER_D, DLBFILE,
#ifdef WIN32
"\nAre you perhaps trying to run NetHack within a zip utility?");
#else

View File

@@ -612,7 +612,7 @@ termcap.o: ../win/tty/termcap.c $(HACK_H) ../include/tcap.h
topl.o: ../win/tty/topl.c $(HACK_H) ../include/tcap.h
$(CC) $(CFLAGS) -c ../win/tty/topl.c
wintty.o: ../win/tty/wintty.c $(HACK_H) ../include/dlb.h \
../include/patchlevel.h ../include/tcap.h
../include/date.h ../include/patchlevel.h ../include/tcap.h
$(CC) $(CFLAGS) -c ../win/tty/wintty.c
Window.o: ../win/X11/Window.c ../include/xwindowp.h ../include/xwindow.h \
$(CONFIG_H)

View File

@@ -352,7 +352,7 @@ getline.obj : $(TTY)getline.c $(HACK_H) $(INC)func_tab.h
termcap.obj : $(TTY)termcap.c $(HACK_H) $(INC)tcap.h
topl.obj : $(TTY)topl.c $(HACK_H) $(INC)tcap.h
wintty.obj : $(TTY)wintty.c $(HACK_H) $(INC)dlb.h \
$(INC)patchlevel.h $(INC)tcap.h
$(INC)date.h $(INC)patchlevel.h $(INC)tcap.h
Window.obj : $(X11)Window.c $(INC)xwindowp.h $(INC)xwindow.h $(CONFIG_H)
dialogs.obj : $(X11)dialogs.c $(CONFIG_H)
winX.obj : $(X11)winX.c $(HACK_H) $(INC)winX.h $(INC)dlb.h \

View File

@@ -679,7 +679,7 @@ $(O)termcap.o: ..\win\tty\termcap.c $(HACK_H) $(INCL)\tcap.h
$(O)topl.o: ..\win\tty\topl.c $(HACK_H) $(INCL)\tcap.h
$(CC) $(CFLAGSU) -Fo$@ ..\win\tty\topl.c
$(O)wintty.o: ..\win\tty\wintty.c $(HACK_H) $(INCL)\dlb.h \
$(INCL)\patchlevel.h $(INCL)\tcap.h
$(INCL)\date.h $(INCL)\patchlevel.h $(INCL)\tcap.h
$(CC) $(CFLAGSU) -Fo$@ ..\win\tty\wintty.c
$(O)Window.o: ..\win\X11\Window.c $(INCL)\xwindowp.h $(INCL)\xwindow.h \
$(CONFIG_H)

View File

@@ -11,6 +11,7 @@
#include "mhmsgwnd.h"
#include "mhcmd.h"
#include "mhmap.h"
#include "date.h"
#include "patchlevel.h"
#define MAX_LOADSTRING 100
@@ -996,7 +997,8 @@ LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
NH_A2W(
COPYRIGHT_BANNER_A "\n"
COPYRIGHT_BANNER_B "\n"
COPYRIGHT_BANNER_C,
COPYRIGHT_BANNER_C "\n"
COPYRIGHT_BANNER_D,
wbuf,
NHSTR_BUFSIZE
) );

View File

@@ -1176,7 +1176,7 @@ $(O)termcap.o: ..\win\tty\termcap.c $(HACK_H) $(INCL)\tcap.h
$(O)topl.o: ..\win\tty\topl.c $(HACK_H) $(INCL)\tcap.h
$(cc) $(CFLAGS) -o$@ ..\win\tty\topl.c
$(O)wintty.o: ..\win\tty\wintty.c $(HACK_H) $(INCL)\dlb.h \
$(INCL)\patchlevel.h $(INCL)\tcap.h
$(INCL)\date.h $(INCL)\patchlevel.h $(INCL)\tcap.h
$(cc) $(CFLAGS) -o$@ ..\win\tty\wintty.c
$(O)Window.o: ..\win\X11\Window.c $(INCL)\xwindowp.h $(INCL)\xwindow.h \
$(CONFIG_H)

View File

@@ -1142,7 +1142,7 @@ $(O)termcap.o: ../win/tty/termcap.c $(HACK_H) $(INCL)/tcap.h
$(O)topl.o: ../win/tty/topl.c $(HACK_H) $(INCL)/tcap.h
$(cc) $(CFLAGS) -o$@ ../win/tty/topl.c
$(O)wintty.o: ../win/tty/wintty.c $(HACK_H) $(INCL)/dlb.h \
$(INCL)/patchlevel.h $(INCL)/tcap.h
$(INCL)/date.h $(INCL)/patchlevel.h $(INCL)/tcap.h
$(cc) $(CFLAGS) -o$@ ../win/tty/wintty.c
$(O)Window.o: ../win/X11/Window.c $(INCL)/xwindowp.h $(INCL)/xwindow.h \
$(CONFIG_H)

View File

@@ -1250,7 +1250,7 @@ $(O)termcap.o: ..\win\tty\termcap.c $(HACK_H) $(INCL)\tcap.h
$(O)topl.o: ..\win\tty\topl.c $(HACK_H) $(INCL)\tcap.h
@$(CC) $(cflagsUtil) -Fo$@ ..\win\tty\topl.c
$(O)wintty.o: ..\win\tty\wintty.c $(HACK_H) $(INCL)\dlb.h \
$(INCL)\patchlevel.h $(INCL)\tcap.h
$(INCL)\date.h $(INCL)\patchlevel.h $(INCL)\tcap.h
@$(CC) $(cflagsUtil) -Fo$@ ..\win\tty\wintty.c
$(O)Window.o: ..\win\X11\Window.c $(INCL)\xwindowp.h $(INCL)\xwindow.h \
$(CONFIG_H)