Release: Merge alpha 7.142.80 into stable

MDSplus · May 21, 2024 · 997b0d8 · 997b0d8
2 parents a4dd26c + 0ac427c
commit 997b0d8
Show file tree

Hide file tree

Showing 134 changed files with 10,920 additions and 14,819 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,6 +4,7 @@ def OSList = [
     'ubuntu18',
     'ubuntu20',
     'ubuntu22',
+    'ubuntu24',
     'rhel7',
     'rhel8',
     'rhel9',
@@ -13,6 +14,7 @@ def OSList = [
     'debian9-64',
     'debian10-64',
     'debian11-64',
+    'debian12-64',
     'test-asan',
     'test-tsan',
     'test-ubsan',
@@ -39,6 +41,7 @@ if (BRANCH_NAME == "stable") {
 }
 
 def new_version = '0.0.0';
+def new_tag = null;
 
 def release_file_list = [];
 
@@ -105,6 +108,8 @@ pipeline {
                         if (new_version == '0.0.0') {
                             error "Failed to calculate new version"
                         }
+
+                        new_tag = "${BRANCH_NAME}_release-" + new_version.replaceAll("\\.", "-")
 
                         echo "Calculated new version to be ${new_version}"
                     }
@@ -121,10 +126,14 @@ pipeline {
                                 ws("${WORKSPACE}/${OS}") {
                                     stage("${OS} Clone") {
                                         checkout scm;
+
+                                        if (new_tag) {
+                                            sh "git tag ${new_tag} || true"
+                                        }
                                     }
 
                                     stage("${OS} Bootstrap") {
-                                        sh "./deploy/build.sh --os=bootstrap --branch=${BRANCH_NAME} --version=${new_version}"
+                                        sh "./deploy/build.sh --os=bootstrap --branch=${BRANCH_NAME}"
 
                                         if (OS.endsWith("armhf")) {
                                             sh "docker run --rm --privileged multiarch/qemu-user-static:register --reset"
@@ -146,7 +155,7 @@ pipeline {
 
                                     if (!OS.startsWith("test-")) {
                                         stage("${OS} Release") {
-                                            sh "./deploy/build.sh --os=${OS} --release --branch=${BRANCH_NAME} --version=${new_version}"
+                                            sh "./deploy/build.sh --os=${OS} --release --branch=${BRANCH_NAME} --version=${new_version} --keys=/mdsplus/certs"
 
                                             findFiles(glob: "packages/*.tgz").each {
                                                 file -> release_file_list.add(WORKSPACE + "/" + file.path)
@@ -220,8 +229,7 @@ pipeline {
 
                     stage("Publish to GitHub") {
                         ws("${WORKSPACE}/publish") {
-                            def tag = "${BRANCH_NAME}_release-" + new_version.replaceAll("\\.", "-")
-                            echo "Creating GitHub Release and Tag for ${tag}"
+                            echo "Creating GitHub Release and Tag for ${new_tag}"
                             withCredentials([
                                 usernamePassword(
                                     credentialsId: 'MDSplusJenkins',
@@ -231,7 +239,7 @@ pipeline {
 
                                 // TODO: Protect against spaces in filenames
                                 def release_file_list_arg = release_file_list.join(" ")
-                                sh "./deploy/create_github_release.py --tag ${tag} --api-token \$GITHUB_ACCESS_TOKEN ${release_file_list_arg}"
+                                sh "./deploy/create_github_release.py --tag ${new_tag} --api-token \$GITHUB_ACCESS_TOKEN ${release_file_list_arg}"
                             }
 
                         }

diff --git a/_include/_mdsversion.h.in b/_include/_mdsversion.h.in
@@ -8,6 +8,7 @@
 #define VERSIONCONST CONCAT(LIBPREFIX, Version)
 #define GETRELEASE CONCAT(LIBPREFIX, Release)
 #define GETRELEASEDSC CONCAT(LIBPREFIX, ReleaseDsc)
+#define GETRELEASEDATE CONCAT(LIBPREFIX, ReleaseDate)
 
 EXPORT
 const mds_version_t VERSIONCONST = {
@@ -17,14 +18,15 @@ const mds_version_t VERSIONCONST = {
 	"@RELEASE_BRANCH@",
 };
 
-
 static pthread_once_t once = PTHREAD_ONCE_INIT;
 static char tag[64];
 static mdsdsc_t RELEASE_D = { 0, DTYPE_T, CLASS_S, tag };
 
+static const char release_date[64] = "@RELEASE_DATE@";
+
 static void buildtag()
 {
-	RELEASE_D.length = snprintf(tag, sizeof(tag), "%.12s_release_%d.%d.%d",
+	RELEASE_D.length = snprintf(tag, sizeof(tag), "%.12s_release-%d-%d-%d",
 	VERSIONCONST.BRANCH,
 	VERSIONCONST.MAJOR,
 	VERSIONCONST.MINOR,
@@ -44,3 +46,9 @@ const mdsdsc_t *GETRELEASEDSC()
 	pthread_once(&once, buildtag);
 	return &RELEASE_D;
 }
+
+EXPORT
+const char *GETRELEASEDATE()
+{
+	return release_date;
+}
diff --git a/_include/mdsmsg.h b/_include/mdsmsg.h
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <time.h>
+#include <string.h>
 
+// To activate the MDSDBG() debug messages, uncomment the following line.
 //#define DEBUG
 //#undef DEBUG
 #ifdef MDSDBG
@@ -27,7 +29,7 @@
 #define __MDSMSGPREFIX(LV) (                                  \
     {                                                         \
       pos = __FILE__;                                         \
-      while (!strncmp(pos, "../", 3))                         \
+      while (!strncmp(pos, "../", (unsigned long int) 3))                         \
         pos += 3;                                             \
       pos = msg + sprintf(msg, "%c, %u:%lu, %u.%09u: %s:%d ", \
                           LV, getpid(), CURRENT_THREAD_ID(),  \

diff --git a/configure.ac b/configure.ac
@@ -533,6 +533,7 @@ esac
 
 # add specific flags for fortran depending on compiler version
 AX_FORTRAN_FLAGS([FCFLAGS])
+AX_C_FLAGS([CFLAGS])
 
 AC_CHECK_SIZEOF(long)
 

diff --git a/deploy/os/debian12-64.opts b/deploy/os/debian12-64.opts
@@ -0,0 +1 @@
+--platform=debian --valgrind=memcheck,helgrind --dockerimage=mdsplus/builder:debian_bookworm-64 --distname=DebianBookworm --arch=amd64
diff --git a/deploy/os/ubuntu24.opts b/deploy/os/ubuntu24.opts
@@ -0,0 +1 @@
+--platform=debian --valgrind=memcheck,helgrind --dockerimage=mdsplus/builder:ubuntu24-64 --distname=Ubuntu24 --arch=amd64
diff --git a/deploy/packaging/debian/kernel.noarch b/deploy/packaging/debian/kernel.noarch
@@ -231,6 +231,7 @@
 ./usr/local/mdsplus/tdi/treeshr/TreeOpenEdit.fun
 ./usr/local/mdsplus/tdi/treeshr/TreeOpenNew.fun
 ./usr/local/mdsplus/tdi/treeshr/TreePut.fun
+./usr/local/mdsplus/tdi/treeshr/TreePutDeserialized.fun
 ./usr/local/mdsplus/tdi/treeshr/TreePutRecord.fun
 ./usr/local/mdsplus/tdi/treeshr/TreeQuit.fun
 ./usr/local/mdsplus/tdi/treeshr/TreeSetCurrentShot.fun

diff --git a/deploy/packaging/debian/matlab.noarch b/deploy/packaging/debian/matlab.noarch
@@ -16,8 +16,10 @@
 ./usr/local/mdsplus/matlab/private/javaConnect.m
 ./usr/local/mdsplus/matlab/private/javaExecute.m
 ./usr/local/mdsplus/matlab/private/javaFromMatlab.m
+./usr/local/mdsplus/matlab/private/javaFromMatlabCell.m
 ./usr/local/mdsplus/matlab/private/javaFromMatlabStruct.m
 ./usr/local/mdsplus/matlab/private/javaToMatlab.m
+./usr/local/mdsplus/matlab/private/javaToMatlabCell.m
 ./usr/local/mdsplus/matlab/private/javaToMatlabStruct.m
 ./usr/local/mdsplus/matlab/private/pythonActivate.m
 ./usr/local/mdsplus/matlab/private/pythonConnect.m

diff --git a/deploy/packaging/debian/python.noarch b/deploy/packaging/debian/python.noarch
@@ -13,6 +13,7 @@
 ./usr/local/mdsplus/python/MDSplus/mdsdcl.py
 ./usr/local/mdsplus/python/MDSplus/mdsscalar.py
 ./usr/local/mdsplus/python/MDSplus/modpython.py
+./usr/local/mdsplus/python/MDSplus/pyproject.toml
 ./usr/local/mdsplus/python/MDSplus/scope.py
 ./usr/local/mdsplus/python/MDSplus/setup.py
 ./usr/local/mdsplus/python/MDSplus/pyproject.toml

diff --git a/deploy/packaging/debian/rfxdevices.noarch b/deploy/packaging/debian/rfxdevices.noarch
@@ -30,9 +30,12 @@
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_COMPONENT.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_CONVERSION.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_DOUBLEH_MASTER.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_DOUBLEH_SLAVE.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_DTACQAI.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_DTACQAO.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_DUTY_CYCLE.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_EPICSCA.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_EPICS_IN.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_EPICS_OUT.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_EXPR.py
@@ -51,13 +54,19 @@
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_NI6368_DAC.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_NI6368_DO.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_NI6368_SYNCH_DI.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_OPCUA_IN.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_OPCUA_OUT.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_OPCUA_SERVER.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_OUT.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_PYTHON.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_PYTHON_GENERIC.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_PYTHON_PID.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_PYTHON_PWM.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_RAMP.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_RESAMPLER.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_RFXMODEL.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_RTNIN.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_RTNOUT.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_RTSM.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_SIMULINK.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_SIMULINK_DTT.py

diff --git a/deploy/packaging/linux.xml b/deploy/packaging/linux.xml
@@ -836,6 +836,12 @@ rm -f /etc/ld.so.conf.d/mdsplus.conf 2&gt;/dev/null
  </packages>
 
  <!-- dist first -->
+  <external_packages dist="Ubuntu24">
+   <numpy package="python3-numpy"/>
+   <java package="java-runtime"/>
+   <readline package="libreadline8"/>
+ </external_packages>
+
  <external_packages dist="Ubuntu22">
    <numpy package="python3-numpy"/>
    <java package="java-runtime"/>
@@ -848,6 +854,12 @@ rm -f /etc/ld.so.conf.d/mdsplus.conf 2&gt;/dev/null
    <readline package="libreadline8"/>
  </external_packages>
 
+ <external_packages dist="DebianBookworm">
+   <numpy package="python3-numpy"/>
+   <java package="java-runtime"/>
+   <readline package="libreadline8"/>
+ </external_packages>
+
  <external_packages dist="DebianBullseye">
    <numpy package="python3-numpy"/>
    <java package="java-runtime"/>

diff --git a/deploy/packaging/redhat/kernel.noarch b/deploy/packaging/redhat/kernel.noarch
@@ -263,6 +263,7 @@
 ./usr/local/mdsplus/tdi/treeshr/TreeOpenEdit.fun
 ./usr/local/mdsplus/tdi/treeshr/TreeOpenNew.fun
 ./usr/local/mdsplus/tdi/treeshr/TreePut.fun
+./usr/local/mdsplus/tdi/treeshr/TreePutDeserialized.fun
 ./usr/local/mdsplus/tdi/treeshr/TreePutRecord.fun
 ./usr/local/mdsplus/tdi/treeshr/TreeQuit.fun
 ./usr/local/mdsplus/tdi/treeshr/TreeSetCurrentShot.fun

diff --git a/deploy/packaging/redhat/matlab.noarch b/deploy/packaging/redhat/matlab.noarch
@@ -18,8 +18,10 @@
 ./usr/local/mdsplus/matlab/private/javaConnect.m
 ./usr/local/mdsplus/matlab/private/javaExecute.m
 ./usr/local/mdsplus/matlab/private/javaFromMatlab.m
+./usr/local/mdsplus/matlab/private/javaFromMatlabCell.m
 ./usr/local/mdsplus/matlab/private/javaFromMatlabStruct.m
 ./usr/local/mdsplus/matlab/private/javaToMatlab.m
+./usr/local/mdsplus/matlab/private/javaToMatlabCell.m
 ./usr/local/mdsplus/matlab/private/javaToMatlabStruct.m
 ./usr/local/mdsplus/matlab/private/pythonActivate.m
 ./usr/local/mdsplus/matlab/private/pythonConnect.m

diff --git a/deploy/packaging/redhat/python.noarch b/deploy/packaging/redhat/python.noarch
@@ -14,6 +14,7 @@
 ./usr/local/mdsplus/python/MDSplus/mdsdcl.py
 ./usr/local/mdsplus/python/MDSplus/mdsscalar.py
 ./usr/local/mdsplus/python/MDSplus/modpython.py
+./usr/local/mdsplus/python/MDSplus/pyproject.toml
 ./usr/local/mdsplus/python/MDSplus/scope.py
 ./usr/local/mdsplus/python/MDSplus/setup.py
 ./usr/local/mdsplus/python/MDSplus/pyproject.toml

diff --git a/deploy/packaging/redhat/rfxdevices.noarch b/deploy/packaging/redhat/rfxdevices.noarch
@@ -31,9 +31,12 @@
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_COMPONENT.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_CONVERSION.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_DOUBLEH_MASTER.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_DOUBLEH_SLAVE.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_DTACQAI.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_DTACQAO.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_DUTY_CYCLE.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_EPICSCA.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_EPICS_IN.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_EPICS_OUT.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_EXPR.py
@@ -52,13 +55,19 @@
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_NI6368_DAC.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_NI6368_DO.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_NI6368_SYNCH_DI.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_OPCUA_IN.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_OPCUA_OUT.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_OPCUA_SERVER.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_OUT.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_PYTHON.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_PYTHON_GENERIC.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_PYTHON_PID.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_PYTHON_PWM.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_RAMP.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_RESAMPLER.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_RFXMODEL.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_RTNIN.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_RTNOUT.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_RTSM.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_SIMULINK.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_SIMULINK_DTT.py

diff --git a/deploy/platform/bootstrap/bootstrap_build.sh b/deploy/platform/bootstrap/bootstrap_build.sh
@@ -14,5 +14,7 @@ trap cleanup EXIT INT
 docker run -t -a stdout -a stderr --cidfile=$cid \
    -u $(id -u):$(id -g) --privileged \
    -e "HOME=/tmp" \
+   -e "BRANCH" \
+   -e "RELEASE_VERSION" \
    -v "${SRCDIR}:${DOCKER_SRCDIR}" \
    ${DOCKERIMAGE} "${DOCKER_SRCDIR}/bootstrap"
diff --git a/include/mdsobjects.h b/include/mdsobjects.h
@@ -4504,9 +4504,10 @@ namespace MDSplus
       closeAllTrees();
     }
     void setDefault(char *path);
-    Data *get(const char *expr, Data **args, int nArgs);
+    Data *get(const char *expr, Data **args, int nArgs, bool serialized = true);
     Data *get(const char *expr) { return get(expr, 0, 0); }
     void put(const char *path, char *expr, Data **args, int nArgs);
+    void put(const char *path, Data *data);
     PutMany *putMany() { return new PutMany(this); }
     GetMany *getMany() { return new GetMany(this); }
     // Get TreeNode instance for (a subset of) TreeNode functionality in thin