more property resolutions (#102)

PhilipDeegan · Sep 15, 2024 · 0b16b57 · 0b16b57
1 parent 71b8de7
commit 0b16b57
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -103,7 +103,7 @@ jobs:
     needs: [build, build_many_linux, build_arm_macos, build_x86_macos]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4.1.7
       - name: Display fetched artifacts
         run: ls -R
       - name: Emit a Github Release

diff --git a/mkn.yaml b/mkn.yaml
@@ -1,9 +1,9 @@
-#! clean build test -dtKOW 9 -g 0 -q
+#! clean build test -dtKOWg 0 -qw mkn.ram[https]
 
 name: mkn
 version: master
 property:
-  DATE: 21-AUG-2024
+  DATE: 15-SEP-2024
 
 parent: bin
 mode: none

diff --git a/src/maiken/setup.cpp b/src/maiken/setup.cpp
@@ -40,7 +40,8 @@ void sub_initializer(Application const& app, std::vector<YAML::Node> const& node
 
   auto const process = [&](auto n) {
     if (n[STR_SUB] && n[STR_SUB].IsScalar()) {
-      for (auto const& line : mkn::kul::cli::asArgs(n[STR_SUB].Scalar())) {
+      for (auto const& line :
+           mkn::kul::cli::asArgs(Properties::RESOLVE(app, n[STR_SUB].Scalar()))) {
         auto pInfo = ProjectInfo::PARSE_LINE(line);
         mkn::kul::Dir local{pInfo.local};
         if (!local)
@@ -174,7 +175,8 @@ void maiken::Application::setup() KTHROW(mkn::kul::Exception) {
           withArgs(with_str, with_nodes, getIfMissing, 0);
       if (n[STR_DEP]) {
         if (n[STR_DEP].IsScalar())
-          for (auto const& with_str : mkn::kul::cli::asArgs(n[STR_DEP].Scalar()))
+          for (auto const& with_str :
+               mkn::kul::cli::asArgs(Properties::RESOLVE(*this, n[STR_DEP].Scalar())))
             withArgs(with_str, with_nodes, getIfMissing, 1);
         else if (n[STR_DEP].IsSequence())
           for (auto const& dep : n[STR_DEP]) getIfMissing(dep, 0);
@@ -187,7 +189,8 @@ void maiken::Application::setup() KTHROW(mkn::kul::Exception) {
       if (n[STR_IF_DEP] && n[STR_IF_DEP][KTOSTRING(__MKN_KUL_OS__)]) {
         auto node = n[STR_IF_DEP][KTOSTRING(__MKN_KUL_OS__)];
         if (node.IsScalar()) {
-          for (auto const& with_str : mkn::kul::cli::asArgs(node.Scalar()))
+          for (auto const& with_str :
+               mkn::kul::cli::asArgs(Properties::RESOLVE(*this, node.Scalar())))
             withArgs(with_str, with_nodes, getIfMissing, 1);
         } else if (n[STR_DEP].IsSequence()) {
           for (auto const& dep : n[STR_IF_DEP][KTOSTRING(__MKN_KUL_OS__)]) getIfMissing(dep, 0);
@@ -325,7 +328,7 @@ void maiken::Application::setup() KTHROW(mkn::kul::Exception) {
             for (auto it = node[str].begin(); it != node[str].end(); ++it)
               if (it->first.Scalar() == KTOSTRING(__MKN_KUL_OS__))
                 for (auto const& s : mkn::kul::String::LINES(it->second.Scalar())) (this->*fn)(s);
-        } catch (const mkn::kul::StringException&) {
+        } catch (mkn::kul::StringException const&) {
           KEXIT(1, std::string(str) + " contains invalid bool value\n" + project().dir().path());
         }
       };