Clear SNAPSHOT in Base version for 7.0.1.1

Also recreated README.1st from README.html

.ci/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

configure/CONFIG_BASE_VERSION

@@ -43,7 +43,7 @@ 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 = 1
 
 # This will end in -DEV between official releases
 #EPICS_DEV_SNAPSHOT=-DEV

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>

documentation/RELEASE_NOTES.html

@@ -7,7 +7,7 @@
 </head>
 
 <body lang="en">
-<h1 align="center">EPICS Release 7.0.1</h1>
+<h1 align="center">EPICS Release 7.0.1.1</h1>
 
 <!-- Insert new items immediately below this template ...
 

src/tools/EPICS/Release.pm

@@ -43,16 +43,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}++;
+    $Ractive->{$file}++;
     while (<$IN>) {
         chomp;
         s/ \r $//x;             # Shouldn't need this, but sometimes...
@@ -77,11 +77,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";
         }
     }
+    $Ractive->{$file}--;
     close $IN;
 }