From 1da56916382e0c31a6692c80e30832bb2d1550ca Mon Sep 17 00:00:00 2001
From: Giles Knap <giles.knap@diamond.ac.uk>
Date: Tue, 7 Nov 2023 16:41:14 +0000
Subject: [PATCH] update support yaml generator script

---
 ADAravis/ADAravis.ibek.support.yaml |  4 ++++
 ADCore/ADCore.ibek.support.yaml     |  2 +-
 build_support.sh                    | 14 +++++++++++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ADAravis/ADAravis.ibek.support.yaml b/ADAravis/ADAravis.ibek.support.yaml
index dcbd3aa..fe91411 100644
--- a/ADAravis/ADAravis.ibek.support.yaml
+++ b/ADAravis/ADAravis.ibek.support.yaml
@@ -3,10 +3,12 @@
 module: ADAravis
 
 defs:
+
   - name: aravisCamera
     description: |-
       Creates a aravisCamera camera areaDetector driver
     args:
+
       - type: str
         name: P
         description: |-
@@ -91,6 +93,7 @@ defs:
         default: 0
 
     databases:
+
       - file: $(ADARAVIS)/db/aravisCamera.template
         args:
           P:
@@ -108,6 +111,7 @@ defs:
           ADDR:
 
     pre_init:
+
       - value: |
           # aravisConfig(const char *portName, const char *cameraName, size_t maxMemory, int priority, int stackSize)
           aravisConfig("{{PORT}}", "{{ID}}", {{MEMORY}}, 0, 1)
diff --git a/ADCore/ADCore.ibek.support.yaml b/ADCore/ADCore.ibek.support.yaml
index 226f1a2..57a9a41 100644
--- a/ADCore/ADCore.ibek.support.yaml
+++ b/ADCore/ADCore.ibek.support.yaml
@@ -881,7 +881,7 @@ defs:
           FLOAT:
           CHAR:
 
-      - type: str
+      - type: int
         name: NELEMENTS
         description: |-
           Number of elements
diff --git a/build_support.sh b/build_support.sh
index e01975d..90dec4b 100755
--- a/build_support.sh
+++ b/build_support.sh
@@ -2,7 +2,7 @@
 
 # This script is used to generate support YAML for ibek from the latest
 # released versions of builder support modules at DLS
-# as of 26/09/2023
+# as of 07/11/2023
 
 # assumes ibek is a peer to this folder's parent (as ibek-support is usually
 # a submodule of an ioc-xxxx) Adjust Path if this is not the case.
@@ -11,9 +11,17 @@ set -xe
 cd $(realpath $(dirname $0))
 PATH=$PATH:$(realpath ../../ibek)
 
+# overrides coerce NELEMENTS to int
+builder2ibek.support.py /dls_sw/prod/R3.14.12.7/support/ADCore/3-12-1dls3 ADCore/ADCore.ibek.support.yaml -o '193:10 178:10'
+builder2ibek.support.py /dls_sw/prod/R3.14.12.7/support/ADAravis/2-2-1dls16/ ADAravis/ADAravis.ibek.support.yaml
+# fixup ADAravis template path to parameterised by CLASS and repair comment in startup script
+sed -i ADAravis/ADAravis.ibek.support.yaml -e 's`db/AVT_Mako_1_52.template`db/{{CLASS}}.template`' -e 's/aravisConfig(const/# aravisConfig(const/'
+# remove the PV_ALIAS argument
+sed -i -r '71,78d' ADAravis/ADAravis.ibek.support.yaml
+
+
+exit 0
 
-builder2ibek.support.py /dls_sw/prod/R3.14.12.7/support/ADCore/3-9dls3alpha/ ADCore/ADCore.ibek.support.yaml
-builder2ibek.support.py /dls_sw/prod/R3.14.12.7/support/ADAravis/2-2-1dls9/ ADAravis/ADAravis.ibek.support.yaml
 builder2ibek.support.py /dls_sw/prod/R3.14.12.7/support/zebra/2-9-2 zebra/zebra.ibek.support.yaml