Release: Update stable to alpha 7.140.68

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Affiliation**
+What University / Laboratory / Company are you from, if any?
+
+**Version(s) Affected**
+The MDSplus Version(s) affected, if any.
+
+**Platform**
+The Operating System you're running on.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Affiliation**
+What University / Laboratory / Company are you from, if any?
+
+**Description**
+A description of the feature or enhancement you would like to see.
+
+**Example**
+An example of the feature you would like, using pseudocode if helpful.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,14 @@
+---
+name: Question
+about: Ask a question, ask for help, ask for clarification
+title: ''
+labels: question
+assignees: ''
+
+---
+
+**Affiliation**
+What University / Laboratory / Company are you from, if any?
+
+**Question**
+What is your question?

.gitignore

@@ -49,7 +49,8 @@ camshr/cts_commands.c
 
 # vi autosave files
 *~
-
+#vs code autosave files
+*.swp
 # python compiled files
 *.pyc
 __pycache__/

Jenkinsfile

@@ -0,0 +1,251 @@
+
+def OSList = [
+    'windows',
+    'ubuntu18',
+    'ubuntu20',
+    'ubuntu22',
+    'rhel7',
+    'rhel8',
+    'rhel9',
+    // 'alpine3.9-armhf',
+    // 'alpine3.9-x86_64',
+    // 'alpine3.9-x86',
+    'debian9-64',
+    'debian10-64',
+    'debian11-64',
+    'test-asan',
+    'test-tsan',
+    'test-ubsan',
+]
+
+def AdminList = [
+    'AndreaRigoni',
+    'GabrieleManduchi',
+    'joshStillerman',
+    'mwinkel-dev',
+    'santorofer',
+    'tfredian',
+    'WhoBrokeTheBuild',
+    'zack-vii',
+    'dgarnier',
+]
+
+def schedule = "";
+if (BRANCH_NAME == "alpha") {
+    schedule = "0 18 * * *";
+}
+if (BRANCH_NAME == "stable") {
+    schedule = "0 19 * * *";
+}
+
+def new_version = '0.0.0';
+
+def release_file_list = [];
+
+pipeline {
+    agent any
+
+    options {
+        skipDefaultCheckout()
+        timeout(time: 1, unit: 'HOURS')
+    }
+    triggers {
+        cron(schedule)
+        issueCommentTrigger('(?i).*retest\\s+this\\s+please.*')
+    }
+
+    stages {
+
+        stage('Setup') {
+            steps {
+                sh 'printenv'
+
+                script {
+                    // is PR
+                    if (env.CHANGE_ID) {
+                        // This is safe because untrusted PRs will use Jenkinsfile from the target branch
+                        if (env.GITHUB_COMMENT_AUTHOR) {
+                            if (!AdminList.contains(env.GITHUB_COMMENT_AUTHOR)) {
+                                currentBuild.result = 'ABORTED'
+                                error 'This user does not have permission to trigger builds.'
+                            }
+                            else {
+                                echo("Build was started by ${GITHUB_COMMENT_AUTHOR}, who wrote: \"${GITHUB_COMMENT}\", which matches the trigger pattern.")
+                            }
+                        }
+                        else if (!AdminList.contains(env.CHANGE_AUTHOR)) {
+                            currentBuild.result = 'ABORTED'
+                            error 'This user does not have permission to trigger builds.'
+                        }
+                    }
+                }
+
+                // This shouldn't be needed, but just in case
+                cleanWs disableDeferredWipeout: true, deleteDirs: true
+            }
+        }
+
+        stage("Calculate Version") {
+            when {
+                anyOf {
+                    branch 'alpha';
+                    branch 'stable';
+                }
+            }
+            steps {
+                script {
+                    ws("${WORKSPACE}/publish") {
+                        checkout scm;
+
+                        new_version = sh(
+                            script: "./deploy/get_new_version.py",
+                            returnStdout: true
+                        ).trim()
+
+                        if (new_version == '0.0.0') {
+                            error "Failed to calculate new version"
+                        }
+
+                        echo "Calculated new version to be ${new_version}"
+                    }
+                }
+            }
+        }
+
+        stage('Distributions') {
+            steps {
+                script {
+                    parallel OSList.collectEntries {
+                        OS -> [ "${OS} Build & Test": {
+                            stage("${OS} Build & Test") {
+                                ws("${WORKSPACE}/${OS}") {
+                                    stage("${OS} Clone") {
+                                        checkout scm;
+                                    }
+
+                                    stage("${OS} Bootstrap") {
+                                        sh "./deploy/build.sh --os=bootstrap --branch=${BRANCH_NAME} --version=${new_version}"
+
+                                        if (OS.endsWith("armhf")) {
+                                            sh "docker run --rm --privileged multiarch/qemu-user-static:register --reset"
+                                        }
+                                    }
+
+                                    stage("${OS} Test") {
+                                        try {
+                                            def network = "jenkins-${EXECUTOR_NUMBER}-${OS}"
+                                            sh "./deploy/build.sh --os=${OS} --test --dockernetwork=${network}"
+                                        }
+                                        finally {
+                                            sh "./deploy/tap-to-junit.py --junit-suite-name=${OS}"
+                                            junit skipPublishingChecks: true, testResults: 'mdsplus-junit.xml', keepLongStdio: true
+
+                                            echo "Testing complete"
+                                        }
+                                    }
+
+                                    if (!OS.startsWith("test-")) {
+                                        stage("${OS} Release") {
+                                            sh "./deploy/build.sh --os=${OS} --release --branch=${BRANCH_NAME} --version=${new_version}"
+
+                                            findFiles(glob: "packages/*.tgz").each {
+                                                file -> release_file_list.add(WORKSPACE + "/" + file.path)
+                                            }
+
+                                            findFiles(glob: "packages/*.exe").each {
+                                                file -> release_file_list.add(WORKSPACE + "/" + file.path)
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }]
+                    }
+                }
+            }
+        }
+
+        stage('Additional Testing') {
+            parallel {
+                stage("Test IDL") {
+                    steps {
+                        // The IDL tests have to be run with the same OS as the builder
+                        ws("${WORKSPACE}/ubuntu22") {
+                            withEnv(["MDSPLUS_DIR=${WORKSPACE}/tests/64/buildroot"]) {
+                                sh """
+                                    set +x
+                                    . \$MDSPLUS_DIR/setup.sh
+                                    export PYTHONPATH=\$MDSPLUS_DIR/python/
+                                    set -x
+                                    ./idl/testing/run_tests.py
+                                """
+                            }
+                        }
+                    }
+                }
+
+                stage("Test MATLAB") {
+                    steps {
+                        echo "Testing MATLAB"
+                        // TODO
+                    }
+                }
+            }
+        }
+
+        stage('Publish') {
+            when {
+                allOf {
+                    anyOf {
+                        branch 'alpha';
+                        branch 'stable';
+                    }
+
+                    triggeredBy 'TimerTrigger'
+                }
+            }
+            steps {
+                script {
+
+
+                    parallel OSList.findAll{ OS -> (!OS.startsWith("test-")) }.collectEntries {
+                        OS -> [ "${OS} Publish": {
+                            stage("${OS} Publish") {
+                                ws("${WORKSPACE}/${OS}") {
+                                    sh "./deploy/build.sh --os=${OS} --publish --branch=${BRANCH_NAME} --version=${new_version} --keys=/mdsplus/certs --publishdir=/mdsplus/dist"
+                                }
+                            }
+                        }]
+                    }
+
+                    stage("Publish to GitHub") {
+                        ws("${WORKSPACE}/publish") {
+                            def tag = "${BRANCH_NAME}_release-" + new_version.replaceAll("\\.", "-")
+                            echo "Creating GitHub Release and Tag for ${tag}"
+                            withCredentials([
+                                usernamePassword(
+                                    credentialsId: 'MDSplusJenkins',
+                                    usernameVariable: 'GITHUB_APP',
+                                    passwordVariable: 'GITHUB_ACCESS_TOKEN'
+                                )]) {
+
+                                // 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}"
+                            }
+
+                        }
+                    }
+                }
+            }
+        }
+    }
+    post {
+        always {
+            archiveArtifacts artifacts: "**/test-suite.tap,**/core", followSymlinks: false
+
+            cleanWs disableDeferredWipeout: true, deleteDirs: true
+        }
+    }
+}
+

Makefile.in

@@ -221,7 +221,7 @@ tests-env:
 
 # Interdependent directories:
 actions: mdsshr tdishr treeshr xmdsshr mdstcpip servershr
-camshr: mdsdcl
+camshr: mdsdcl mdstcpip
 ccl: camshr  mdsshr mdsdcl
 tcl: mdsshr treeshr tdishr mdstcpip servershr mdsdcl
 dwscope: xmdsshr
@@ -234,7 +234,7 @@ java/jdispatcher: java/mdsobjects
 java/jtraverser: java/mdsobjects java/jscope
 java/jtraverser2: java/mdsplus-api
 math: mdsshr
-mdsdcl: mdsshr
+mdsdcl: mdsshr treeshr
 mdslib: mdstcpip
 mdslibidl: tdishr
 mdsmisc: tdishr xtreeshr

README.md

@@ -1,3 +1,5 @@
+![Build Status](https://jenkins.mdsplus.org/buildStatus/icon?job=MDSplus%2Falpha)
+
 ## We want to know who you are
 The MDSplus developers want to know who you are. If you or your site is using MDSplus please fill the following survey. We promise not to share your contact information. Do not assume that other's from your institution have also filled this out, we will combine the results. 
 

_include/P2WMutex.hpp

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef _P2WMUTEX_HPP
+#define _P2WMUTEX_HPP
+
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
@@ -280,3 +282,4 @@ class P2WCond
 };
 static_assert(sizeof(pthread_cond_t) == sizeof(P2WCond), "Size is not correct");
 #endif
+#endif // ifndef _P2WMUTEX_HPP

_include/P2WSem.hpp

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef _P2WSEM_HPP
+#define _P2WSEM_HPP
+
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
@@ -70,3 +72,4 @@ class P2WSem
   }
 };
 static_assert(sizeof(sem_t) == sizeof(P2WSem), "Size is not correct");
+#endif // ifndef _P2WSEM_HPP

_include/P2WThread.hpp

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef _P2WTHREAD_HPP
+#define _P2WTHREAD_HPP
+
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
@@ -348,3 +350,4 @@ class P2WThread
   }
 #endif // PTHREAD
 };
+#endif // ifndef _P2WTHREAD_HPP