Set version snapshot to -rc1

Unify .gitignore files
Use 'make test-results' in travis-build scripts

.ci/checkout-modules.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# Checkout submodules on their appropriate branches
+#
+
+git submodule foreach '\
+    git checkout `git config -f $toplevel/.gitmodules submodule.$name.branch` && \
+    git pull '

.ci/make-tar.sh

@@ -4,6 +4,11 @@
 #
 set -e
 
+die() {
+  echo "$1" >&2
+  exit 1
+}
+
 TOPREV="$1"
 FINALTAR="$2"
 PREFIX="$3"
@@ -23,7 +28,12 @@ EOF
 fi
 
 [ "$FINALTAR" ] || FINALTAR="$TOPREV.tar.gz"
-[ "PREFIX" ] || PREFIX="$TOPREV/"
+[ "$PREFIX" ] || PREFIX="$TOPREV/"
+
+case "$PREFIX" in
+*/) ;;
+*)  die "Prefix must end with '/'";;
+esac
 
 # temporary directory w/ automatic cleanup
 TDIR=`mktemp -d`
@@ -31,7 +41,7 @@ trap 'rm -rf "$TDIR"' EXIT INT QUIT TERM
 
 mkdir "$TDIR"/tar
 
-echo "Export revision $TOPREV as $FINALTAR with prefix $PREFIX"
+echo "Exporting revision $TOPREV as $FINALTAR with prefix $PREFIX"
 
 # Use git-archive to copy files at the given revision into our temp. dir.
 # Respects 'export-exclude' in .gitattributes files.
@@ -45,28 +55,30 @@ git archive --prefix=$PREFIX $TOPREV | tar -C "$TDIR"/tar -x
 git ls-tree -r $TOPREV | awk '/^[0-9]+ commit / {print $3, $4}' | \
 while read HASH MODDIR
 do
-    echo "visit $HASH $MODDIR"
-    (cd $MODDIR && git archive --prefix=${PREFIX}${MODDIR}/ $HASH) | tar -C "$TDIR"/tar -x
+    echo "Visiting $HASH $MODDIR"
+    git -C $MODDIR archive --prefix=${PREFIX}${MODDIR}/ $HASH | tar -C "$TDIR"/tar -x
 done
 
 # make a list of files copied and filter out undesirables
 
-(cd "$TDIR"/tar && find .) > "$TDIR"/list.1
+(cd "$TDIR"/tar && find . -mindepth 1 -not -type d) > "$TDIR"/list.1
 
+# Remove leading ./ from filenames
+sed -i -e 's|^\./||' "$TDIR"/list.1
+
+# Exclude files
 sed \
--e '/.*ci$/d' \
--e '/.*ci\//d' \
--e '/.*jenkins$/d' \
--e '/.*jenkins\//d' \
--e '/\.git/d' \
--e '/\.project/d' \
--e '/.*\.travis\.yml$/d' \
--e '/.*\.appveyor\.yml$/d' \
-"$TDIR"/list.1 > "$TDIR"/list.2
+  -e '/\/\.\?ci\//d' \
+  -e '/\/jenkins\//d' \
+  -e '/\/\.git/d' \
+  -e '/\/\.project$/d' \
+  -e '/\/\.travis\.yml$/d' \
+  -e '/\/\.appveyor\.yml$/d' \
+  "$TDIR"/list.1 > "$TDIR"/list.2
 
-if ! diff -u "$TDIR"/list.1 "$TDIR"/list.2
+if ! diff -U 0 "$TDIR"/list.1 "$TDIR"/list.2
 then
-  echo "Warning: prohibited files being ignored"
+    echo "Excluding the files shown above"
 fi
 
 # Use the filtered list to build the final tar
@@ -75,3 +87,11 @@ fi
 tar -C "$TDIR"/tar --files-from="$TDIR"/list.2 -caf "$FINALTAR"
 
 echo "Wrote $FINALTAR"
+
+tar -taf "$FINALTAR" > "$TDIR"/list.3
+
+# make sure we haven't picked up anything extra
+if ! diff -u "$TDIR"/list.2 "$TDIR"/list.3
+then
+    echo "Oops! Tarfile diff against plan shown above"
+fi

