overresolved (#106)

PhilipDeegan · Oct 1, 2024 · 8954d32 · 8954d32
1 parent 2fcb6ab
commit 8954d32
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/build_nix.yml b/.github/workflows/build_nix.yml
@@ -25,4 +25,5 @@ jobs:
         KLOG=3 ./mkn build -Op test_mod -a "-std=c++17 -fPIC" -O 2 -g 0 -W 9
         KLOG=3 ./mkn build test pack -Op test -a "-std=c++17 -fPIC" -O 2 -g 0 -W 9
         KLOG=3 ./mkn build -dtOp format -a "-std=c++17 -fPIC" -O 2 -g 0 -W 9
+        KLOG=3 ./mkn -p lib_test
         ldd bin/build/mkn
diff --git a/.github/workflows/build_osx.yml b/.github/workflows/build_osx.yml
@@ -27,3 +27,4 @@ jobs:
         KLOG=3 ./mkn build -dtKO 2 -W 9 -g 0
         KLOG=3 ./mkn build -dtOp test_mod
         KLOG=3 ./mkn build test pack -Op test
+        KLOG=3 ./mkn -p lib_test
diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml
@@ -29,3 +29,4 @@ jobs:
         mkn build -dtKO 2 -g 0 -a "-std:c++17 -EHsc"
         mkn build -dtOp test_mod -a "-std:c++17 -EHsc"
         mkn build test pack -Op test -a "-std:c++17 -EHsc"
+        mkn -p lib_test
diff --git a/mkn.yaml b/mkn.yaml
@@ -4,14 +4,17 @@ name: mkn
 version: master
 property:
   DATE: 30-SEP-2024
+  maiken_location: ${MKN_HOME}/app/mkn/${version}
+  maiken_scm: https://github.com/mkn/mkn
+  self.deps: mkn.kul
 
 parent: bin
 mode: none
 
 profile:
 - name: headers
   inc: inc
-  dep: mkn.kul
+  dep: ${self.deps}
 
 - name: compiled
   parent: headers
@@ -78,3 +81,7 @@ profile:
 - name: format
   mod: |
     clang.format{init:{style: google, paths: .}}
+
+
+- name: lib_test
+  dep: mkn&${maiken_location}(${maiken_scm})[mod]
diff --git a/src/maiken/setup.cpp b/src/maiken/setup.cpp
@@ -177,8 +177,7 @@ 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(Properties::RESOLVE(*this, n[STR_DEP].Scalar())))
+          for (auto const& with_str : mkn::kul::cli::asArgs(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);
@@ -191,8 +190,7 @@ 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(Properties::RESOLVE(*this, node.Scalar())))
+          for (auto const& with_str : mkn::kul::cli::asArgs(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);