Update module version and release date for V4.6.0-rc1

documentation/pvaClientCPP.html

@@ -26,7 +26,7 @@
 
 <div class="head">
 <h1>EPICS pvaClientCPP</h1>
-<h2 class="nocount">Release 4.2.0-SNAPSHOT - 2016-07-14</h2>
+<h2 class="nocount">Release 4.2.1 - 2016-08-26</h2>
 
 <h2 class="nocount">Abstract</h2>
 

jenkins/cloudbees_build

@@ -42,10 +42,10 @@ MB=${MB:-"NO_MICROBENCH"}
 ###########################################
 # Dependent module branches
 
-PVCOMMON_BRANCH="master"
+PVCOMMON_BRANCH="release-4.2"
-PVDATA_BRANCH="master"
+PVDATA_BRANCH="release-6.0"
-PVACCESS_BRANCH="master"
+PVACCESS_BRANCH="release-5.0"
-NORMATIVETYPES_BRANCH="master"
+NORMATIVETYPES_BRANCH="release-5.1"
 
 ###########################################
 # Fetch and unpack dependencies

jenkins/cloudbees_doc

@@ -65,9 +65,9 @@ doxygen
 ###########################################
 # Publish
 
-if [ "${PUBLISH}" != "DONT" ]; then
+if [ "${PUBLISH}" != "NO" ]; then
     # Upload explicit dummy to ensure target directory exists
     echo "Created by CloudBees Jenkins upload job. Should be deleted as part of the job." > DUMMY
-    rsync -q -e ssh DUMMY epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/pvaClientCPP/${PUBLISH}/DUMMY
+    rsync -q -e ssh DUMMY epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/pvaClientCPP/${PUBLISH}/
     rsync -aqP --delete -e ssh documentation epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/pvaClientCPP/${PUBLISH}/
 fi

src/Makefile

@@ -6,7 +6,7 @@ include $(TOP)/configure/CONFIG
 LIBRARY += pvaClient
 
 # shared library ABI version.
-SHRLIB_VERSION ?= 4.2.0
+SHRLIB_VERSION ?= 4.2
 
 INC += pv/pvaClient.h
 INC += pv/pvaClientMultiChannel.h