From cf9cf038f3fdefc4dc54a27c189dd46d47b82dd7 Mon Sep 17 00:00:00 2001 From: keni Date: Fri, 9 Feb 2018 11:48:04 -0500 Subject: [PATCH] gitinfo.pl: special case code to allow running it from $TOP or DEVEL without installing the hooks first NHgithook.pm: add some warnings if nhversioning can't open files make sure nhversioning fails before opening gitinfo.txt if it can't get valid data --- DEVEL/gitinfo.pl | 7 +++++++ DEVEL/hooksdir/.NHgithook.pm.swp | Bin 16384 -> 0 bytes DEVEL/hooksdir/NHgithook.pm | 7 ++++++- src/allmain.c | 5 +++-- src/version.c | 4 +++- sys/unix/hints/macosx.sh | 2 +- 6 files changed, 20 insertions(+), 5 deletions(-) delete mode 100644 DEVEL/hooksdir/.NHgithook.pm.swp diff --git a/DEVEL/gitinfo.pl b/DEVEL/gitinfo.pl index b62428975..d62f1a588 100644 --- a/DEVEL/gitinfo.pl +++ b/DEVEL/gitinfo.pl @@ -20,6 +20,13 @@ BEGIN { $gitdir = `git rev-parse --git-dir`; chomp $gitdir; push(@INC, $gitdir.$PDS."hooks"); + + # special case for this script only: allow + # it to run from DEVEL or $TOP + if (-f "hooksdir/NHgithook.pm" || -f "DEVEL/hooksdir/NHgithook.pm"){ + push(@INC, "DEVEL/hooksdir"); + } + chdir("..") if (-f "hooksdir/NHgithook.pm"); } use NHgithook; diff --git a/DEVEL/hooksdir/.NHgithook.pm.swp b/DEVEL/hooksdir/.NHgithook.pm.swp deleted file mode 100644 index 19e7ec87309c69aa584791723a272d5c995f868d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 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 Id21;C1L-bjZU6uP diff --git a/DEVEL/hooksdir/NHgithook.pm b/DEVEL/hooksdir/NHgithook.pm index 1bb92cf7e..0d586cfb7 100644 --- a/DEVEL/hooksdir/NHgithook.pm +++ b/DEVEL/hooksdir/NHgithook.pm @@ -1,7 +1,7 @@ # # NHgithook.pm # NetHack Git Hook Module -# $NHDT-Date$ +# $NHDT-Date: 1519164205 2018/02/20 22:03:25 $ package NHgithook; use Cwd; @@ -72,6 +72,7 @@ sub nhversioning { $git_sha =~ s/\s+//g; my $git_branch = `git rev-parse --abbrev-ref HEAD`; $git_branch =~ s/\s+//g; + die "git rev-parse failed" unless(length $git_sha and length $git_branch); if (open my $fh, '<', 'dat/gitinfo.txt') { while(my $line = <$fh>) { @@ -82,11 +83,15 @@ sub nhversioning { } } close $fh; + } else { + print "WARNING: Can't find dat directory\n" unless(-d "dat"); } if (open my $fh, '>', 'dat/gitinfo.txt') { print $fh 'githash='.$git_sha."\n"; print $fh 'gitbranch='.$git_branch."\n"; print "An updated dat/gitinfo.txt was written, githash=".$git_sha."\n"; + } else { + print "WARNING: Unable to open dat/gitinfo.txt: $!\n"; } } diff --git a/src/allmain.c b/src/allmain.c index 789c5d48f..eab1fce3d 100644 --- a/src/allmain.c +++ b/src/allmain.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 allmain.c $NHDT-Date: 1513130016 2017/12/13 01:53:36 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.81 $ */ +/* NetHack 3.6 allmain.c $NHDT-Date: 1518193644 2018/02/09 16:27:24 $ $NHDT-Branch: githash $:$NHDT-Revision: 1.86 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -763,7 +763,8 @@ enum earlyarg e_arg; { int i, idx; boolean match = FALSE; - char *userea = (char *)0, *dashdash = ""; + char *userea = (char *)0; + const char *dashdash = ""; for (idx = 0; idx < SIZE(earlyopts); idx++) { if (earlyopts[idx].e == e_arg) diff --git a/src/version.c b/src/version.c index 514665663..30e4ce75f 100644 --- a/src/version.c +++ b/src/version.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 version.c $NHDT-Date: 1517140532 2018/01/28 11:55:32 $ $NHDT-Branch: nhmall-githash3 $:$NHDT-Revision: 1.50 $ */ +/* NetHack 3.6 version.c $NHDT-Date: 1519155525 2018/02/20 19:38:45 $ $NHDT-Branch: githash $:$NHDT-Revision: 1.47 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -46,7 +46,9 @@ char *buf; #endif if (details) { +#if defined(RUNTIME_PORT_ID) || defined(NETHACK_GIT_SHA) || defined(NETHACK_GIT_BRANCH) int c = 0; +#endif #if defined(RUNTIME_PORT_ID) char tmpbuf[BUFSZ]; char *tmp = (char *)0; diff --git a/sys/unix/hints/macosx.sh b/sys/unix/hints/macosx.sh index 93e28ca51..c6cf10c31 100755 --- a/sys/unix/hints/macosx.sh +++ b/sys/unix/hints/macosx.sh @@ -1,5 +1,5 @@ #!/bin/sh -# NetHack 3.6 macosx.sh $NHDT-Date: 1518800856 2018/02/16 17:07:36 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.19 $ +# NetHack 3.6 macosx.sh $NHDT-Date: 1517231957 2018/01/29 13:19:17 $ $NHDT-Branch: githash $:$NHDT-Revision: 1.20 $ # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007. # NetHack may be freely redistributed. See license for details. # -- 2.50.1