Merge branch 'kdsoap-2.2'

.github/workflows/build.yml

@@ -25,7 +25,7 @@ jobs:
         os:
           - ubuntu-22.04
           - windows-2022
-          - macos-12
+          - macos-13
 
         build_type:
           - Debug

.github/workflows/documentation.yml

@@ -0,0 +1,69 @@
+# SPDX-FileCopyrightText: 2024 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+
+name: Deploy doxygen to GitHub Pages
+
+on:
+  push:
+    branches:
+      - kdsoap-2.2
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Install Dependencies on Linux
+        run: |
+          sudo apt update -qq
+          sudo apt install -y doxygen
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          aqtversion: null # use whatever the default is
+          version: 5.15.2
+          cache: true
+
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Configure project
+        run: >
+          cmake -S . -B ./build -DKDSoap_DOCS=ON
+
+      - name: Create docs
+        run: cmake --build ./build --target docs
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: build/docs/api/html/
+
+  # Deployment job, what was uploaded to artifact
+  deploy:
+    needs: build
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ ci:
 exclude: ^(cmake/ECM/|cmake/KDAB/|docs/api/doxygen-awesome.css)
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.6.0
+  rev: v5.0.0
   hooks:
   - id: trailing-whitespace
   - id: end-of-file-fixer
@@ -20,11 +20,11 @@ repos:
   - id: destroyed-symlinks
   - id: check-executables-have-shebangs
 - repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: v18.1.8
+  rev: v19.1.1
   hooks:
   - id: clang-format
 - repo: https://github.com/PyCQA/pylint
-  rev: v3.2.4
+  rev: v3.3.1
   hooks:
   - id: pylint
     exclude: ^(.cmake-format.py|conan/conanfile.py|scripts/genignore.py)
@@ -52,6 +52,6 @@ repos:
     language: ruby
     files: \.(md|mdown|markdown)$
 - repo: https://github.com/fsfe/reuse-tool
-  rev: v3.1.0a1
+  rev: v4.0.3
   hooks:
   - id: reuse

README.md

@@ -25,7 +25,7 @@ See [INSTALL.txt](INSTALL.txt) for installation instructions using CMake.
 
 Learn more at our:
 
