Merge branch 'develop' into 'master'

merge develop into master See merge request Scientific-IT-Systems/gr!1264
sciapp · May 3, 2024 · 874508c · 874508c
2 parents 9a2d15d + b86ea5f
commit 874508c
Show file tree

Hide file tree

Showing 48 changed files with 6,937 additions and 2,324 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -11,3 +11,5 @@
 e9e9f129c8a87161b9727a5b94d3414d0e33a47c
 # Commit which applied new code formatting by upgrading to `clang-format` 13
 c9a848ed891ef494e2251fb289824d04cab4ed66
+# Commit to fix gr.c formatting (2024-03-22)
+754dae1e81e9652f317d1e2eae5a01014ae0668a
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -7,25 +7,25 @@ stages:
 - deploy
 
 include:
-  - local: "/.gitlab-ci/build-arch.yml"
-  - local: "/.gitlab-ci/build-centos.yml"
-  - local: "/.gitlab-ci/build-darwin.yml"
-  - local: "/.gitlab-ci/build-debian.yml"
-  - local: "/.gitlab-ci/build-emscripten.yml"
-  - local: "/.gitlab-ci/build-freebsd.yml"
-  - local: "/.gitlab-ci/build-ubuntu.yml"
-  - local: "/.gitlab-ci/build-windows.yml"
-  - local: "/.gitlab-ci/test.yml"
-  - local: "/.gitlab-ci/test-emscripten.yml"
-  - local: "/.gitlab-ci/test-ubuntu.yml"
-  - local: "/.gitlab-ci/package.yml"
-  - local: "/.gitlab-ci/sync.yml"
-  - local: "/.gitlab-ci/deploy.yml"
+- local: "/.gitlab-ci/build-arch.yml"
+- local: "/.gitlab-ci/build-centos.yml"
+- local: "/.gitlab-ci/build-darwin.yml"
+- local: "/.gitlab-ci/build-debian.yml"
+- local: "/.gitlab-ci/build-emscripten.yml"
+- local: "/.gitlab-ci/build-freebsd.yml"
+- local: "/.gitlab-ci/build-ubuntu.yml"
+- local: "/.gitlab-ci/build-windows.yml"
+- local: "/.gitlab-ci/test.yml"
+- local: "/.gitlab-ci/test-emscripten.yml"
+- local: "/.gitlab-ci/test-ubuntu.yml"
+- local: "/.gitlab-ci/package.yml"
+- local: "/.gitlab-ci/sync.yml"
+- local: "/.gitlab-ci/deploy.yml"
 
 tag-type-check:
   stage: prebuild
   image: iffregistry.fz-juelich.de/docker-images/gr-build-images/deploy
   only:
-    - tags@Scientific-IT-Systems/gr
+  - tags@Scientific-IT-Systems/gr
   script:
-    - test `git cat-file -t $CI_COMMIT_TAG` = "tag"
+  - test `git cat-file -t $CI_COMMIT_TAG` = "tag"
diff --git a/.gitlab-ci/build-arch.yml b/.gitlab-ci/build-arch.yml
@@ -2,55 +2,55 @@ arch-self-contained:
   stage: build
   image: iffregistry.fz-juelich.de/docker-images/gr-build-images/$CI_JOB_NAME
   script:
