From c789406f0b279d31c76e30b2a4c6aa7f23b6aa08 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 6 Dec 2017 20:39:49 -0600 Subject: [PATCH 1/4] Include /../RELEASE..local --- configure/RELEASE | 52 ++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 19 deletions(-) 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 From 74d381e68cecf17d6e016c47d78078c6b315b81b Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 6 Dec 2017 22:45:00 -0600 Subject: [PATCH 2/4] Use EPICS_BASE_PVA_CORE_LIBS --- src/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index 52d3327..bfdbb0b 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 - From b5291d96196825fd2ce5d7ce47559b1dddf3449e Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 14 Dec 2017 18:55:23 -0600 Subject: [PATCH 3/4] Update/fix version numbers in documentation --- documentation/RELEASE_NOTES.md | 18 +++++++++--------- documentation/pvaClientCPP.html | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/documentation/RELEASE_NOTES.md b/documentation/RELEASE_NOTES.md index 628422d..44b57da 100644 --- a/documentation/RELEASE_NOTES.md +++ b/documentation/RELEASE_NOTES.md @@ -1,10 +1,10 @@ -EPICS V4 release 4.7 -==================== +pvaClientCPP Version 4.3.0 +========================== -Works with release/7.0 of pvDataCPP and release/6.0 of pvAccessCPP ------------------------------------------------------------------- +Works with pvDataCPP-7.0 and pvAccessCPP-6.0 versions +----------------------------------------------------- -Will not work with older versions. +Will not work with older versions of these modules. destroy methods removed ----------------------- @@ -42,8 +42,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. @@ -51,8 +51,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

From dcda03c9fccc96058a4a70e6c008d42cd02d1719 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Tue, 19 Dec 2017 09:20:11 +0100 Subject: [PATCH 4/4] jenkins-ci: fix CloudBees doc job --- jenkins/cloudbees_doc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) 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 }