diff --git a/util/mdgrep.h b/util/mdgrep.h index deb917e11..335f018b1 100644 --- a/util/mdgrep.h +++ b/util/mdgrep.h @@ -1,11 +1,12 @@ /* - * NetHack 3.7 mdgrep.h $NHDT-Date: 1693083351 2023/08/26 20:55:51 $ $NHDT-Branch: keni-crashweb2 $:$NHDT-Revision: 1.24 $ + * NetHack 3.7 mdgrep.h $NHDT-Date: 1710949914 2024/03/20 15:51:54 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.20 $ * Copyright (c) Kenneth Lorber, Kensington, Maryland, 2008 * NetHack may be freely redistributed. See license for details. * * This file generated by mdgrep.pl version 1.24. * DO NOT EDIT! Your changes will be lost. */ + static struct grep_var grep_vars[]={ {"0", 0}, {"1", 1}, @@ -29,11 +30,6 @@ static struct grep_var grep_vars[]={ #else {"ASCIIGRAPH", 0}, #endif -#if defined(BETA) - {"BETA", 1}, -#else - {"BETA", 0}, -#endif #if defined(BSD_JOB_CONTROL) {"BSD_JOB_CONTROL", 1}, #else @@ -275,6 +271,22 @@ static struct grep_var grep_vars[]={ {"__BEOS__", 1}, #else {"__BEOS__", 0}, +#endif + {"NH_DEVEL_STATUS", NH_DEVEL_STATUS}, +#if (NH_DEVEL_STATUS == NH_STATUS_RELEASED) + {"DSNH_STATUS_RELEASED", 1}, +#else + {"DSNH_STATUS_RELEASED", 0}, +#endif +#if (NH_DEVEL_STATUS == NH_STATUS_WIP) + {"DSNH_STATUS_WIP", 1}, +#else + {"DSNH_STATUS_WIP", 0}, +#endif +#if (NH_DEVEL_STATUS == NH_STATUS_BETA) + {"DSNH_STATUS_BETA", 1}, +#else + {"DSNH_STATUS_BETA", 0}, #endif {0,0} }; diff --git a/util/mdgrep.pl b/util/mdgrep.pl index 3e71300c9..785a2c185 100644 --- a/util/mdgrep.pl +++ b/util/mdgrep.pl @@ -1,5 +1,5 @@ #!perl -# NetHack 3.7 mdgrep.pl $NHDT-Date: 1693083351 2023/08/26 20:55:51 $ $NHDT-Branch: keni-crashweb2 $:$NHDT-Revision: 1.24 $ +# NetHack 3.7 mdgrep.pl $NHDT-Date: 1710949914 2024/03/20 15:51:54 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.26 $ # Copyright (c) Kenneth Lorber, Kensington, Maryland # NetHack may be freely redistributed. See license for details. @@ -27,12 +27,17 @@ /; # Miscellaneous -@misc = qw/BETA CROSSCOMPILE/; +@misc = qw/CROSSCOMPILE/; # Meta @meta = qw/ALLDOCS/; # convention: use --grep-define ALLDOCS to notate # items that are conditionally available +# Special mappings (if key == value, define prefix_value, prefix is [0]) +$specials = { + NH_DEVEL_STATUS => [qw/DS NH_STATUS_RELEASED NH_STATUS_WIP NH_STATUS_BETA/] +}; + # JUNK: # MICRO BSD __GNUC__ NHSTDC TERMLIB __linux__ LINUX WIN32CON NO_TERMS # ULTRIX_PROTO TERMINFO _DCC DISPMAP OPT_DISPMAP TARGET_API_MAC_CARBON @@ -54,10 +59,10 @@ $outfile = "mdgrep.h"; sub start_file { - ($rev) = ('$NHDT-Revision: 1.24 $') =~ m/: (.*) .$/; - my $date = '$NHDT-Date: 1693083351 2023/08/26 20:55:51 $'; - my $branch = '$NHDT-Branch: keni-crashweb2 $'; - my $revision = '$NHDT-Revision: 1.24 $'; + ($rev) = ('$NHDT-Revision: 1.26 $') =~ m/: (.*) .$/; + my $date = '$NHDT-Date: 1710949915 2024/03/20 15:51:55 $'; + my $branch = '$NHDT-Branch: NetHack-3.7 $'; + my $revision = '$NHDT-Revision: 1.26 $'; open(OUT, ">$outfile") || die "open $outfile: $!"; # NB: Date and Revision below will be modified when mdgrep.h is written to # git - this is correct (but it means you must commit changes to mdgrep.pl @@ -71,6 +76,8 @@ sub start_file { * This file generated by mdgrep.pl version $rev. * DO NOT EDIT! Your changes will be lost. */ + +static struct grep_var grep_vars[]={ E_O_M } @@ -89,7 +96,6 @@ sub gen_magic { # NB: Do NOT make grep_vars const - it needs to be writable for some debugging # options. sub gen_file { - print OUT "static struct grep_var grep_vars[]={\n"; foreach(@_){ if(defined $magic{$_}){ print OUT <