diff --git a/configure/RELEASE b/configure/RELEASE
index d859e8c..f3b5628 100644
--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -1,30 +1,44 @@
-# easyPVACPP RELEASE - Location of external support modules
+# RELEASE - Location of external support modules
#
-# IF YOU CHANGE this file or any file it includes you must
-# subsequently do a "gnumake rebuild" in the application's
-# top level directory.
+# IF YOU CHANGE ANY PATHS in this file or make API changes to
+# any modules it refers to, you should do a "make rebuild" in
+# this application's top level directory.
#
-# The build process does not check dependencies against files
-# that are outside this application, thus you should also do a
-# "gnumake rebuild" in the top level directory after EPICS_BASE
-# or any other external module pointed to below is rebuilt.
+# The EPICS build process does not check dependencies against
+# any files from outside the application, so it is safest to
+# rebuild it completely if any modules it depends on change.
#
# Host- or target-specific settings can be given in files named
# RELEASE.$(EPICS_HOST_ARCH).Common
# RELEASE.Common.$(T_A)
# RELEASE.$(EPICS_HOST_ARCH).$(T_A)
-
-# EPICS V4 Developers: Do not edit the locations in this file!
#
-# A RELEASE.local must exist that has the following definitions
-# EPICS_BASE=/home/install/epics/base
-# EPICS4_DIR=/home/epicsv4
-# PVCOMMON=${EPICS4_DIR}/pvCommonCPP
-# PVDATA=${EPICS4_DIR}/pvDataCPP
-# NORMATIVETYPES=${EPICSV4}/normativeTypesCPP
-# PVACCESS=${EPICS4_DIR}/pvAccessCPP
-#Either create a RELEASE.local one level above the TOP for this module
-#OR copy ExampleRELEASE.local to RELEASE.local and edit it.
+# This file is parsed by both GNUmake and an EPICS Perl script,
+# so it may ONLY contain definititions of paths to other support
+# modules, variable definitions that are used in module paths,
+# and include statements that pull in other RELEASE files.
+# Variables may be used before their values have been set.
+# Build variables that are NOT used in paths should be set in
+# the CONFIG_SITE file.
+# Variables and paths to dependent modules:
+#MODULES = /path/to/modules
+#MYMODULE = $(MODULES)/my-module
+
+# If building the EPICS modules individually, set these:
+#EPICS_PVACCESS = $(MODULES)/pvAccess
+#EPICS_NORMATIVETYPES = $(MODULES)/normativeTypes
+#EPICS_PVDATA = $(MODULES)/pvData
+#EPICS_DATABASE = $(MODULES)/database
+#EPICS_CA = $(MODULES)/ca
+#EPICS_LIBCOM = $(MODULES)/libcom
+#EPICS_BASE = $(MODULES)/core
+
+# Set RULES here if you want to use build rules from elsewhere:
+#RULES = $(MODULES)/build-rules
+
+# These allow developers to override the RELEASE variable settings
+# without having to modify the configure/RELEASE file itself.
-include $(TOP)/../RELEASE.local
+-include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
-include $(TOP)/configure/RELEASE.local
diff --git a/documentation/RELEASE_NOTES.md b/documentation/RELEASE_NOTES.md
index adc4440..6f4aab9 100644
--- a/documentation/RELEASE_NOTES.md
+++ b/documentation/RELEASE_NOTES.md
@@ -12,14 +12,10 @@ API changes to PvaClientGet, ..., PvaClientMonitor
pvaClientGet, ..., pvaClientMonitor all implemented PvaClientChannelStateChangeRequester.
This was never called and has been removed.
+Works with pvDataCPP-7.0 and pvAccessCPP-6.0 versions
+-----------------------------------------------------
-EPICS V4 release 4.7
-====================
-
-Works with release/7.0 of pvDataCPP and release/6.0 of pvAccessCPP
-------------------------------------------------------------------
-
-Will not work with older versions.
+Will not work with older versions of these modules.
destroy methods removed
-----------------------
@@ -57,8 +53,8 @@ A new method is also implemented
);
-EPICS V4 release 4.6
-====================
+pvaClientCPP Version 4.2
+========================
* The examples are moved to exampleCPP.
* Support for channelRPC is now available.
@@ -66,8 +62,8 @@ EPICS V4 release 4.6
-EPICS V4 release 4.5
-====================
+pvaClientCPP Version 4.1
+========================
pvaClient is a synchronous API for pvAccess.
diff --git a/documentation/pvaClientCPP.html b/documentation/pvaClientCPP.html
index ee62eff..4335e90 100644
--- a/documentation/pvaClientCPP.html
+++ b/documentation/pvaClientCPP.html
@@ -4,7 +4,7 @@
- EPICS pva
+ EPICS pvaClientCPP
EPICS pvaClientCPP
-
Release 4.7.0-SNAPSHOT - 2017-06-29
+
Release 4.3.0 - 2017-12-14
Abstract
diff --git a/jenkins/cloudbees_doc b/jenkins/cloudbees_doc
index d65c831..5e7ef48 100644
--- a/jenkins/cloudbees_doc
+++ b/jenkins/cloudbees_doc
@@ -21,14 +21,7 @@ installE4 () {
local module=$1
local branch=$2
- # If microbench version does not exist, try without
- if [ "${MB}" = "WITH_MICROBENCH" ]; then
- if ! wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE},MB=WITH_MICROBENCH/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz; then
- wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE},MB=NO_MICROBENCH/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz
- fi
- else
- wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE},MB=NO_MICROBENCH/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz
- fi
+ wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE}/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz
tar -xzf ${module}.CB-dist.tar.gz
}
diff --git a/src/Makefile b/src/Makefile
index f39e87f..a2143f9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -31,8 +31,8 @@ LIBSRCS += pvaClientNTMultiGet.cpp
LIBSRCS += pvaClientNTMultiMonitor.cpp
LIBSRCS += pvaClientRPC.cpp
-pvaClient_LIBS += pvAccessCA pvAccess nt pvData Com
-pvaClient_LIBS += $(EPICS_BASE_IOC_LIBS)
+pvaClient_LIBS += nt
+pvaClient_LIBS += $(EPICS_BASE_PVA_CORE_LIBS)
+pvaClient_LIBS += $(EPICS_BASE_IOC_LIBS)
include $(TOP)/configure/RULES
-