-* [online API reference](https://docs.kdab.com/kdsoap)
+* [online API reference](https://kdab.github.io/KDSoap)
 * [programmers manual with examples](docs/manual/kdsoap.pdf)
 * [sorted example programs](examples/)
 

REUSE.toml

@@ -0,0 +1,94 @@
+version = 1
+SPDX-PackageName = "KDSoap"
+SPDX-PackageSupplier = "<[email protected]>"
+SPDX-PackageDownloadLocation = "https://www.github.com/KDAB/KDSoap"
+
+#misc source code
+[[annotations]]
+path = ["unittests/**/**.xsd", "unittests/**/**.wsdl", "unittests/**/**.XSD", "unittests/**/**.xml", "testtools/**.qrc", "examples/**/**.qrc", "examples/**/**.wsdl", "**.html", "**.css", "docs/manual/**.pdf", "**.bat", "**.pem"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>"
+SPDX-License-Identifier = "MIT"
+
+#artwork
+[[annotations]]
+path = ["images/**.png", "docs/api/**.png", "docs/**.png", "docs/**.odg", "examples/**/**.mng", "examples/**/**.gif"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>"
+SPDX-License-Identifier = "MIT"
+
+#misc documentation
+[[annotations]]
+path = ["**md", "**.txt", "**.html", "docs/manual/**.pdf"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>"
+SPDX-License-Identifier = "MIT"
+
+#misc config files
+[[annotations]]
+path = [".pre-commit-config.yaml", ".codespellrc", ".krazy", ".cmake-format.py", ".clang-format", ".clang-tidy", ".clazy", ".codedocs", ".gitignore", ".gitmodules", ".mdlrc", ".mdlrc.rb", ".pep8", ".pylintrc", "docs/api/Doxyfile.cmake", "distro/**", "REUSE.toml"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>"
+SPDX-License-Identifier = "BSD-3-Clause"
+
+[[annotations]]
+path = "kdwsdl2cpp/schemas/soapenc-1.1.xsd"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2001 DevelopMentor and 2001 W3C (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved."
+SPDX-License-Identifier = "W3C"
+
+[[annotations]]
+path = "kdwsdl2cpp/schemas/soapenc-1.2.xsd"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2003 W3C(R) (MIT, ERCIM, Keio), All Rights Reserved."
+SPDX-License-Identifier = "W3C"
+
+[[annotations]]
+path = "kdwsdl2cpp/schemas/schemas.qrc"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2005 Tobias Koenig <[email protected]>"
+SPDX-License-Identifier = "MIT"
+
+#3rdparty
+[[annotations]]
+path = "cmake/ECM/modules/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "The KDE Project"
+SPDX-License-Identifier = "BSD-3-Clause"
+
+[[annotations]]
+path = ["unittests/groupwise_wsdl/**.xsd", "unittests/groupwise_wsdl/**.wsdl"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2005-2006 Novell, Inc All Rights reserved."
+SPDX-License-Identifier = "GPL-2.0-only OR LicenseRef-Novell"
+
+[[annotations]]
+path = "unittests/salesforce_wsdl/**.wsdl"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "1999-2010 salesforce.com, inc. All Rights reserved."
+SPDX-License-Identifier = "BSD-3-Clause"
+
+[[annotations]]
+path = ["unittests/soap_over_udp/**.wsdl", "unittests/soap_over_udp/docs.oasis-open.org/ws-dd/discovery/1.1/os/wsdd-discovery-1.1-schema-os.xsd", "unittests/soap_over_udp/www.w3.org/2006/03/addressing/ws-addr.xsd"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2009 OASIS(r) All Rights reserved."
+SPDX-License-Identifier = "LicenseRef-OASIS"
+
+[[annotations]]
+path = "unittests/webcalls_wsdl/**.wsdl"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2003-2004 The Sporting Exchange Limited. All rights reserved."
+SPDX-License-Identifier = "LicenseRef-SportingExchange"
+
+[[annotations]]
+path = ["unittests/ws_discovery_wsdl/schemas.xmlsoap.org/ws/2005/04/discovery/ws-discovery.xsd", "unittests/ws_discovery_wsdl/schemas.xmlsoap.org/ws/2004/08/addressing", "unittests/ws_discovery_wsdl/**.wsdl"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "pyright © 2002-2004 BEA Systems Inc., International Business Machines Corporation, Microsoft Corporation, Inc, SAP AG, and Sun Microsystems, Inc.. All rights reserved."
+SPDX-License-Identifier = "LicenseRef-Microsoft"
+
+# doxygen awesome
+[[annotations]]
+path = "docs/api/doxygen-awesome.css"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2021 - 2023 jothepro"
+SPDX-License-Identifier = "MIT"

cmake/ECM/modules/ECMQueryQt.cmake

@@ -47,23 +47,21 @@ endif()
 if (QT_MAJOR_VERSION STREQUAL "5")
     # QUIET to accommodate the TRY option
     find_package(Qt${QT_MAJOR_VERSION}Core QUIET)
+    set(_exec_name_text "Qt5 qmake")
     if(TARGET Qt5::qmake)
         get_target_property(_qmake_executable_default Qt5::qmake LOCATION)
 
-        set(QUERY_EXECUTABLE ${_qmake_executable_default}
-            CACHE FILEPATH "Location of the Qt5 qmake executable")
-        set(_exec_name_text "Qt5 qmake")
+        set(QUERY_EXECUTABLE ${_qmake_executable_default})
         set(_cli_option "-query")
     endif()
 elseif(QT_MAJOR_VERSION STREQUAL "6")
     # QUIET to accommodate the TRY option
     find_package(Qt6 COMPONENTS CoreTools QUIET CONFIG)
+    set(_exec_name_text "Qt6 qtpaths")
     if (TARGET Qt6::qtpaths)
         get_target_property(_qtpaths_executable Qt6::qtpaths LOCATION)
 
-        set(QUERY_EXECUTABLE ${_qtpaths_executable}
-            CACHE FILEPATH "Location of the Qt6 qtpaths executable")
-        set(_exec_name_text "Qt6 qtpaths")
+        set(QUERY_EXECUTABLE ${_qtpaths_executable})
         set(_cli_option "--query")
     endif()
 endif()

cmake/KDAB/modules/KDQtInstallPaths.cmake

@@ -49,7 +49,10 @@ foreach(qval ${VARS_LIST})
             list(GET QVAL_LIST 1 path)
         endif()
         if(NOT ${var}) #if set already on the command line for example
-            set(${var} ${path} CACHE PATH "Qt install path for ${var}")
+            set(${var}
+                ${path}
+                CACHE PATH "Qt install path for ${var}"
+            )
         endif()
     endif()
 endforeach()