jenkins: adapt doc script to new CloudBees jenkins job

jenkins/cloudbees_build

@@ -18,8 +18,8 @@ BASE=${1:-${DEFAULT_BASE}}
 USE_MB=${2:-"MB_NO"}
 
 # Dependent module branches (empty = master)
-PVCOMMON_BRANCH=""
-PVDATA_BRANCH=""
+PVCOMMON_BRANCH="Release-4.1-"
+PVDATA_BRANCH="Release-5.0-"
 
 ###########################################
 # Fetch and unpack dependencies

jenkins/cloudbees_doc

@@ -10,11 +10,10 @@
 # All rights reserved. Use is subject to license terms.
 
 ###########################################
-# Determine EPICS Base version
+# Set EPICS Base version and upload target
 
-DEFAULT_BASE=3.14.12.5
-
-BASE=${1:-${DEFAULT_BASE}}
+BASE=3.15.2
+PUBLISH=${1:-DONT}
 
 ###########################################
 # Fetch and unpack dependencies
@@ -43,4 +42,10 @@ doxygen
 ###########################################
 # Publish
 
-rsync -aqP --delete -e ssh documentation epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/normativeTypesCPP/tip
+if [ "${PUBLISH}" != "DONT" ]; 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/normativeTypesCPP/${PUBLISH}/DUMMY
+
+    rsync -aqP --delete -e ssh documentation epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/normativeTypesCPP/${PUBLISH}/
+fi

src/nt/nttable.h

@@ -53,7 +53,7 @@ namespace detail {
          * @param elementType column type, a scalar array.
          * @return this instance of <b>NTTableBuilder</b>.
          */
-        shared_pointer addColumn(std::string const & name, epics::pvData::ScalarType elememtType);
+        shared_pointer addColumn(std::string const & name, epics::pvData::ScalarType elementType);
 
         /**
          * Add descriptor field to the NTTable.

src/nt/nturi.h

@@ -74,14 +74,6 @@ namespace detail {
          */
          shared_pointer addQueryInt(std::string const & name);
 
-        /**
-         * Add a column of given <b>Scalar</b> type.
-         * @param name name of the column.
-         * @param elementType column type, a scalar array.
-         * @return this instance of <b>NTURIBuilder</b>.
-         */
-        //shared_pointer addColumn(std::string const & name, epics::pvData::ScalarType elememtType);
-
         /**
          * Create a <b>Structure</b> that represents NTURI.
          * This resets this instance state and allows new instance to be created.