-    - make self GRDIR=/usr/local/gr
-    - mkdir artifacts
-    - cp lib/gks/demo artifacts/gksdemo
-    - cp lib/gks/qt/gksqt artifacts/gksqt
-    - cp lib/grm/grplot/grplot artifacts/grplot
-    - cp lib/grm/grplot/README.md artifacts/grplot.man.md
-    - cp lib/gr/demo artifacts/grdemo
-    - cp lib/gks/libGKS.so lib/gks/libGKS.a lib/gks/plugin/*.so lib/gr/libGR.so lib/gr/libGR.a lib/gr3/libGR3.so
-         lib/gr3/libGR3platform.so lib/grm/libGRM.a lib/grm/libGRM.so lib/gr/qtgr/*.so artifacts/
-    - cp -r lib/gks/fonts artifacts/
-    - mkdir artifacts/include/
-    - cp lib/gks/gks.h lib/gr/gr.h lib/gr3/gr3.h lib/grm/include/grm.h lib/gr/qtgr/grwidget.h artifacts/include/
-    - cp -r lib/grm/include/grm artifacts/include/
-    - mv artifacts artifacts-arch
+  - make self GRDIR=/usr/local/gr
+  - mkdir artifacts
+  - cp lib/gks/demo artifacts/gksdemo
+  - cp lib/gks/qt/gksqt artifacts/gksqt
+  - cp lib/grm/grplot/grplot artifacts/grplot
+  - cp lib/grm/grplot/README.md artifacts/grplot.man.md
+  - cp lib/gr/demo artifacts/grdemo
+  - cp lib/gks/libGKS.so lib/gks/libGKS.a lib/gks/plugin/*.so lib/gr/libGR.so lib/gr/libGR.a lib/gr3/libGR3.so
+       lib/gr3/libGR3platform.so lib/grm/libGRM.a lib/grm/libGRM.so lib/gr/qtgr/*.so artifacts/
+  - cp -r lib/gks/fonts artifacts/
+  - mkdir artifacts/include/
+  - cp lib/gks/gks.h lib/gr/gr.h lib/gr3/gr3.h lib/grm/include/grm.h lib/gr/qtgr/grwidget.h artifacts/include/
+  - cp -r lib/grm/include/grm artifacts/include/
+  - mv artifacts artifacts-arch
   artifacts:
     expire_in: 1 week
     paths:
-      - artifacts-arch/
+    - artifacts-arch/
 
 arch-cmake-self-contained:
   stage: build
   image: iffregistry.fz-juelich.de/docker-images/gr-build-images/arch-self-contained
   script:
-    - make -C 3rdparty default extras
-    - mkdir build
-    - cd build
-    - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install -DGR_USE_BUNDLED_LIBRARIES=ON -DCMAKE_INSTALL_LIBDIR=${CI_PROJECT_DIR}/install/lib
-    - make
-    - make install
-    - cd ..
-    - mv install artifacts-arch-cmake
+  - make -C 3rdparty default extras
+  - mkdir build
+  - cd build
+  - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install -DGR_USE_BUNDLED_LIBRARIES=ON -DCMAKE_INSTALL_LIBDIR=${CI_PROJECT_DIR}/install/lib
+  - make
+  - make install
+  - cd ..
+  - mv install artifacts-arch-cmake
   artifacts:
     expire_in: 1 week
     paths:
-      - artifacts-arch-cmake/
+    - artifacts-arch-cmake/
 
 arch-system-dependencies:
   stage: build
   image: iffregistry.fz-juelich.de/docker-images/gr-build-images/$CI_JOB_NAME
   script:
-    - make install GRDIR=/usr/local/gr
+  - make install GRDIR=/usr/local/gr
 
 arch-cmake-system-dependencies:
   stage: build
   image: iffregistry.fz-juelich.de/docker-images/gr-build-images/arch-system-dependencies
   script:
-    - pacman -Sy
-    - pacman -S --noconfirm --needed qhull
-    - mkdir build
-    - cd build
-    - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install -DGR_USE_BUNDLED_LIBRARIES=OFF
-    - make
+  - pacman -Sy
+  - pacman -S --noconfirm --needed qhull
+  - mkdir build
+  - cd build
+  - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install -DGR_USE_BUNDLED_LIBRARIES=OFF
+  - make
diff --git a/.gitlab-ci/build-binary-builder.yml b/.gitlab-ci/build-binary-builder.yml
@@ -0,0 +1,18 @@
+binary-builder:
+  stage: build
+  script: noop
+  tags:
+  - julia-bb
+  rules:
+  - if: $CI_PROJECT_NAMESPACE == "Scientific-IT-Systems" &&
+        ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" || $CI_COMMIT_TAG)
+    allow_failure: false
+  - if: $CI_PROJECT_NAMESPACE == "Scientific-IT-Systems" &&
+        ($CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME == "develop")
+    allow_failure: true
+  needs:
+  - job: emscripten
+    artifacts: true
+  variables:
+    GIT_STRATEGY: none
+    JULIA_VERSION: 1.10.0
diff --git a/.gitlab-ci/build-centos.yml b/.gitlab-ci/build-centos.yml
@@ -29,23 +29,23 @@ centos7-cmake-self-contained:
   stage: build
   image: iffregistry.fz-juelich.de/docker-images/gr-build-images/centos7-self-contained
   script:
-    - source /opt/rh/devtoolset-8/enable
-    - curl -LO https://gr-framework.org/downloads/3rdparty/cmake-3.23.0-linux-x86_64.tar.gz
-    - tar xf cmake-3.23.0-linux-x86_64.tar.gz
-    - export CMAKE_CMD=`pwd`/cmake-3.23.0-linux-x86_64/bin/cmake
-    - make -C 3rdparty default extras
-    - mkdir build
-    - cd build
-    - $CMAKE_CMD .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install -DGR_USE_BUNDLED_LIBRARIES=ON
-    - make
-    - make install
-    - mv ../install/lib64/ ../install/lib/
-    - cd ..
-    - mv install artifacts-centos7-cmake
+  - source /opt/rh/devtoolset-8/enable
+  - curl -LO https://gr-framework.org/downloads/3rdparty/cmake-3.23.0-linux-x86_64.tar.gz
+  - tar xf cmake-3.23.0-linux-x86_64.tar.gz
+  - export CMAKE_CMD=`pwd`/cmake-3.23.0-linux-x86_64/bin/cmake
+  - make -C 3rdparty default extras
+  - mkdir build
+  - cd build
+  - $CMAKE_CMD .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install -DGR_USE_BUNDLED_LIBRARIES=ON
+  - make
+  - make install
+  - mv ../install/lib64/ ../install/lib/
+  - cd ..
+  - mv install artifacts-centos7-cmake
   artifacts:
     expire_in: 1 week
     paths:
-      - artifacts-centos7-cmake/
+    - artifacts-centos7-cmake/
 
 centos7-system-dependencies:
   stage: build
@@ -58,16 +58,16 @@ centos7-cmake-system-dependencies:
   stage: build
   image: iffregistry.fz-juelich.de/docker-images/gr-build-images/centos7-system-dependencies
   script:
-    - source /opt/rh/devtoolset-8/enable
-    - yum install -y libjpeg-turbo-devel libtiff-devel bzip2-devel
-    - curl -LO https://gr-framework.org/downloads/3rdparty/cmake-3.23.0-linux-x86_64.tar.gz
-    - tar xf cmake-3.23.0-linux-x86_64.tar.gz
-    - export CMAKE_CMD=`pwd`/cmake-3.23.0-linux-x86_64/bin/cmake
-    - make -C 3rdparty default TARGETS="qhull"
-    - mkdir build
-    - cd build
-    - $CMAKE_CMD .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install -DCMAKE_FIND_ROOT_PATH=$(cd ../3rdparty/build && pwd)
-    - make
+  - source /opt/rh/devtoolset-8/enable
+  - yum install -y libjpeg-turbo-devel libtiff-devel bzip2-devel
+  - curl -LO https://gr-framework.org/downloads/3rdparty/cmake-3.23.0-linux-x86_64.tar.gz
+  - tar xf cmake-3.23.0-linux-x86_64.tar.gz
+  - export CMAKE_CMD=`pwd`/cmake-3.23.0-linux-x86_64/bin/cmake
+  - make -C 3rdparty default TARGETS="qhull"
+  - mkdir build
+  - cd build
+  - $CMAKE_CMD .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install -DCMAKE_FIND_ROOT_PATH=$(cd ../3rdparty/build && pwd)
+  - make
 
 centos7-32bit-self-contained:
   stage: build
@@ -103,25 +103,25 @@ centos7-32bit-cmake-self-contained:
   stage: build
   image: iffregistry.fz-juelich.de/docker-images/gr-build-images/centos7-32bit-self-contained
   script:
-    - source /opt/gcc-8.5.0/enable
-    - curl -LO https://gr-framework.org/downloads/3rdparty/cmake-3.23.0-linux-i386.tar.gz
-    - tar xf cmake-3.23.0-linux-i386.tar.gz
-    - export CMAKE_CMD=`pwd`/cmake-3.23.0-linux-i386/bin/cmake
-    - THEORA_EXTRA_CONFIGURE_FLAGS=--disable-asm
-      OPENH264_EXTRA_MAKE_FLAGS=ARCH=i386
-      make -C 3rdparty default extras
-    - mkdir build
-    - cd build
-    - LDFLAGS="-static-libstdc++ -static-libgcc"
-      $CMAKE_CMD .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install -DGR_USE_BUNDLED_LIBRARIES=ON
-    - make
-    - make install
-    - cd ..
-    - mv install artifacts-centos7-32bit-cmake
+  - source /opt/gcc-8.5.0/enable
+  - curl -LO https://gr-framework.org/downloads/3rdparty/cmake-3.23.0-linux-i386.tar.gz
+  - tar xf cmake-3.23.0-linux-i386.tar.gz
+  - export CMAKE_CMD=`pwd`/cmake-3.23.0-linux-i386/bin/cmake
+  - THEORA_EXTRA_CONFIGURE_FLAGS=--disable-asm
+    OPENH264_EXTRA_MAKE_FLAGS=ARCH=i386
+    make -C 3rdparty default extras
+  - mkdir build
+  - cd build
+  - LDFLAGS="-static-libstdc++ -static-libgcc"
+    $CMAKE_CMD .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install -DGR_USE_BUNDLED_LIBRARIES=ON
+  - make
+  - make install
+  - cd ..
+  - mv install artifacts-centos7-32bit-cmake
   artifacts:
     expire_in: 1 week
     paths:
-      - artifacts-centos7-32bit-cmake/
+    - artifacts-centos7-32bit-cmake/
 
 centos7-32bit-system-dependencies:
   stage: build
@@ -135,14 +135,14 @@ centos7-32bit-cmake-system-dependencies:
   stage: build
   image: iffregistry.fz-juelich.de/docker-images/gr-build-images/centos7-32bit-system-dependencies
   script:
-    - source /opt/gcc-8.5.0/enable
-    - yum install -y libtiff-devel bzip2-devel
-    - curl -LO https://gr-framework.org/downloads/3rdparty/cmake-3.23.0-linux-i386.tar.gz
-    - tar xf cmake-3.23.0-linux-i386.tar.gz
-    - export CMAKE_CMD=`pwd`/cmake-3.23.0-linux-i386/bin/cmake
-    - make -C 3rdparty default TARGETS="qhull"
-    - mkdir build
-    - cd build
-    - LDFLAGS="-static-libstdc++ -static-libgcc"
-      $CMAKE_CMD .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install -DCMAKE_FIND_ROOT_PATH=$(cd ../3rdparty/build && pwd)
-    - make
+  - source /opt/gcc-8.5.0/enable
+  - yum install -y libtiff-devel bzip2-devel
+  - curl -LO https://gr-framework.org/downloads/3rdparty/cmake-3.23.0-linux-i386.tar.gz
+  - tar xf cmake-3.23.0-linux-i386.tar.gz
+  - export CMAKE_CMD=`pwd`/cmake-3.23.0-linux-i386/bin/cmake
+  - make -C 3rdparty default TARGETS="qhull"
+  - mkdir build
+  - cd build
+  - LDFLAGS="-static-libstdc++ -static-libgcc"
+    $CMAKE_CMD .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install -DCMAKE_FIND_ROOT_PATH=$(cd ../3rdparty/build && pwd)
+  - make