.gitignore

@@ -8,6 +8,7 @@
 /templates/
 /configure/*.local
 /modules/RELEASE.local
+/modules/Makefile.local
 O.*/
 /QtC-*
 *.orig

configure/CONFIG_BASE_VERSION

@@ -47,11 +47,11 @@ EPICS_PATCH_LEVEL = 0
 
 # This will end in -DEV between official releases
 #EPICS_DEV_SNAPSHOT=-DEV
-EPICS_DEV_SNAPSHOT=-pre1
+#EPICS_DEV_SNAPSHOT=-pre1
 #EPICS_DEV_SNAPSHOT=-pre1-DEV
 #EPICS_DEV_SNAPSHOT=-pre2
 #EPICS_DEV_SNAPSHOT=-pre2-DEV
-#EPICS_DEV_SNAPSHOT=-rc1
+EPICS_DEV_SNAPSHOT=-rc1
 #EPICS_DEV_SNAPSHOT=-rc1-DEV
 #EPICS_DEV_SNAPSHOT=-rc2
 #EPICS_DEV_SNAPSHOT=-rc2-DEV

configure/RULES_TARGET

@@ -38,6 +38,17 @@ $(foreach target, $(PROD) $(TESTPROD), \
 
 #-----------------------------------------------------------------------
 
+# These must be done before PROD2_template
+define TESTLIBRARY_template
+$(1)_DIR = .
+TESTBUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),)
+endef
+
+$(foreach target, $(TESTLIBRARY), \
+    $(eval $(call TESTLIBRARY_template,$(strip $(target)))))
+
+#-----------------------------------------------------------------------
+
 define TARGET2_template
 $(1)_LDLIBS += $$($(1)_LIBS)
 $(1)_LDLIBS += $$(if $$(strip $$($(1)_LIBS_$(OS_CLASS))), \
@@ -123,16 +134,6 @@ $(foreach target, $(LIBRARY), \
 
 #-----------------------------------------------------------------------
 
-define LIBRARY3_template
-$(1)_DIR = .
-TESTBUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),)
-endef
-
-$(foreach target, $(TESTLIBRARY), \
-    $(eval $(call LIBRARY3_template,$(strip $(target)))))
-
-#-----------------------------------------------------------------------
-
 define LOADABLE_LIBRARY_template
 LOADABLE_BUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),)
 

documentation/KnownProblems.html

@@ -4,17 +4,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <title>Known Problems in Base-3.16.1</title>
+  <title>Known Problems in EPICS 7.0.1</title>
 </head>
 
 <body>
-<h1 style="text-align: center">EPICS Base R3.16.1: Known Problems</h1>
+<h1 style="text-align: center">EPICS 7.0.1: Known Problems</h1>
 
 <p>Any patch files linked below should be applied at the root of the
-base-3.16.1 tree. Download them, then use the GNU Patch program as
+base-7.0.1 tree. Download them, then use the GNU Patch program as
 follows:</p>
 
-<blockquote><pre>% <b>cd <i>/path/to/</i>base-3.16.1</b>
+<blockquote><pre>% <b>cd <i>/path/to/</i>base-7.0.1</b>
 % <b>patch -p1 &lt; <i>/path/to/</i>file.patch</b></pre></blockquote>
 
 <p>The following problems were known by the developers at the time of this
@@ -32,10 +32,6 @@ release:</p>
     about duplicate EPICS CA Address list entries. These warnings might be due
     to a bug in Cygwin; they are benign and can be ignored.</li>
 
-  <li>64-bit Windows builds of the CAS library may not work with some compilers.
-    The code in <tt>src/legacy/gdd</tt> is incompatible with the LLP64 model
-    that Windows uses for its 64-bit ABI.</li>
-
 </ul>
 
 </body>

documentation/README.html

@@ -9,7 +9,7 @@
 <BODY>
 <CENTER>
 <H1>Installation Instructions</H1>
