From a36443557b8bbd1c5535280c8da2f4aed6184297 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 31 Oct 2016 17:03:35 -0500 Subject: [PATCH 1/5] Set version to 3.14.12.6-rc1 --- configure/CONFIG_BASE_VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure/CONFIG_BASE_VERSION b/configure/CONFIG_BASE_VERSION index 43b79f233..00ae748d8 100644 --- a/configure/CONFIG_BASE_VERSION +++ b/configure/CONFIG_BASE_VERSION @@ -26,17 +26,17 @@ EPICS_REVISION = 14 # EPICS_MODIFICATION must be a number >=0 and <256 EPICS_MODIFICATION = 12 -# EPICS_PATCH_LEVEL must be a number (win32 resource file requirement) +# EPICS_PATCH_LEVEL must be a number (win32 resource file requirement) # Not included if zero EPICS_PATCH_LEVEL = 6 # This will end in -DEV between official releases #EPICS_DEV_SNAPSHOT=-DEV #EPICS_DEV_SNAPSHOT=-pre1 -EPICS_DEV_SNAPSHOT=-pre1-DEV +#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 From 67daaaa9b7518a465b45ea58e4ba0b7db305395c Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 31 Oct 2016 17:06:19 -0500 Subject: [PATCH 2/5] Set snapshot to -rc1-DEV --- configure/CONFIG_BASE_VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure/CONFIG_BASE_VERSION b/configure/CONFIG_BASE_VERSION index 00ae748d8..decbf9280 100644 --- a/configure/CONFIG_BASE_VERSION +++ b/configure/CONFIG_BASE_VERSION @@ -36,8 +36,8 @@ EPICS_PATCH_LEVEL = 6 #EPICS_DEV_SNAPSHOT=-pre1-DEV #EPICS_DEV_SNAPSHOT=-pre2 #EPICS_DEV_SNAPSHOT=-pre2-DEV -EPICS_DEV_SNAPSHOT=-rc1 -#EPICS_DEV_SNAPSHOT=-rc1-DEV +#EPICS_DEV_SNAPSHOT=-rc1 +EPICS_DEV_SNAPSHOT=-rc1-DEV #EPICS_DEV_SNAPSHOT=-rc2 #EPICS_DEV_SNAPSHOT=-rc2-DEV #EPICS_DEV_SNAPSHOT= From aa6e976f92d144b5143cf267d8b2781d3ec8b62b Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 4 Nov 2016 17:18:14 -0500 Subject: [PATCH 3/5] Add .local includes to makeBaseApp templates --- src/makeBaseApp/top/configure/CONFIG_SITE | 7 +++++++ src/makeBaseApp/top/configure/RELEASE | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/src/makeBaseApp/top/configure/CONFIG_SITE b/src/makeBaseApp/top/configure/CONFIG_SITE index 92156d971..9b443bfbe 100644 --- a/src/makeBaseApp/top/configure/CONFIG_SITE +++ b/src/makeBaseApp/top/configure/CONFIG_SITE @@ -29,3 +29,10 @@ CHECK_RELEASE = YES # to the install location. This may be needed to boot from # a Microsoft FTP server say, or on some NFS configurations. #IOCS_APPL_TOP = + +# These allow developers to override the CONFIG_SITE variable +# settings without having to modify the configure/CONFIG_SITE +# file itself. +-include $(TOP)/../CONFIG_SITE.local +-include $(TOP)/configure/CONFIG_SITE.local + diff --git a/src/makeBaseApp/top/configure/RELEASE b/src/makeBaseApp/top/configure/RELEASE index ba28bcb26..dbd742b45 100644 --- a/src/makeBaseApp/top/configure/RELEASE +++ b/src/makeBaseApp/top/configure/RELEASE @@ -35,3 +35,9 @@ EPICS_BASE = _EPICS_BASE_ # Set RULES here if you want to use build rules from somewhere # other than EPICS_BASE: #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)/configure/RELEASE.local + From f1439f8b1c5ee21285415344fc1aac9562ca0dbd Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 15 Nov 2016 09:56:42 -0600 Subject: [PATCH 4/5] Fix epicsStdioTest for MS 2015 compiler --- src/libCom/test/epicsStdioTest.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/libCom/test/epicsStdioTest.c b/src/libCom/test/epicsStdioTest.c index 54fc3a48a..a2c57ecac 100644 --- a/src/libCom/test/epicsStdioTest.c +++ b/src/libCom/test/epicsStdioTest.c @@ -38,7 +38,14 @@ static void testEpicsSnprintf(void) { const char *expected = exbuffer; int size; int rtn, rlen; - + +#ifdef _WIN32 +#if (defined(_MSC_VER) && _MSC_VER < 1900) || \ + (defined(_MINGW) && defined(_TWO_DIGIT_EXPONENT)) + _set_output_format(_TWO_DIGIT_EXPONENT); +#endif +#endif + sprintf(exbuffer, format, ivalue, fvalue, svalue); rlen = strlen(expected)+1; @@ -122,11 +129,7 @@ void testStdoutRedir (const char *report) MAIN(epicsStdioTest) { -#ifdef _WIN32 - testPlan(166); -#else testPlan(163); -#endif testEpicsSnprintf(); testStdoutRedir("report"); return testDone(); From 0f7f4710c6a6c9e8fe94c2527d050928405aa296 Mon Sep 17 00:00:00 2001 From: Wang Xiaoqiang Date: Wed, 30 Nov 2016 11:58:24 -0600 Subject: [PATCH 5/5] PCAS dynamic array support for GDD container types --- src/cas/generic/casStrmClient.cc | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/cas/generic/casStrmClient.cc b/src/cas/generic/casStrmClient.cc index 6cfab04dd..e23a2b8df 100644 --- a/src/cas/generic/casStrmClient.cc +++ b/src/cas/generic/casStrmClient.cc @@ -856,8 +856,20 @@ caStatus casStrmClient::monitorResponse ( casChannelI & chan, const caHdrLargeArray & msg, const gdd & desc, const caStatus completionStatus ) { + aitUint32 elementCount = 0; + if (desc.isContainer()) { + aitUint32 index; + int gdds = gddApplicationTypeTable::app_table.mapAppToIndex + ( desc.applicationType(), gddAppType_value, index ); + if ( gdds ) { + return S_cas_badType; + } + elementCount = desc.getDD(index)->getDataSizeElements(); + } else { + elementCount = desc.getDataSizeElements(); + } ca_uint32_t count = (msg.m_count == 0) ? - (ca_uint32_t)desc.getDataSizeElements() : + (ca_uint32_t)elementCount : msg.m_count; void * pPayload = 0;