update PVA modules

more issues with the RTEMS test harness executables.

.appveyor.yml

@@ -16,7 +16,7 @@ init:
   - git config --global core.autocrlf true
 
 # Set clone depth (do not fetch complete history)
-clone_depth: 10
+clone_depth: 50
 
 # Skipping commits affecting only specific files
 skip_commits:
@@ -66,7 +66,7 @@ matrix:
 #---------------------------------#
 
 install:
-  - cmd: git submodule update --init --recursive --depth 10
+  - cmd: git submodule update --init --recursive
   - cmd: .ci/appveyor-prepare.bat
 
 build_script:

.ci/appveyor-prepare.bat

@@ -65,6 +65,6 @@ if "%TOOLCHAIN%"=="mingw" (
 )
 
 echo [INFO] Installing Make 4.1
-curl -fsS --retry 3 -o C:\tools\make-4.1.zip https://www.aps.anl.gov/epics/download/tools/make-4.1-win64.zip
+curl -fsS --retry 3 -o C:\tools\make-4.1.zip https://epics.anl.gov/download/tools/make-4.1-win64.zip
 cd \tools
 "C:\Program Files\7-Zip\7z" e make-4.1.zip

.gitattributes

@@ -1,4 +1,5 @@
 .ci/          export-ignore
+.tools/       export-ignore
 .appveyor.yml export-ignore
 .travis.yml   export-ignore
 README        export-subst

.tools/make-tar.sh

@@ -18,23 +18,34 @@ then
    cat <<EOF >&2
 usage: $0 [rev] [outfile.tar.gz] [prefix/]
 
-  "<rev>" may be any git revision spec. (tag, branch, or commit id).
+  <rev> may be any git revision spec. (tag, branch, or commit id).
 
   Output file may be .tar.gz, .tar.bz2, or any extension supported by "tar -a".
-  If output file name is omitted, then "<rev>.tar.gz" is the default.
-  If prefix is omitted, then the default is "<rev>/".
+  If output file name is omitted, "base-<rev>.tar.gz" will be used.
+  If <prefix> is omitted, the default prefix is "base-<rev>/".
 EOF
    exit 1
 fi
 
-[ "$FINALTAR" ] || FINALTAR="$TOPREV.tar.gz"
-[ "$PREFIX" ] || PREFIX="$TOPREV/"
+[ "$FINALTAR" ] || FINALTAR="base-$TOPREV.tar.gz"
+[ "$PREFIX" ] || PREFIX="base-$TOPREV/"
 
 case "$PREFIX" in
 */) ;;
 *)  die "Prefix must end with '/'";;
 esac
 
+# Check for both <tag> and R<tag>
+if ! [ `git tag -l $TOPREV` ]
+then
+  if [ `git tag -l R$TOPREV` ]
+  then
+    TOPREV="R$TOPREV"
+  else
+    die "No tags exist '$TOPREV' or 'R$TOPREV'"
+  fi
+fi
+
 # temporary directory w/ automatic cleanup
 TDIR=`mktemp -d`
 trap 'rm -rf "$TDIR"' EXIT INT QUIT TERM
@@ -69,6 +80,7 @@ sed -i -e 's|^\./||' "$TDIR"/list.1
 # Exclude files
 sed \
   -e '/\/\.\?ci\//d' \
+  -e '/\/\.tools\//d' \
   -e '/\/jenkins\//d' \
   -e '/\/\.git/d' \
   -e '/\/\.project$/d' \

README

@@ -20,7 +20,7 @@ Additional information about EPICS including mailing list
 archives and subscription instructions, documentation and
 training materials, additional components, links to other
 websites etc. is available on the EPICS home page at
-	http://www.aps.anl.gov/epics/
+	https://epics.anl.gov/
 
 $Format:%cD$
 $Format:%H$

configure/CONFIG_BASE_VERSION

