Don't rely on EPICS_DEV_SNAPSHOT being "-DEV"

This commit is contained in:
Andrew Johnson
2025-04-18 17:49:03 -05:00
parent 42ba2875cc
commit bb78ba223c
2 changed files with 8 additions and 4 deletions
+3 -2
View File
@@ -34,8 +34,9 @@ include $(TOP)/configure/RULES
MAKENOTES = ../make-notes.pl
$(COMMON_DIR)/RELEASE_NOTES.md: $(NEW_NOTES) $(MAKENOTES)
@$(RM) $@
$(PERL) $(MAKENOTES) -o $@ $(EPICS_DEV_SNAPSHOT) \
-V $(EPICS_SHORT_VERSION) -d $(abspath $(NEW_DIR))
$(PERL) $(MAKENOTES) -o $@ -D -V $(EPICS_SHORT_VERSION) \
-d $(abspath $(NEW_DIR))
$(HEADER_MD_FILES): %_h.md: ../HEADER_h.md
$(EXPAND_TOOL) -t $(INSTALL_LOCATION) -DHEADER=$* $< $@
+5 -2
View File
@@ -25,7 +25,7 @@ sub HELP_MESSAGE {
}
HELP_MESSAGE()
if !getopts('hd:o:D:V:') || $opt_h || @ARGV > 0;
if !getopts('hd:o:DV:') || $opt_h || @ARGV > 0;
die "$tool: Directory from '-d' option doesn't exist\n"
unless -d $opt_d;
@@ -39,6 +39,9 @@ $SIG{__DIE__} = sub {
unlink $opt_o;
};
my $REL_VERS = $opt_V;
$REL_VERS .= '-DEV' if $opt_D;
# Directory handle for scanning the new-notes directory
opendir my $dh, $opt_d or
die "$tool: Can't open '-d' directory: $!\n";
@@ -74,7 +77,7 @@ in future releases.
__REL_INTRO__
print $out "## EPICS Release $opt_V\n\n";
print $out "## EPICS Release $REL_VERS\n\n";
print $out <<__NEW_INTRO__ if $opt_D;
__This version of EPICS has not been released yet.__