Use Qbs OnlineSource, cleanup qbs project

* prepares the Qbs project to be included by other projects with Qbs OnlineSource

Author: arBmind

.github/workflows/qbs_tests.yml

@@ -11,25 +11,27 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - image: arbmind/qbs-clang:1.21.0-14
+          - image: arbmind/qbs-clang:3.1.2-18
             build_args: "modules.cpp.cxxStandardLibrary:libc++ modules.cpp.staticLibraries:c++,c++abi"
-          - image: arbmind/qbs-clang:2.1.2-17
+          - image: arbmind/qbs-clang:3.1.2-21
             build_args: "modules.cpp.cxxStandardLibrary:libc++ modules.cpp.staticLibraries:c++,c++abi"
-          - image: arbmind/qbs-clang-libstdcpp:1.24.0-15-12
-          - image: arbmind/qbs-gcc:1.21.0-11
-          - image: arbmind/qbs-gcc:1.24.0-12
-          - image: arbmind/qbs-gcc:2.1.2-13
+          - image: arbmind/qbs-clang-libstdcpp:3.1.2-21-15
+          - image: arbmind/qbs-gcc:3.1.2-13
+          - image: arbmind/qbs-gcc:3.1.2-14
+          - image: arbmind/qbs-gcc:3.1.2-15
 
     steps:
       - uses: actions/checkout@v4
 
+      # we have no git in container fetch googletest before
       - name: Get Googletest
-        run: third_party/git_clone_googletest.sh
+        run: script/git_clone_googletest.sh
 
       - name: Build and run Tests
         run: >-
           docker run --rm -v ${GITHUB_WORKSPACE}:/project -w /project
           --env GTEST_OUTPUT=xml:/project/reports/qbs/
+          --env QBS_GOOGLETEST_SOURCE=/project/script/googletest
           ${{ matrix.image }}
           build
           --build-directory /tmp/build
@@ -71,10 +73,6 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - name: Get Googletest
-        run: third_party/git_clone_googletest.sh
-        shell: bash
-
       - name: Build and run Tests
         env:
           GTEST_OUTPUT: xml:${{ github.workspace }}\reports\msvc\

co-cpp19.qbs

@@ -3,37 +3,27 @@ import qbs
 Project {
     name: "Co-Cpp19"
 
-    // to use libc++ set
-    // modules.cpp.cxxStandardLibrary:libc++ modules.cpp.staticLibraries:c++,c++abi
+    property string version: "2026.01"
+    property string configProductName: "Co-Cpp19-Config"
+    property bool enableQbsImports: (sourceDirectory === path)
+    property bool enableTests: (sourceDirectory === path)
+    property bool enableThirdParty: (sourceDirectory === path)
 
-    references: [
-        "third_party/third_party.qbs",
-        "src/array19.lib",
-        "src/coro19.lib",
-        "src/enum19.lib",
-        "src/flags19.lib",
-        "src/meta19.lib",
-        "src/lookup19.lib",
-        "src/optional19.lib",
-        "src/partial19.lib",
-        "src/serialize19.lib",
-        "src/signal19.lib",
-        "src/string19.lib",
-        "src/strong19.lib",
-        "src/tuple19.lib",
-        "src/variant19.lib",
-    ]
-
-    AutotestRunner {}
+    minimumQbsVersion: "3.0"
+    qbsSearchPaths: enableQbsImports ? ["qbs"] : []
+    references: ["src/src.qbs"]
 
     // note: if do not use this .qbs project you need a similar setup
     Product {
-        name: "cpp19"
+        name: "Co-Cpp19-Config"
+        condition: parent.configProductName === "Co-Cpp19-Config"
 
         Export {
-            Depends { name: "cpp" }
             cpp.cxxLanguageVersion: "c++23"
             cpp.treatWarningsAsErrors: true
+            // to use libc++ set
+            // modules.cpp.cxxStandardLibrary:libc++
+            // modules.cpp.staticLibraries:c++,c++abi
 
             Properties {
                 condition: qbs.toolchain.contains('msvc')
@@ -55,11 +45,19 @@ Project {
                     "-Wno-gnu-zero-variadic-macro-arguments" // accept this extensions for opaque strong types
                 )
             }
+            Depends { name: "cpp" }
         }
     }
-
+    SubProject {
+        condition: parent.enableTests
+        filePath: "src/tests.qbs"
+    }
+    SubProject {
+        condition: parent.enableThirdParty
+        filePath: "third_party/third_party.qbs"
+    }
     Product {
-        name: "_Extra Files_"
+        name: "[CoCpp19 Extra Files]"
         files: [
             ".clang-format",
             ".clang-tidy",

qbs/imports/online/QbsProject.qbs

@@ -0,0 +1,6 @@
+SubProject {
+    property variant source
+
+    condition: source && source.found
+    filePath: source.projectFilePath
+}

qbs/imports/online/Source.qbs

@@ -0,0 +1,32 @@
+import "onlinesource.js" as OnlineSource
+
+Probe {
+    id: probe
+
+    property string name
+    property string uri
+    property string projectFile
+    property path sourceCache
+    property path buildDirectory: project.buildDirectory
+
+    // Results
+    property path sourceDirectory
+    property path projectFilePath
+
+    configure: {
+        var result = OnlineSource.fetch({
+            name: probe.name,
+            uri: probe.uri,
+            projectFile: probe.projectFile,
+            sourceCache: probe.sourceCache,
+            buildDirectory: probe.buildDirectory,
+        });
+        if (result) {
+            sourceDirectory = result.sourceDirectory;
+            if (result.projectFile) projectFilePath = result.projectFile;
+            found = true;
+        } else {
+            found = false;
+        }
+    }
+}