From ea9068a10bf08816d018cfd0e077765a3bf9aee9 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Mon, 26 Jun 2023 12:42:04 -0700
Subject: [PATCH] 1.2.2a1

---
 configure/CONFIG_PVXS_VERSION  |  5 +++--
 documentation/ioc.rst          | 14 ++++++++++++--
 documentation/releasenotes.rst |  7 +++++++
 setup.py                       |  2 +-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/configure/CONFIG_PVXS_VERSION b/configure/CONFIG_PVXS_VERSION
index a4bf090..b40b0ab 100644
--- a/configure/CONFIG_PVXS_VERSION
+++ b/configure/CONFIG_PVXS_VERSION
@@ -1,6 +1,6 @@
 PVXS_MAJOR_VERSION = 1
 PVXS_MINOR_VERSION = 2
-PVXS_MAINTENANCE_VERSION = 1
+PVXS_MAINTENANCE_VERSION = 2
 
 # Version range conditions in Makefiles
 #
@@ -12,7 +12,8 @@ PVXS_MAINTENANCE_VERSION = 1
 #
 # ifneq ($(PVXS_X_Y_Z),YES)   # PVXS != X.Y.Z
 #
-PVXS_1_2_1 = YES
+PVXS_1_2_2 = YES
+PVXS_1_2_1 = NO
 PVXS_1_2_0 = NO
 PVXS_1_1_4 = NO
 PVXS_1_1_3 = NO
diff --git a/documentation/ioc.rst b/documentation/ioc.rst
index 290c611..07b2193 100644
--- a/documentation/ioc.rst
+++ b/documentation/ioc.rst
@@ -88,8 +88,10 @@ in the IOC (aka. RSRV).
 
 So ``caget pv:name`` and ``pvxget pv:name`` should be functionally equivalent.
 
-Additionally, adding a ``$`` suffix when addressing a ``DBF_STRING`` or ``DBF_*LINK`` field
-will make it visible as a PVA string.
+Beginning with UNRELEASED, long string detection is automatic in some cases.
+eg. ``.NAME`` and ``.INP``.
+In some situations adding a ``$`` suffix is still necessary when addressing
+a ``DBF_STRING`` or ``DBF_*LINK`` field to make it visible as a PVA string.
 It will not be necessary for clients to interpret a ``char[]`` as a "long string". ::
 
     # eg.
@@ -104,6 +106,14 @@ which is used by some OPI clients. ::
         info(Q:form, "Hex") # hint to clients to render as hexadecimal
     }
 
+or: ::
+
+    record(waveform, "my:long:string") {
+        field(FTVL, "CHAR")
+        field(NELM, "1024")
+        info(Q:form, "String") # hint to QSRV to expose char[] as string
+    }
+
 Currently supported format hints are:
 
 - Default
diff --git a/documentation/releasenotes.rst b/documentation/releasenotes.rst
index 327ef57..6c18959 100644
--- a/documentation/releasenotes.rst
+++ b/documentation/releasenotes.rst
@@ -3,6 +3,13 @@
 Release Notes
 =============
 
+1.2.2 (UNRELEASED)
+------------------
+
+* IOC: improve long string detection.
+* Changes to Tree output format for ``Value``.
+* Applied various bug fixes for issued detected by static analysis.  All believed to be minor.
+
 1.2.1 (June 2023)
 -----------------
 
diff --git a/setup.py b/setup.py
index ec3b9d1..7a910e3 100755
--- a/setup.py
+++ b/setup.py
@@ -692,7 +692,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()