-<H2>EPICS Base Release 3.16.1</H2><BR>
+<H2>EPICS Base Release 7.0.1</H2><BR>
 </CENTER>
 <HR>
 <H3> Table of Contents</H3>
@@ -243,11 +243,11 @@ Files in the base/startup directory have been provided to
  help set required path and other environment variables.
 
 <P><B>EPICS_HOST_ARCH</B><BR>
- 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
+ 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 host architecture, e.g. solaris-sparc.
+ 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. &quot;-gnu&quot; for GNU c/c++ compilers on a solaris host or &quot;-mingw&quot;
@@ -269,7 +269,7 @@ Files in the base/startup directory have been provided to
 
 <P><B>LD_LIBRARY_PATH</B><BR>
 
- 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
@@ -343,7 +343,7 @@ Files in the base/startup directory have been provided to
  and then executed to try out this release of base.
 
 <P>
- Instructions for building and executing the 3.15 example application
+ Instructions for building and executing the example IOC application
  can be found in the section &quot;Example Application&quot; of Chapter 2,
  &quot;Getting Started&quot;, in the &quot;IOC Application Developer's Guide&quot; for this
  release. The &quot;Example IOC Application&quot; section briefly explains how to

documentation/RELEASE_NOTES.html

@@ -17,6 +17,16 @@
 
 -->
 
+<h3>Changed SIML failure behavior</h3>
+
+<p>A failure when fetching the simulation mode through <tt>SIML</tt> will not
+put the record into INVALID alarm state anymore. Instead, as long as the
+record's current alarm severity (<tt>SEVR</tt>)is NO_ALARM, its alarm status
+(<tt>STAT</tt>) will be set to LINK_ALARM without increasing the severity. This
+allows clients to get some notification of a failing or bad <tt>SIML</tt> link
+without otherwise affecting record processing.</p>
+
+
 <h3>dbVerify() has been restored to dbStaticLib</h3>
 
 <p>This routine was removed in Base-3.16.1 but has been reimplemented in this
@@ -24,6 +34,7 @@ release by special request. Note that the error message strings that it returns
 when verification fails have changed, but are still designed for display to the
 user.</p>
 
+
 <h3>Simulation mode improvements</h3>
 
 <p>Records that support simulation mode have two new fields, <tt>SSCN</tt>
@@ -49,6 +60,25 @@ the environment variable EPICS_IOC_IGNORE_SERVERS (separated by spaces if more
 than one should be ignored).</p>
 
 
+<h3>Grand source-code reorganization</h3>
+
+<p>EPICS 7.0.1 contains the IOC Database, RSRV server and the Channel Access
+client code from EPICS Base 3.16.1 along with all the original record types and
+soft device support, but GDD and the Portable Channel Access Server have been
+unbundled and are now available separately. In their place we have brought in
+the more recently written EPICS V4 C++ libraries (collectively referred to as
+the PVA modules). The directory tree for EPICS is somewhat larger as a result,
+and the original structure of the Base directories has been split into 4
+separate Git repositories. External modules should build against this new
+structure with little or no changes needed, except that some allowance may be
+needed for the merging of the V4 modules.</p>
+
+<p>There should be rather more description and documantation of these changes
+than is currently available, but as developers we generally much prefer to write
+code than documentation. Send questions to the tech-talk mailing list and we'll
+be happy to try and answer them!</p>
+
+
 <h2 align="center">Changes from the 3.16 branch since 3.16.1</h2>
 
 <!-- Insert inherited items immediately below here ... -->

modules/Makefile

@@ -36,8 +36,11 @@ pva2pva_DEPEND_DIRS = pvAccess
 SUBMODULES += example
 example_DEPEND_DIRS = pva2pva pvaClient
 
-# Add any checked-out submodules to DIRS
-DIRS += $(subst /,,$(dir $(wildcard $(addsuffix /Makefile, $(SUBMODULES)))))
+# Allow sites to add extra submodules
+-include Makefile.local
+
+# Add only checked-out submodules to DIRS
+DIRS += $(subst /Makefile,,$(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
 
 include $(TOP)/configure/RULES_DIRS