diff --git a/documentation/ioc.rst b/documentation/ioc.rst index 7e02c1d..290c611 100644 --- a/documentation/ioc.rst +++ b/documentation/ioc.rst @@ -44,7 +44,7 @@ Adding custom PVs to Server QSRV 2 ###### -Beginning with PVXS UNRELEASED the functionality of `QSRV `_ +Beginning with PVXS 1.2.0 the functionality of `QSRV `_ is replicated in the ``pvxsIoc`` library. Currently this feature preview is considered **alpha** level, with missing functionality. In addition to linking in ``libpvxsIoc``, diff --git a/documentation/releasenotes.rst b/documentation/releasenotes.rst index 19fafdf..f6e1442 100644 --- a/documentation/releasenotes.rst +++ b/documentation/releasenotes.rst @@ -3,8 +3,8 @@ Release Notes ============= -1.2.0 (UNRELEASED) ------------------- +1.2.0 (May 2023) +---------------- * server: fix default monitor queueSize to 4 * improve localhost multicast forwarding diff --git a/ioc/pvxs/iochooks.h b/ioc/pvxs/iochooks.h index 01d8db3..6559041 100644 --- a/ioc/pvxs/iochooks.h +++ b/ioc/pvxs/iochooks.h @@ -76,7 +76,7 @@ server::Server server(); * @param jsonFilename the json file containing the group definitions * @param macros NULL, or a comma separated list of macro definitions. eg. "KEY=VAL,OTHER=SECOND" * @return 0 for success, 1 for failure - * @since UNRELEASED + * @since 1.2.0 */ PVXS_IOC_API long dbLoadGroup(const char* jsonFilename, const char* macros=nullptr); @@ -85,7 +85,7 @@ long dbLoadGroup(const char* jsonFilename, const char* macros=nullptr); * * Shutdown QSRV. Only needed with Base <= 7.0.4 . * Since 7.0.4, QSRV shutdown occurs during testIocShutdownOk() . - * @since UNRELEASED + * @since 1.2.0 */ PVXS_IOC_API void testShutdown(); diff --git a/setup.py b/setup.py index b70e875..63867a8 100755 --- a/setup.py +++ b/setup.py @@ -682,7 +682,7 @@ build_dso.sub_commands.extend([ pvxs_ver = '%(PVXS_MAJOR_VERSION)s.%(PVXS_MINOR_VERSION)s.%(PVXS_MAINTENANCE_VERSION)s'%pvxsversion -pvxs_ver += 'a1' +#pvxs_ver += 'a1' with open(os.path.join(os.path.dirname(__file__), 'README.md')) as F: long_description = F.read() diff --git a/src/pvxs/nt.h b/src/pvxs/nt.h index 30deb70..3736fc7 100644 --- a/src/pvxs/nt.h +++ b/src/pvxs/nt.h @@ -69,7 +69,7 @@ struct NTScalar { bool valueAlarm; /** Include 'display.form' and 'display.precision' when 'value' is a numeric type * @pre requires display=true - * @since UNRELEASED + * @since 1.2.0 */ bool form; diff --git a/src/pvxs/source.h b/src/pvxs/source.h index ff33d8b..cdc868d 100644 --- a/src/pvxs/source.h +++ b/src/pvxs/source.h @@ -62,7 +62,7 @@ struct MonitorStat { //! Negotiated limit on nQueue size_t limitQueue=0; //! Number of updates squashed during post() calss - //! @since UNRELEASED + //! @since 1.2.0 size_t nSquash=0; bool running=false; diff --git a/src/pvxs/unittest.h b/src/pvxs/unittest.h index 2191cbe..51b64d8 100644 --- a/src/pvxs/unittest.h +++ b/src/pvxs/unittest.h @@ -23,8 +23,8 @@ namespace pvxs { /** Prepare for testing. Call after testPlan() - * @since UNRELEASED If linked with pvxsIoc library, PVA server started - * by ``iocInit()`` will use "isolated" configuration. + * @since 1.2.0 If linked with pvxsIoc library, PVA server started + * by ``iocInit()`` will use "isolated" configuration. */ PVXS_API void testSetup();