Merge branch 'master' into 4242

Author: AHaumer

.CI/Jenkinsfile

@@ -197,14 +197,14 @@ def allAutotools() {
 def autotools(CC, CPPFLAGS, config, nostatic, dotest) {
   sh label: "Build $CC $CPPFLAGS", script: """
   export CC=$CC
-  export CPPFLAGS="$CPPFLAGS -I${WORKSPACE}/.CI/Test"
+  export CPPFLAGS=$CPPFLAGS
   export CFLAGS="-Os -fPIC"
   rm -rf Modelica/Resources/Library/*
   mkdir -p Modelica/Resources/Library/\$LIBDIR
   cd Modelica/Resources/BuildProjects/autotools
   git clean -fdx .
   ./autogen.sh
-  ./configure --libdir="${WORKSPACE}/Modelica/Resources/Library/\$LIBDIR" $config
+  ./configure --libdir="\$PWD/../../Library/\$LIBDIR" $config
   make --output-sync -j${numPhysicalCPU()}
   make install
   """
@@ -223,7 +223,7 @@ def makefile(CC, dotest) {
   rm -rf Modelica/Resources/Library/*
   mkdir -p "Modelica/Resources/Library/$LIBDIR"
   cd Modelica/Resources/BuildProjects/gcc
-  make --output-sync -j${numPhysicalCPU()} TARGETDIR="$LIBDIR" CPPFLAGS="-I${WORKSPACE}/.CI/Test"
+  make --output-sync -j${numPhysicalCPU()} TARGETDIR="$LIBDIR"
   """
   sh label: "Test $CC", script: """
   export CC=$CC

.CI/Test/Common.c

@@ -1,18 +1,38 @@
-#include "ModelicaUtilities.h"
+#include "../../Modelica/Resources/C-Sources/ModelicaUtilities.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 char* ModelicaAllocateString(size_t len) {
     void *data = malloc(len + 1); /* Never free'd in the test programs */
-    assert(data);
+    if (NULL == data) {
+        ModelicaError("Failed to allocate string");
+    }
     return data;
 }
 
 char* ModelicaAllocateStringWithErrorReturn(size_t len) {
     return malloc(len + 1); /* Never free'd in the test programs */
 }
 
+char* ModelicaDuplicateString(const char* str) {
+    void *data = malloc(strlen(str) + 1); /* Never free'd in the test programs */
+    if (NULL == data) {
+        ModelicaError("Failed to duplicate string");
+    }
+    strcpy(data, str);
+    return data;
+}
+
+char* ModelicaDuplicateStringWithErrorReturn(const char* str) {
+    void *data = malloc(strlen(str) + 1); /* Never free'd in the test programs */
+    if (NULL != data) {
+        strcpy(data, str);
+    }
+    return data;
+}
+
 void ModelicaMessage(const char *string) {
     printf("%s\n", string);
 }
@@ -24,7 +44,7 @@ void ModelicaWarning(const char *string) {
 void ModelicaError(const char *string) {
     fputs(string, stderr);
     fputc('\n', stderr);
-    assert(0);
+    abort();
 }
 
 void ModelicaFormatMessage(const char *string, ...) {
@@ -58,5 +78,5 @@ void ModelicaVFormatWarning(const char *string, va_list args) {
 
 void ModelicaVFormatError(const char *string, va_list args) {
     vfprintf(stderr, string, args);
-    assert(0);
+    abort();
 }

.CI/checkHTMLDoc/checkLinks.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 '''
-Copyright (C) 2020, Modelica Association and contributors
+Copyright (C) 2020-2025, Modelica Association and contributors
 All rights reserved.
 
 Check Modelica HTML documentation for link validity

.CI/checkHTMLDoc/checkTags.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 '''
-Copyright (C) 2020, Modelica Association and contributors
+Copyright (C) 2020-2025, Modelica Association and contributors
 All rights reserved.
 
 Check Modelica HTML documentation for tag validity

.CI/checkHTMLDoc/tidyHTML.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 '''
-Copyright (C) 2020, Modelica Association and contributors
+Copyright (C) 2020-2025, Modelica Association and contributors
 All rights reserved.
 
 Check Modelica HTML documentation with HTML Tidy

.CI/check_deprecated_line_color.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 '''
-Copyright (C) 2021-2023, Modelica Association and contributors
+Copyright (C) 2021-2025, Modelica Association and contributors
 All rights reserved.
 
 Check for deprecated Text.lineColor annotation

.CI/check_html.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 '''
-Copyright (C) 2020, Modelica Association and contributors
+Copyright (C) 2020-2025, Modelica Association and contributors
 All rights reserved.
 
 Check Modelica HTML documentation for validity

.CI/classCoverage/CountClasses.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 '''
-Copyright (C) 2020, Modelica Association and contributors
+Copyright (C) 2020-2025, Modelica Association and contributors
 All rights reserved.
 
 Print class coverage for all classes, sorted by reference count

.gitattributes

@@ -4,6 +4,7 @@
 # Explicitly declare text files we want to always be normalized and converted
 # to native line endings on checkout.
 *.c text
+*.cmake text
 *.csv text
 *.h text
 *.htm* text
@@ -46,3 +47,5 @@ Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/HollowCylinder.vsdx export-i
 Modelica/Resources/Images/Magnetic/FluxTubes/Shapes/Toroid.vsdx export-ignore
 Modelica/Resources/Reference export-ignore
 ModelicaTest/Resources/Reference export-ignore
+
+*.mo linguist-language=Modelica

.github/workflows/checkCI.yml

@@ -1,23 +1,37 @@
 name: CI
 
-on: [pull_request]
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+defaults:
+  run:
+    shell: bash
 
 jobs:
   external_c_checks:
     timeout-minutes: 5
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout code
+        uses: actions/checkout@v4
         with:
           fetch-depth: 5
-      - name: Build libraries
+      - name: Configure
         run: |
           rm -rf Modelica/Resources/Library/*
           mkdir -p Modelica/Resources/Library/$LIBDIR
           pushd Modelica/Resources/BuildProjects/autotools
           git clean -fdx .
           ./autogen.sh
-          ./configure --libdir="$PWD/../../Library/$LIBDIR" --enable-static --disable-shared --enable-static-zlib --disable-hdf5 CPPFLAGS="-I${GITHUB_WORKSPACE}/.CI/Test"
+          ./configure --libdir="$PWD/../../Library/$LIBDIR" --enable-static --disable-shared --enable-static-zlib --disable-hdf5
+          popd
+        env:
+          LIBDIR: linux64
+      - name: Build
+        run: |
+          pushd Modelica/Resources/BuildProjects/autotools
           make --output-sync
           sudo make install
           popd
@@ -30,15 +44,107 @@ jobs:
         env:
           LIBDIR: linux64
           CC: gcc
+
+  external_c_checks_cmake:
+    name: external_c_checks_cmake_${{ matrix.toolchain }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 5
+    strategy:
+      matrix:
+        toolchain:
+          - linux-gcc
+          - macos-clang
+          - windows-msvc
+          - windows-mingw
+        configuration:
+          - Debug
+        include:
+          - toolchain: linux-gcc
+            os: ubuntu-latest
+            compiler: gcc
+          - toolchain: macos-clang
+            os: macos-latest
+            compiler: clang
+          - toolchain: windows-msvc
+            os: windows-latest
+            compiler: msvc
+          - toolchain: windows-mingw
+            os: windows-latest
+            compiler: mingw
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 5
+      - name: Configure
+        run: |
+          if [ "${{ matrix.compiler }}" == "msvc" ]; then
+            cmake -S "$SRCDIR" -B build -DMODELICA_DEBUG_TIME_EVENTS=ON
+          elif [ "${{ matrix.compiler }}" == "mingw" ]; then
+            cmake -S "$SRCDIR" -B build -DMODELICA_DEBUG_TIME_EVENTS=ON -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -G "MinGW Makefiles"
+          else
+            cmake -S "$SRCDIR" -B build -DMODELICA_DEBUG_TIME_EVENTS=ON -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DCMAKE_C_FLAGS="-std=c89 -Wall -Wextra"
+          fi
+        env:
+          SRCDIR: ${{ github.workspace }}/Modelica/Resources
+      - name: Build with ${{ matrix.compiler }}
+        run: |
+          if [ "${{ matrix.compiler }}" == "msvc" ]; then
+            cmake --build build --config ${{ matrix.configuration }}
+          else
+            cmake --build build -- -j8
+          fi
+      - name: Run tests
+        run: ctest --no-tests=error --test-dir build --build-config ${{ matrix.configuration }} --verbose
+
+  external_c_checks_cmake_cygwin:
+    name: external_c_checks_cmake_windows-cygwin
+    runs-on: windows-latest
+    timeout-minutes: 5
+    steps:
+      - name: Set git to use LF
+        run: git config --global core.autocrlf input
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 5
+      - name: Setup cygwin
+        uses: cygwin/cygwin-install-action@master
+        with:
+          packages: >-
+            cmake
+            gcc-core
+            make
+            ninja
+      - name: Configure
+        run: |
+          export PATH=/usr/bin:$PATH
+          cmake -S "$(cygpath ${SRCDIR})" -B build -DMODELICA_DEBUG_TIME_EVENTS=ON -DCMAKE_BUILD_TYPE=Debug -G Ninja
+        shell: C:\cygwin\bin\bash.exe -eo pipefail -o igncr '{0}'
+        env:
+          CYGWIN_NOWINPATH: 1
+          SRCDIR: ${{ github.workspace }}/Modelica/Resources
+      - name: Build with gcc
+        run: |
+          export PATH=/usr/bin:$PATH
+          cmake --build build -- -j8
+        shell: C:\cygwin\bin\bash.exe -eo pipefail -o igncr '{0}'
+      - name: Run tests
+        run: |
+          export PATH=/usr/bin:$PATH
+          ctest --no-tests=error --test-dir build --build-config Debug --verbose
+        shell: C:\cygwin\bin\bash.exe -eo pipefail -o igncr '{0}'
+
   html_documentation_checks:
     timeout-minutes: 5
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout code
+        uses: actions/checkout@v4
         with:
           fetch-depth: 5
       - name: Setup python environment
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
       - name: Install python packages
@@ -49,7 +155,7 @@ jobs:
         run: |
           git clone --branch 5.8.0 --depth=1 https://github.com/htacg/tidy-html5.git
           pushd tidy-html5
-          cmake .
+          cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 .
           make
           sudo make install
           popd
@@ -64,11 +170,13 @@ jobs:
           echo "::add-matcher::./.github/checkTags.json"
           python ./.CI/check_html.py checkTags ./
           echo "::remove-matcher owner=checkTags::"
+
   syntax_checks:
     timeout-minutes: 5
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout code
+        uses: actions/checkout@v4
         with:
           fetch-depth: 5
       - name: Get moparser
@@ -80,17 +188,19 @@ jobs:
       - name: Check syntax
         run: |
           echo "::add-matcher::./.github/moparser.json"
-          ModelicaSyntaxChecker/Linux64/moparser -v 3.4 -r Complex.mo Modelica ModelicaReference ModelicaServices ModelicaTest ModelicaTestConversion4.mo ModelicaTestOverdetermined.mo ObsoleteModelica4.mo
+          ModelicaSyntaxChecker/Linux64/moparser -v 3.6 -r Complex.mo Modelica ModelicaReference ModelicaServices ModelicaTest ModelicaTestConversion4.mo ModelicaTestOverdetermined.mo ObsoleteModelica4.mo
           echo "::remove-matcher owner=moparser::"
+
   deprecation_checks:
     timeout-minutes: 5
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout code
+        uses: actions/checkout@v4
         with:
           fetch-depth: 5
       - name: Setup python environment
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
       - name: Check deprecated Text.lineColor annotation