@@ -43,10 +43,10 @@ EPICS_MODIFICATION = 1
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included if zero
-EPICS_PATCH_LEVEL = 0
+EPICS_PATCH_LEVEL = 2
 
 # This will end in -DEV between official releases
-#EPICS_DEV_SNAPSHOT=-DEV
+EPICS_DEV_SNAPSHOT=-DEV
 #EPICS_DEV_SNAPSHOT=-pre1
 #EPICS_DEV_SNAPSHOT=-pre1-DEV
 #EPICS_DEV_SNAPSHOT=-pre2
@@ -55,7 +55,7 @@ EPICS_PATCH_LEVEL = 0
 #EPICS_DEV_SNAPSHOT=-rc1-DEV
 #EPICS_DEV_SNAPSHOT=-rc2
 #EPICS_DEV_SNAPSHOT=-rc2-DEV
-EPICS_DEV_SNAPSHOT=
+#EPICS_DEV_SNAPSHOT=
 
 # No changes should be needed below here
 

configure/CONFIG_SITE_ENV

@@ -34,35 +34,30 @@
 #	The future dates below assume the rules don't get changed;
 #	see http://www.timeanddate.com/time/dst/2018.html to check.
 #
-#	DST for 2017  US: Mar 12 - Nov 05
-#	              EU: Mar 26 - Oct 29
-EPICS_TIMEZONE = CUS::360:031202:110502
-#EPICS_TIMEZONE = MET::-60:032602:102902
-#
 #	DST for 2018  US: Mar 11 - Nov 04
 #	              EU: Mar 25 - Oct 28
-#EPICS_TIMEZONE = CUS::360:031102:110402
-#EPICS_TIMEZONE = MET::-60:032502:102802
+EPICS_TIMEZONE = CUS::360:031102:110402
+#EPICS_TIMEZONE = MET::-60:032502:102803
 #
 #	DST for 2019  US: Mar 10 - Nov 03
 #	              EU: Mar 31 - Oct 27
 #EPICS_TIMEZONE = CUS::360:031002:110302
-#EPICS_TIMEZONE = MET::-60:033102:102702
+#EPICS_TIMEZONE = MET::-60:033102:102703
 #
 #	DST for 2020  US: Mar 08 - Nov 01
 #	              EU: Mar 29 - Oct 25
 #EPICS_TIMEZONE = CUS::360:030802:110102
-#EPICS_TIMEZONE = MET::-60:032902:102502
+#EPICS_TIMEZONE = MET::-60:032902:102503
 #
 #	DST for 2021  US: Mar 14 - Nov 07
 #	              EU: Mar 28 - Oct 31
 #EPICS_TIMEZONE = CUS::360:031402:110702
-#EPICS_TIMEZONE = MET::-60:032802:103102
+#EPICS_TIMEZONE = MET::-60:032802:103103
 #
 #	DST for 2022  US: Mar 13 - Nov 06
 #	              EU: Mar 27 - Oct 30
 #EPICS_TIMEZONE = CUS::360:031302:110602
-#EPICS_TIMEZONE = MET::-60:032702:103002
+#EPICS_TIMEZONE = MET::-60:032702:103003
 
 # EPICS_TS_NTP_INET
 #	NTP time server ip address for VxWorks and RTEMS.

configure/RULES_BUILD

@@ -102,6 +102,7 @@ endif
 #   Products and Object libraries
 #
 PRODTARGETS += $(PRODNAME) $(MUNCHNAME) $(CTDT_SRCS) $(CTDT_OBJS) $(NMS)
+TESTPRODTARGETS += $(TESTPRODNAME) $(TESTMUNCHNAME)
 
 #---------------------------------------------------------------
 #   Test specifications and test result files
@@ -140,7 +141,7 @@ rebuild: clean install
 
 build: inc
 
-build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODNAME) \
+build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODTARGETS) \
 	$(TARGETS) $(TESTSCRIPTS) $(INSTALL_LIB_INSTALLS)
 
 inc : $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS)
