diff --git a/.github/workflows/build_nix.yml b/.github/workflows/build_nix.yml index fd6ce13b..57a10b37 100644 --- a/.github/workflows/build_nix.yml +++ b/.github/workflows/build_nix.yml @@ -24,4 +24,5 @@ jobs: KLOG=3 ./mkn build -dtKa "-std=c++17 -fPIC" -O 2 -g 0 -W 9 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 ldd bin/build/mkn diff --git a/inc/maiken/project.hpp b/inc/maiken/project.hpp index d74d0987..713050ed 100644 --- a/inc/maiken/project.hpp +++ b/inc/maiken/project.hpp @@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. namespace maiken { struct ProjectInfo { - std::string local /*&*/, profiles, name, version /*#*/, scm; + std::string local /*&*/, profiles, name, version /*#*/, scm, bon = ""; ProjectInfo static PARSE_LINE(std::string const& line); }; diff --git a/mkn.yaml b/mkn.yaml index 288a63ab..cb586a71 100644 --- a/mkn.yaml +++ b/mkn.yaml @@ -3,7 +3,7 @@ name: mkn version: master property: - DATE: 29-SEP-2024 + DATE: 30-SEP-2024 parent: bin mode: none @@ -67,7 +67,7 @@ profile: main: server.cpp mode: none -- name: format +- name: format_a mod: - name: clang.format version: ${version} @@ -75,3 +75,6 @@ profile: style: file paths: . +- name: format + mod: | + clang.format{init:{style: google, paths: .}} diff --git a/src/maiken/mods.cpp b/src/maiken/mods.cpp index 6c6f2532..e85a5a72 100644 --- a/src/maiken/mods.cpp +++ b/src/maiken/mods.cpp @@ -64,22 +64,13 @@ void maiken::Application::mod(mkn::kul::hash::set::String& mods, std::vectorproject().root()[STR_NAME].Scalar()) { node[STR_LOCAL] = "."; if (am != std::string::npos || ha != std::string::npos) @@ -88,7 +79,7 @@ void maiken::Application::mod(mkn::kul::hash::set::String& mods, std::vector