Merging master

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: unconfirmed bug
+assignees: ''
+
+---
+
+**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.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - OpenFLUID version [e.g. 2.1.11]
+
+**Additional context**
+Add any other context about the problem here.

.github/workflows/CI-macos.yaml

@@ -23,20 +23,14 @@ jobs:
           gnuplot
       - name: Installation of pandoc
         uses: r-lib/actions/setup-pandoc@v2
-      - name: Installation of latex
-        uses: teatimeguest/setup-texlive-action@v3
-        with:
-          packages: |
-            scheme-full
-            bibtex
       - name: Checkout of source code
         uses: actions/checkout@v3
       - name: Preparation
         run: |
           echo "$(brew --prefix qt6)/bin" >> $GITHUB_PATH
           mkdir ./_build
       - name: Configuration
-        run: cmake .. -DCMAKE_PREFIX_PATH=$(brew --prefix qt6)/lib/cmake
+        run: cmake .. -DCMAKE_PREFIX_PATH=$(brew --prefix qt6)/lib/cmake -DOFBUILD_ENABLE_DOCS=OFF
         working-directory: ./_build
       - name: Build
         run: make -j 2

.github/workflows/CI-windows.yaml

@@ -10,7 +10,7 @@ jobs:
 
 
   ci-windows-debug:
-    runs-on: windows-2019
+    runs-on: windows-2025
 
     defaults:
       run:
@@ -29,12 +29,13 @@ jobs:
             mingw-w64-x86_64-boost mingw-w64-x86_64-gdal mingw-w64-x86_64-curl-winssl
             mingw-w64-x86_64-qt5 mingw-w64-x86_64-openssl
             git p7zip mingw-w64-x86_64-gnuplot mingw-w64-x86_64-graphviz
+            mingw-w64-x86_64-make
       - name: Checkout of source code
         uses: actions/checkout@v3
       - name: Preparation
         run: mkdir ./_build
       - name: Configuration
-        run: cmake .. -G "MSYS Makefiles" -DOFBUILD_ENABLE_DOCS=OFF
+        run: cmake .. -G "MinGW Makefiles" -DOFBUILD_ENABLE_DOCS=OFF
         working-directory: ./_build
       - name: Build
         run: |

.gitlab-ci.yml