@@ -158,20 +159,21 @@ clean: build_clean
 
 build_clean:
 	$(ECHO) "Cleaning"
-	@$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) \
+	@$(RM) *.i *$(OBJ) *.a \
 	$(LIBNAME) $(TESTLIBNAME) $(SHRLIBNAME) $(TESTSHRLIBNAME) \
 	$(DLLSTUB_LIBNAME) $(TESTDLLSTUB_LIBNAME) \
 	$(LOADABLE_SHRLIBNAME) \
 	$(INC) $(TARGETS) $(TDS) $(CLEANS) \
 	*.out MakefileInclude *.manifest *.exp \
-	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) \
+	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) $(TESTPRODTARGETS) \
 	$(TESTSCRIPTS) $(TAPFILES) $(JUNITFILES)
 ifdef RES
 	@$(RM) *$(RES)
 endif
 
-$(DIRECTORY_TARGETS) :
-	$(MKDIR) $@
+# Sort mkdir targets to remove duplicates & make parents first
+$(DIRECTORY_TARGETS):
+	$(MKDIR) $(sort $@)
 
 # Install LIB_INSTALLS libraries before linking executables
 $(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS)
@@ -321,6 +323,10 @@ $(MUNCHNAME): %$(MUNCH_SUFFIX): $(MUNCH_DEPENDS) %$(EXE)
 	@$(RM) $@
 	$(MUNCH_CMD)
 
+$(TESTMUNCHNAME): %$(MUNCH_SUFFIX): $(MUNCH_DEPENDS) %$(EXE)
+	@$(RM) $@
+	$(MUNCH_CMD)
+
 #---------------------------------------------------------------
 # GeSys modules for RTEMS
 $(MODNAME): %$(MODEXT): %$(EXE)

configure/os/CONFIG.Common.RTEMS

@@ -136,6 +136,13 @@ MOD_LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(POSIX_LDFLAGS) \
 LINK.mod = $(CCC) -o $@ $(PRODDIR_LDFLAGS) $(MOD_LDFLAGS)
 LINK.mod += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(MOD_LDLIBS)
 