@@ -0,0 +1,131 @@
+stages:
+  - test
+  - package
+  - downstream
+
+test-of:
+  stage: test
+  image: "registry.forge.inrae.fr/openfluid/incubateur/openfluid/ofbuild/debian-12-qt6"
+  script:
+    - mkdir ./_build
+    - cd ./_build && cmake .. -DOFBUILD_ENABLE_DOCS=OFF -DOFBUILD_ENABLE_GUI=OFF
+    - make stylecheck
+    - make -j `nproc`
+    - ctest -j 4 --output-on-failure
+
+test-of-full:
+  stage: test
+  when: manual
+  parallel:
+    matrix:
+      - TAG: ["debian-11-qt5", "debian-12-qt6", "debian-13-qt6",
+              "ubuntu-22.04-qt5", "ubuntu-24.04-qt6", "ubuntu-24.10-qt6", "ubuntu-25.04-qt6",
+              "fedora-41-qt5", "fedora-42-qt6"]
+  image: "registry.forge.inrae.fr/openfluid/incubateur/openfluid/ofbuild/$TAG"
+  script:
+    - mkdir ./_build
+    - cd ./_build && cmake .. -DOFBUILD_ENABLE_DOCS=OFF -DOFBUILD_ENABLE_GUI=OFF
+    - make -j `nproc`
+    - ctest -j 4 --output-on-failure
+
+pkg-of-no-ui:
+  stage: package
+  image: "registry.forge.inrae.fr/openfluid/incubateur/openfluid/ofbuild/debian-12-qt6"
+  script:
+    - mkdir ./_build_noui
+    - cd ./_build_noui && cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DOFBUILD_ENABLE_GUI=OFF
+    - make -j `nproc`
+    - cpack -j `nproc`
+  artifacts:
+    paths:
+      - /builds/openfluid/incubateur/openfluid/_build_noui/*.deb
+
+pkg-of-full-deb:
+  stage: package
+  when: manual
+  parallel:
+    matrix:
+      - TAG: ["debian-11-qt5", "debian-12-qt6", "debian-13-qt6",
+              "ubuntu-22.04-qt5", "ubuntu-24.04-qt6", "ubuntu-24.10-qt6", "ubuntu-25.04-qt6"]
+  image: "registry.forge.inrae.fr/openfluid/incubateur/openfluid/ofbuild/$TAG"
+  script:
+    - mkdir ./_build_release
+    - cd ./_build_release && cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+    - make -j `nproc`
+    - cpack -j `nproc`
+  artifacts:
+    paths:
+      - /builds/openfluid/incubateur/openfluid/_build_release/*.deb
+
+
+pkg-of-full-rpm:
+  stage: package
+  when: manual
+  parallel:
+    matrix:
+      - TAG: ["fedora-41-qt5", "fedora-42-qt6"]
+  image: "registry.forge.inrae.fr/openfluid/incubateur/openfluid/ofbuild/$TAG"
+  script:
+    - mkdir ./_build_release
+    - cd ./_build_release && cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+    - export QA_SKIP_RPATHS=1
+    - make -j `nproc`
+    - cpack -j `nproc`
+  artifacts:
+    paths:
+      - /builds/openfluid/incubateur/openfluid/_build_release/*.rpm
+
+pkg-bindings-r:
+  stage: downstream
+  image: "registry.forge.inrae.fr/openfluid/incubateur/openfluid/ofbuild/debian-12-qt6"
+  before_script:
+    - sudo apt-get update && sudo apt-get install -y /builds/openfluid/incubateur/openfluid/_build_noui/*.deb
+  script:
+    - mkdir downstream && cd downstream
+    - git clone https://forge.inrae.fr/openfluid/incubateur/ropenfluid.git
+    - cd ropenfluid
+    - cmake -P check.cmake
+    - cmake -P build.cmake
+  artifacts:
+    paths:
+      - /builds/openfluid/incubateur/openfluid/downstream/ropenfluid/_build/*.tar.gz
+
+
+pkg-bindings-py:
+  stage: downstream
+  image: "registry.forge.inrae.fr/openfluid/incubateur/openfluid/ofbuild/debian-12-qt6"
+  before_script:
+    - sudo apt-get update && sudo apt-get install -y /builds/openfluid/incubateur/openfluid/_build_noui/*.deb
+  script:
+    - mkdir downstream && cd downstream
+    - git clone https://github.com/OpenFLUID/pyopenfluid
+    - cd pyopenfluid
+    - python3 setup.py check
+    - python3 setup.py build
+    - python3 setup.py test
+    - python3 setup.py sdist bdist
+  artifacts:
+    paths:
+      - /builds/openfluid/incubateur/openfluid/downstream/pyopenfluid/dist/*.tar.gz
+
+
+# build-of-container-ubuntu-22-04:
+#   stage: container
+#   image: docker:24.0.5-cli
+#   services:
+#     - docker:24.0.5-dind
+#   variables:
+#     DOCKER_TLS_CERTDIR: ""
+#     DOCKER_HOST: tcp://docker:2375
+#   script:
+#     - |
+#         cat > Dockerfile <<EOF
+#         FROM ubuntu:22.04
+#         COPY openfluid_2.2.1~beta2_jammy_amd64.deb /tmp/
+#         RUN apt-get update && apt-get install -y /tmp/openfluid_2.2.1~beta2_jammy_amd64.deb && rm /tmp/openfluid_2.2.1~beta2_jammy_amd64.deb
+#         EOF
+#     - docker build -t registry.forge.inrae.fr/openfluid/incubateur/openfluid/openfluid:2.2.1b1-ubuntu-22.04-qt5 . 
+#     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+#     - docker push registry.forge.inrae.fr/openfluid/incubateur/openfluid/openfluid:2.2.1b1-ubuntu-22.04-qt5
+
+

CHANGELOG.md

@@ -1,30 +1,79 @@
+## 2.2.1
+
+  * Added ability to open internal observers code in Builder
+  * Added multiline indentation and comment in DevStudio
+  * Added capacity to duplicate a ware (CLI and DevStudio)
+  * Added script to fetch reference wares from dedicated repositories
+  * Added ability to inherit from InjectGenerator
+  * Added capacity to import a ware from CLI
+  * Added pragma once handling in stylecheck
+  * Added option to select all fields in spatial import builderext
+  * Added filter to forbid dot in set name field
+  * Added support of secundary wares in ware repository
+  * Added ability to compare dataset output to a reference
+  * Added env var and cmake var OPENFLUID_COMPARE_TOOL 
+    for custom OUT/REF comparison
+  * Added skip block markup to ignore portions of code during ware migration
+  * Added multitype to injection generator for all OpenFLUID types
+  * Added ware test integration in DevStudio
+  * Added gitlab-ci pipelines for automatic test and packaging of OpenFLUID
+  * Updated Windows Github action
+  * Updated test autodiscovery to automatically compare output to ref 
+    when available
+  * Updated internal datasets and simulators for integration test
+  * Updated cmake operations coloring in DevStudio to handle console symbols
+  * Updated multitype generator management by passing vartype to parameter
+  * Changed generator ID when double type from "genscalar" suffix to "gendouble"
+  * Changed internal logs location from 'utils' to 'base' library
+  * Fixed missing "data" case in ware signature
+  * Fixed wrong symbol check on signature attributes
+  * Fixed multicolumn CSV observer early delete segfault
+  * Fixed migration to keep custom content of main CMakeLists.txt
+  * Fixed accidental scroll in signature window comboboxes
+  * Fixed decimal point issue in attribute edit dialog (set to C locale)
+  * Fixed WSL path support
+  * Fixed dialog for migration when non versioned
+  * Fixed precision in string-related conversion functions 
+    (from 6 to 17 digits)
+  * Fixed fragment unauthenticated import
+  * Fixed examples installation operations (especially for observers)
+  * Fixed param change in ware param list not detected in Builder
+
+
 ## 2.2.0
 
   * Added git user injection in gitaskpass
   * Added internal logging system for openfluid operations debug
   * Added Qt6 compatibility, Qt5 compatibility kept but to be deprecated 
   * Added CLI commands for ware operations
   * Added multi-column generator
-  * Added capabilities about types and dimensions in single-column generator (integer, boolean, string)
-  * Added parameter structure to other wares than simulator (API get function, check in DevStudio)
+  * Added capabilities about types and dimensions in single-column generator 
+    (integer, boolean, string)
+  * Added parameter structure to other wares than simulator 
+    (API get function, check in DevStudio)
   * Added RNG seed as optional parameter for random generator
-  * Added constraints in data name characters (variables, unit class, attributes)
+  * Added constraints in data name characters 
+    (variables, unit class, attributes)
   * Added functions to filesystem API
   * Added template processing utility
   * Added wheel event to clickable label
   * Added build information to targets
-  * Added tools and workflows for automatic conversion of wares and ghosts to 2.2
-  * Added folder operations in DevStudio: git init, remove folder, remove fragment, add fragment
+  * Added tools and workflows for automatic conversion of wares and ghosts 
+    to 2.2
+  * Added folder operations in DevStudio: git init, remove folder, 
+    remove fragment, add fragment
   * Added code fragment feature to share code between wares
-  * Added search paths for code fragments (fragments subdir in ware, at workspace level, at userdata level)
+  * Added search paths for code fragments
+    (fragments subdir in ware, at workspace level, at userdata level)
   * Added internal simulation test structure
-  * Added ware qualtiy checks
+  * Added ware quality checks
   * Added ware status board in DevStudio for info and actions
   * Added fluidx format version (current is 4)
   * Added code tag types: HACK, TOIMPL
   * Added tinyxml as third party library
   * Added spatial display classes to API in ui/spatial
-  * Updated signature format from inline C++ macros to standalone interoperable json file
+  * Updated signature format from inline C++ macros 
+    to standalone interoperable json file
   * Updated ghost file from xml to json
   * Updated settings files format from conf to json (openfluid, project...)
   * Updated C++ standard from 14 to 17
@@ -33,13 +82,15 @@
   * Updated DevStudio UX by splitting main toolbar
   * Updated packaging stack for Windows to Msys2
   * Updated example Firespread model to use multi-column generator
-  * Replaced sim2doc by docalyze utility to handle LaTeX, markdown and Rmd (uses pandoc, pdflatex and bibtex) 
+  * Replaced sim2doc by docalyze utility to handle LaTeX, markdown and Rmd 
+    (uses pandoc, pdflatex and bibtex) 
   * Replaced CLI buddies by generic commands
   * Replaced rapidjson by nlohmannjson as third party library for json handling
   * Updated ghost signature edition dialog for signature in DevStudio
   * Updated chronological series classes to template
   * Updated help of CLI commands (content and structure)
-  * Updated infra quality checks (more tests, prehook checks, quicker stylecheck)
+  * Updated infra quality checks 
+    (more tests, prehook checks, quicker stylecheck)
   * Updated packaging for Linux, Windows and MacOS
   * Updated user documentation template and content
   * Updated example simulators to 2.2
@@ -150,7 +201,7 @@
   * Added configurable auto-save mode in Devstudio
   * Added management of path and paths list separators in the Filesystem API,
     depending on operating system
-  * Added experimental support of embedded R code in sumlators
+  * Added experimental support of embedded R code in simulators
   * Added automatic build of documentation examples
   * Added french translation for completion menu
   * Updated management of completion in Devstudio

CMake.in.cmake

@@ -22,7 +22,7 @@ SET(OFBUILD_CUSTOM_CMAKE_VERSION "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.
 
 SET(OPENFLUID_VERSION_MAJOR 2)
 SET(OPENFLUID_VERSION_MINOR 2)
-SET(OPENFLUID_VERSION_PATCH 0)
+SET(OPENFLUID_VERSION_PATCH 1)
 SET(OPENFLUID_VERSION_STATUS "") # example: SET(OPENFLUID_VERSION_STATUS "rc1")
 
 SET(OPENFLUID_VERSION_FULL "${OPENFLUID_VERSION_MAJOR}.${OPENFLUID_VERSION_MINOR}.${OPENFLUID_VERSION_PATCH}")
@@ -34,6 +34,13 @@ ENDIF()
 # Compute version as numeric
 MATH(EXPR OPENFLUID_VERSION_NUMERIC "${OPENFLUID_VERSION_MAJOR} * 10000 + ${OPENFLUID_VERSION_MINOR} * 100 + ${OPENFLUID_VERSION_PATCH}")
 
+# WSL
+SET(OPENFLUID_OS_ISWSL 0)
+IF (DEFINED ENV{WSL_DISTRO_NAME})
+  SET(OPENFLUID_OS_ISWSL 1)
+  MESSAGE(STATUS "WSL system detected")
+ENDIF()
+
 
 ################### paths and files ###################
 

CPack.win32.in.cmake

@@ -30,9 +30,15 @@ IF(OFBUILD_SUPPORT_DIR)
   FILE(TO_CMAKE_PATH "$ENV{OFBUILD_SUPPORT_DIR}/bin" OFBUILD_SUPPORT_BINDIR_MOD)
   FILE(TO_CMAKE_PATH "$ENV{OFBUILD_SUPPORT_DIR}/lib" OFBUILD_SUPPORT_LIBDIR_MOD)
 
-  # GDAL  
-  INSTALL(DIRECTORY "${OFBUILD_SUPPORT_BINDIR_MOD}/" DESTINATION ${OFBUILD_BIN_INSTALL_PATH} FILES_MATCHING PATTERN "libgdal*.dll") 
-  INSTALL(DIRECTORY "${OFBUILD_SUPPORT_LIBDIR_MOD}/" DESTINATION ${OFBUILD_BIN_INSTALL_PATH} FILES_MATCHING PATTERN "libgdal*.dll") 
+  # TODO replace by cleaner way
+  FOREACH(PAT "libgdal*" "libcurl*" "libstdc++*" "libwinpthread*" "libboost_system*" "libboost_filesystem*" "libboost_process*" "libidn2*" "libicu*" "libmd4*" "libbrotlidec" "libcrypto-3-x64" "libnghttp2*" "libarchive-13" "libaec-0" "libparquet*" "libarrow*" "libmd4c*")
+    INSTALL(DIRECTORY "${OFBUILD_SUPPORT_BINDIR_MOD}/" DESTINATION ${OFBUILD_BIN_INSTALL_PATH} FILES_MATCHING PATTERN "${PAT}.dll")
+  ENDFOREACH()
+  # GDAL
+  INSTALL(DIRECTORY "${OFBUILD_SUPPORT_LIBDIR_MOD}/" DESTINATION ${OFBUILD_BIN_INSTALL_PATH} FILES_MATCHING PATTERN "libgdal*.dll")
+
+  #INSTALL(DIRECTORY "C:/craftingDeps/mingw64/lib/" DESTINATION ${OFBUILD_LIB_INSTALL_PATH}) # TODO replace by proper deps installation system
+
 ELSE()
   MESSAGE(WARNING "environment variable OFBUILD_SUPPORT_DIR is not set!")
 ENDIF()

LICENSE

@@ -1,5 +1,5 @@
 OpenFLUID
-Copyright (c) 2007 INRA - Montpellier SupAgro
+Copyright(c) 2021-2026, INRAE
 Inter Deposit Digital Number : IDDN.FR.001.360006.000.R.P.2009.000.30100
 
 
@@ -37,6 +37,7 @@ OpenFLUID relies on third party libraries and content, under the following licen
   - Qt: http://qt-project.org/doc/qt-5/opensourcelicense.html (LGPL)
   - OGR/GDAL: http://trac.osgeo.org/gdal/wiki/FAQGeneral#WhatlicensedoesGDALOGRuse (X11/MIT)
   - Material design icons: https://material.io/icons/ (Apache 2.0) and https://materialdesignicons.com/ (OFL-1.1)
+  - Pandoc : https://pandoc.org/ (not mandatory, GPL)
 
 
 

cmake/FindR.cmake

@@ -1,7 +1,7 @@
 ##
 #
 #  This file is part of OpenFLUID software
-#  Copyright(c) 2007, INRA - Montpellier SupAgro
+#  Copyright(c) 2021-2026, INRAE
 #
 #
 # == GNU General Public License Usage ==