+#--------------------------------------------------
+# Here munching means creating a bootable object binary
+ifdef MUNCH_SUFFIX
+  MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
+  TESTMUNCHNAME = $(TESTPRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
+endif
+
 #--------------------------------------------------
 # RTEMS has neither shared libraries nor dynamic loading
 STATIC_BUILD=YES

configure/os/CONFIG.Common.RTEMS-beatnik

@@ -15,7 +15,6 @@ ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120
 OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef

configure/os/CONFIG.Common.RTEMS-mvme2100

@@ -13,7 +13,6 @@ ARCH_DEP_CFLAGS += -DHAVE_PPCBUG
 OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems
 	gzip -f9 rtems

configure/os/CONFIG.Common.RTEMS-mvme2700

@@ -7,7 +7,6 @@ ARCH_DEP_CFLAGS += -DHAVE_PPCBUG
 ARCH_DEP_CFLAGS += -DNVRAM_INDIRECT
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems
 	gzip -f9 rtems

configure/os/CONFIG.Common.RTEMS-mvme3100

@@ -15,7 +15,6 @@ ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120
 OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef

configure/os/CONFIG.Common.RTEMS-mvme5500

@@ -16,7 +16,6 @@ ARCH_DEP_CFLAGS += -DBSP_NVRAM_BASE_ADDR=0xf1110000
 OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef

configure/os/CONFIG.Common.RTEMS-pc386

@@ -8,7 +8,6 @@
 RTEMS_TARGET_CPU=i386
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< temp.bin
 	$(BIN2BOOT) $@ 0x00097E00 \

configure/os/CONFIG.Common.RTEMS-uC5282

@@ -9,7 +9,6 @@ RTEMS_TARGET_CPU = m68k
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< $@
 endef

configure/os/CONFIG.Common.vxWorksCommon

@@ -170,6 +170,10 @@ COMPILE.ctdt = $(CC) -c $(CPPFLAGS) $(CFLAGS_ctdt) $(INCLUDES) $(SOURCE_FLAG)
 VXCPPFLAGS = $(filter-out $(OP_SYS_INCLUDE_CPPFLAGS),$(CPPFLAGS))
 PREPROCESS.cpp = $(CPP) $(VXCPPFLAGS) $(INCLUDES) $< > $@
 
+#--------------------------------------------------
+# Use LEDLIB for command-line editing
+COMMANDLINE_LIBRARY = LEDLIB
+
 #--------------------------------------------------
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.Common.vxWorksCommon

configure/os/CONFIG.win32-x86.win32-x86

@@ -136,6 +136,16 @@ STATIC_LDLIBS_NO=
 STATIC_LDFLAGS=
 RANLIB=
 
+#
+# option needed for parallel builds with Visual Studio 2015 onward
+#
+# -FS Force Synchronous PDB Writes
+ifneq ($(VisualStudioVersion),)
+  OPT_CXXFLAGS_NO += -FS
+  OPT_CFLAGS_NO += -FS
+endif
+
+
 #
 # add -profile here to run the ms profiler
 # -LTCG whole program optimization

documentation/README.1st

@@ -1,6 +1,6 @@
                            Installation Instructions
 
-                           EPICS Base Release 3.16.1
+                           EPICS Base Release 7.0.1.1
 
    --------------------------------------------------------------------------
 
@@ -225,13 +225,13 @@
        required path and other environment variables.
 
        EPICS_HOST_ARCH
-       Before you can build or use EPICS R3.15, the environment variable
-       EPICS_HOST_ARCH must be defined. A perl script EpicsHostArch.pl in the
-       base/startup directory has been provided to help set EPICS_HOST_ARCH.
-       You should have EPICS_HOST_ARCH set to your host operating system
-       followed by a dash and then your host architecture, e.g.
-       solaris-sparc. If you are not using the OS vendor's c/c++ compiler for
-       host builds, you will need another dash followed by the alternate
+       Before you can build or use EPICS Base, the environment variable
+       EPICS_HOST_ARCH should be defined. A perl script EpicsHostArch.pl in
+       the base/startup directory has been provided to help set
+       EPICS_HOST_ARCH. You should have EPICS_HOST_ARCH set to your host
+       operating system followed by a dash and then your CPU architecture,
+       e.g. linux-x86_64. If you are not using the OS vendor's c/c++ compiler
+       for host builds, you will need another dash followed by the alternate
        compiler name (e.g. "-gnu" for GNU c/c++ compilers on a solaris host
        or "-mingw" for MinGW c/c++ compilers on a WIN32 host). See
        configure/CONFIG_SITE for a list of supported EPICS_HOST_ARCH values.
@@ -250,7 +250,7 @@
        solaris systems you need uname in your path.
 
        LD_LIBRARY_PATH
-       R3.15 shared libraries and executables normally contain the full path
+       EPICS shared libraries and executables normally contain the full path
        to any libraries they require. However, if you move the EPICS files or
        directories from their build-time location then in order for the
        shared libraries to be found at runtime LD_LIBRARY_PATH must include
@@ -313,7 +313,7 @@
      script will create a sample application that can be built and then
      executed to try out this release of base.
 
-     Instructions for building and executing the 3.15 example application can
+     Instructions for building and executing the example IOC application can
      be found in the section "Example Application" of Chapter 2, "Getting
      Started", in the "IOC Application Developer's Guide" for this release.
      The "Example IOC Application" section briefly explains how to create and

documentation/README.html

@@ -9,7 +9,7 @@
 <BODY>
 <CENTER>
 <H1>Installation Instructions</H1>
-<H2>EPICS Base Release 7.0.1</H2><BR>
+<H2>EPICS Base Release 7.0.1.1</H2><BR>
 </CENTER>
 <HR>
 <H3> Table of Contents</H3>
@@ -98,7 +98,7 @@
  base/configure/os/CONFIG_SITE.Common.vxWorksCommon file or in one of its
  target-specific overrides.</P>
 
-<P>Consult the <a href="http://www.aps.anl.gov/epics/base/vxWorks6.php">vxWorks
+<P>Consult the <a href="https://epics.anl.gov/base/vxWorks6.php">vxWorks
  6.x</a> EPICS web pages and the vxWorks documentation for information
  about configuring your vxWorks operating system for use with EPICS.</P>
 
@@ -128,7 +128,7 @@
 
 <H3><A NAME="0_0_8"> Documentation</A></H3>
 <BLOCKQUOTE>EPICS documentation is available through the
- <a href="http://www.aps.anl.gov/epics/">EPICS website</a> at Argonne.
+ <a href="https://epics.anl.gov/">EPICS website</a> at Argonne.
  <P>Release specific documentation can also be found in the base/documentation
  directory of the distribution.</BLOCKQUOTE>
 

documentation/RELEASE_NOTES.html

@@ -7,7 +7,8 @@
 </head>
 
 <body lang="en">
-<h1 align="center">EPICS Release 7.0.1</h1>
+
+<h1 align="center">EPICS Release 7.0.2.x</h1>
 
 <!-- Insert new items immediately below this template ...
 
@@ -17,6 +18,8 @@
 
 -->
 
+<h1 align="center">EPICS Release 7.0.1.1</h1>
+
 <h3>Changed SIML failure behavior</h3>
 
 <p>A failure when fetching the simulation mode through <tt>SIML</tt> will not
@@ -83,6 +86,61 @@ be happy to try and answer them!</p>
 
 <!-- Insert inherited items immediately below here ... -->
 
+<h3>Restore use of ledlib for VxWorks command editing</h3>
+
+<p>The epicsReadline refactoring work described below unfortunately disabled the
+VxWorks implementation of the osdReadline.c API that uses ledlib for command
+editing and history. This functionality has now been restored, see Launchpad
+<a href="https://bugs.launchpad.net/bugs/1741578">bug #1741578</a>.</p>
+
+<h3>Constant link types</h3>
+
+<p>Constant links can now hold 64-bit integer values, either as scalars or
+arrays. Only base 10 is supported by the JSON parser though, the JSON standard
+doesn't allow for hexadecimal numbers.</p>
+
+<h3>Upgraded the YAJL JSON Library</h3>
+
+<p>The third-party YAJL library that has been included in libCom for several
+years has been upgraded to version 2.1.0 and several bugs fixed. This has an
+updated API, requiring any code that uses it to parse its own JSON files to be
+modified to match. The changes are mainly that it uses <tt>size_t</tt> instead
+<tt>unsigned int</tt> for string lengths, but it also uses <tt>long long</tt>
+instead of <tt>long</tt> for JSON integer values, which was the main motivation
+for the upgrade.</p>
+
+<p>The self-tests that YAJL comes with have been imported and are now run as an
+EPICS Unit Test program, and the JSON syntax accepted by the parser was extended
+to permit trailing commas in both arrays and maps. The difference between the
+old and new YAJL APIs can be detected at compile time by looking for the macro
+<tt>EPICS_YAJL_VERSION</tt> which is defined in the yajl_common.h header file
+along with a brief description of the API changes.</p>
+
+<h3>Timestamp support for the calc link type</h3>
+
+<p>A new optional parameter can be given when specifying a calc JSON link. The
+<tt>time</tt> parameter is a string containing a single letter <tt>A..L</tt>
+that selects one of the input links to be used for the timestamp of calculation
+if requested. The timestamp will be fetched atomically with the value from the
+chosen input link (providing that input link type supports the readLocked()
+method).</p>
+
+<h3>Silence errors from puts to constant link types</h3>
+
+<p>A soft channel output record with the OUT link unset uses the CONSTANT link
+type. The new link type code was causing some soft channel device supports to
+return an error status from the write method of that link type, which would
+cause a ca_put() operation to such a record to generate an exception. This has
+been silenced by giving the constant link types a dummy putValue method. A new
+test program has been added to prevent regressions of this behaviour.</p>
+
+<h3>RSRV expanding large buffer causes crash</h3>
+
+<p>In the 3.16.1 release a crash can occur in the IOC's RSRV server when a large
+array is made even larger; the previous array buffer was not being released
+correctly. See Launchpad
+<a href="https://bugs.launchpad.net/epics-base/+bug/1706703">bug
+#1706703</a>.</p>
 
 
 <h2 align="center">Changes made between 3.16.0.1 and 3.16.1</h2>

src/tools/EPICS/Copy.pm

@@ -5,8 +5,6 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-use Carp;
-
 # Copy directories and files from a template
 
 sub copyTree {
@@ -15,7 +13,7 @@ sub copyTree {
     # $Rtextsubs contains substitutions for file content.
 
     opendir my $FILES, $src
-        or croak "opendir failed while copying $src: $!\n";
+        or die "opendir failed while copying $src: $!\n";
     my @entries = readdir $FILES;
     closedir $FILES;
 
@@ -36,9 +34,9 @@ sub copyTree {
             print "." unless $opt_d;
             copyFile($srcName, $dstName, $Rtextsubs);
         } elsif (-l $srcName) {
-            carp "\nSoft link in template, ignored:\n\t$srcName\n";
+            warn "\nSoft link in template, ignored:\n\t$srcName\n";
         } else {
-            carp "\nUnknown file type in template, ignored:\n\t$srcName\n";
+            warn "\nUnknown file type in template, ignored:\n\t$srcName\n";
         }
     }
 }
@@ -46,11 +44,11 @@ sub copyTree {
 sub copyDir {
     my ($src, $dst, $Rnamesubs, $Rtextsubs) = @_;
     if (-e $dst && ! -d $dst) {
-        carp "\nTarget exists but is not a directory, skipping:\n\t$dst\n";
+        warn "\nTarget exists but is not a directory, skipping:\n\t$dst\n";
         return;
     }
     print "Creating directory '$dst'\n" if $opt_d;
-    mkdir $dst, 0777 or croak "Can't create $dst: $!\n"
+    mkdir $dst, 0777 or die "Can't create $dst: $!\n"
         unless -d $dst;
     copyTree($src, $dst, $Rnamesubs, $Rtextsubs);
 }
@@ -61,7 +59,7 @@ sub copyFile {
     print "Creating file '$dst'\n" if $opt_d;
     open(my $SRC, '<', $src)
         and open(my $DST, '>', $dst)
-        or croak "$! copying $src to $dst\n";
+        or die "$! copying $src to $dst\n";
     while (<$SRC>) {
         # Substitute any @VARS@ in the text
         s{@(\w+?)@}

src/tools/EPICS/Release.pm

@@ -5,8 +5,6 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-use Carp;
-
 #
 # Parse all relevent configure/RELEASE* files and includes
 #
@@ -43,16 +41,16 @@ sub readReleaseFiles {
 # Parse a configure/RELEASE* file and anything it includes
 #
 sub readRelease {
-    my ($file, $Rmacros, $Rapps, $Rdone) = @_;
-    # $Rmacros and $Rdone are hash-refs, $Rapps an array-ref
+    my ($file, $Rmacros, $Rapps, $Ractive) = @_;
+    # $Rmacros and $Ractive are hash-refs, $Rapps an array-ref
 
-    if (exists $Rdone->{$file}) {
+    if ($Ractive->{$file} > 0) {
         die "Release.pm: Recursive loop found in RELEASE files,\n" .
             "discovered in $file\n";
     }
 
-    open(my $IN, '<', $file) or croak "Can't open $file: $!\n";
-    $Rdone->{$file}++;
+    open(my $IN, '<', $file) or die "Can't open $file: $!\n";
+    $Ractive->{$file}++;
     while (<$IN>) {
         chomp;
         s/ \r $//x;             # Shouldn't need this, but sometimes...
@@ -77,11 +75,12 @@ sub readRelease {
         my ($op, $path) = m/^ \s* (-? include) \s+ (.*)/x;
         $path = expandMacros($path, $Rmacros);
         if (-e $path) {
-            &readRelease($path, $Rmacros, $Rapps, $Rdone);
+            &readRelease($path, $Rmacros, $Rapps, $Ractive);
         } elsif ($op eq "include") {
-            carp "EPICS/Release.pm: Include file '$path' not found\n";
+            warn "EPICS/Release.pm: Include file '$path' not found\n";
         }
     }
+    $Ractive->{$file}--;
     close $IN;
 }
 
@@ -100,17 +99,18 @@ sub expandMacros {
 }
 
 #
-# Expand all (possibly nested) macros in dictionary
+# Expand all (possibly nested) macros in a dictionary
 #
 sub expandRelease {
-    my ($Rmacros) = @_;
+    my ($Rmacros, $warn) = @_;
     # $Rmacros is a reference to a hash
+    $warn = '' unless defined $warn;
 
     while (my ($macro, $val) = each %$Rmacros) {
         while (my ($pre,$var,$post) = $val =~ m/ (.*) \$\( (\w+) \) (.*) /x) {
-            carp "EPICS/Release.pm: Undefined macro \$($var) used\n"
+            warn "EPICS/Release.pm: Undefined macro \$($var) used $warn\n"
                 unless exists $Rmacros->{$var};
-            croak "EPICS/Release.pm: Circular definition of macro $macro\n"
+            die "EPICS/Release.pm: Circular definition of macro $var $warn\n"
                 if $macro eq $var;
             $val = $pre . $Rmacros->{$var} . $post;
             $Rmacros->{$macro} = $val;

src/tools/convertRelease.pl

@@ -237,7 +237,7 @@ sub checkRelease {
         my @order = ();
         my $relfile = "$path/configure/RELEASE";
         readReleaseFiles($relfile, \%check, \@order, $arch);
-        expandRelease(\%check);
+        expandRelease(\%check, "while checking module\n\t$app = $path");
         delete $check{TOP};
         delete $check{EPICS_HOST_ARCH};
 
@@ -246,10 +246,10 @@ sub checkRelease {
                 AbsPath($macros{$parent}) ne AbsPath($ppath)) {
                 print "\n" unless ($status);
                 print "Definition of $parent conflicts with $app support.\n";
-                print "In this application a RELEASE file defines\n";
-                print "\t$parent = $macros{$parent}\n";
-                print "but $app at $path defines\n";
-                print "\t$parent = $ppath\n";
+                print "In this application or module, a RELEASE file\n";
+                print "conflicts with $app at $path\n";
+                print "  Here: $parent = $macros{$parent}\n";
+                print "  $app: $parent = $ppath\n";
                 $status = 1;
             }
         }

src/tools/genVersionHeader.pl

@@ -18,8 +18,8 @@ use POSIX qw(strftime);
 
 use strict;
 
-# RFC 8601 date+time w/ zone (eg "2014-08-29T09:42:47-0700")
-my $tfmt = '%Y-%m-%dT%H:%M:%S';
+# RFC 8601 date+time w/ zone (eg "2014-08-29T09:42-0700")
+my $tfmt = '%Y-%m-%dT%H:%M';
 $tfmt .= '%z' unless $^O eq 'MSWin32'; # %z returns zone name on Windows
 my $now = strftime($tfmt, localtime);