Merge pull request #22 from Neko-Box-Coder/RuntimeLogLevelAndWarnings

Neko-Box-Coder · web-flow · commit 7ffdfeb96f77 · 2024-10-21T13:14:05.000+01:00
Runtime log level and warnings
diff --git a/.gitignore b/.gitignore
@@ -43,6 +43,7 @@ Builds/
 Build/
 v0.*/
 *.bak
+*.runcpp2/
 Releases/
 Resources/embed
 Resources/embed.exe
diff --git a/DefaultYAMLs/DefaultUserConfig.yaml b/DefaultYAMLs/DefaultUserConfig.yaml
@@ -1,7 +1,7 @@
 # List of anchors that will be aliased later
 Templates:
     MSVC_CompileFlags: &MSVC_CompileFlags
-        Flags: "/NOLOGO /W3 /WX /diagnostics:caret /D NDEBUG /utf-8 /Gm- /MD /EHa /TP /std:c++17 /GR /TP"
+        Flags: "/NOLOGO /W4 /diagnostics:caret /D NDEBUG /utf-8 /Gm- /MD /EHa /TP /std:c++17 /GR /TP"
     
     "g++_CompileRunParts": &g++_CompileRunParts
     -   Type: Once
@@ -164,7 +164,7 @@ Profiles:
         CompileTypes:
             Executable:
                 Default:
-                    Flags: "-std=c++17 -Wall -Werror"
+                    Flags: "-std=c++17 -Wall"
                     Executable: "g++"
                     RunParts: *g++_CompileRunParts
                     # (Optional) The commands to run in **shell** BEFORE compiling
@@ -175,14 +175,14 @@ Profiles:
                     # Cleanup: []
             Static:
                 Default:
-                    Flags: "-std=c++17 -Wall -Werror"
+                    Flags: "-std=c++17 -Wall"
                     Executable: "g++"
                     RunParts: *g++_CompileRunParts
                     # Setup: []
                     # Cleanup: []
             Shared:
                 Default:
-                    Flags: "-std=c++17 -Wall -Werror -fpic"
+                    Flags: "-std=c++17 -Wall -fpic"
                     Executable: "g++"
                     RunParts: *g++_CompileRunParts
                     # Setup: []
diff --git a/Examples/test.cpp b/Examples/test.cpp
@@ -45,13 +45,26 @@
         Default:
             "Default":
             -  "./Include/ssLogger/ssLog.hpp"
+
+-   Name: System2.cpp
+    Platforms: [Default]
+    Source:
+        Type: Git
+        Value: "https://github.com/Neko-Box-Coder/System2.cpp.git"
+    LibraryType: Header
+    IncludePaths: ["./", "./External/System2"]
+    Setup:
+        Default:
+            "Default":
+            -   "git submodule update --init --recursive"
 */
 
 
 //#include "ssLogger/ssLogInit.hpp"
 
 #define ssLOG_DLL 1
 #include "ssLogger/ssLog.hpp"
+#include "System2.hpp"
 
 #if defined(__GNUC__)
     #include "./OtherSources/AnotherSourceFileGcc.hpp"
@@ -69,6 +82,16 @@ int main(int argc, char* argv[])
     std::cout << "Hello World" << std::endl;
     std::cout << TEST_DEF << std::endl;
     
+    System2CommandInfo commandInfo = {};
+    int returnCode = 0;
+    
+    #if defined(_WIN32)
+        System2CppRun("dir", commandInfo);
+    #else
+        auto re = System2CppRun("ls -lah", commandInfo);
+    #endif
+    System2CppGetCommandReturnValueSync(commandInfo, returnCode);
+    
     for(int i = 0; i < argc; ++i)
         std::cout << "Arg" << i << ": " << argv[i] << std::endl;
     
diff --git a/Include/runcpp2/runcpp2.hpp b/Include/runcpp2/runcpp2.hpp
@@ -23,6 +23,7 @@ namespace runcpp2
         WATCH,
         BUILD,
         VERSION,
+        LOG_LEVEL,
         COUNT
     };
     
diff --git a/Src/runcpp2/CompilingLinking.cpp b/Src/runcpp2/CompilingLinking.cpp
@@ -292,6 +292,15 @@ namespace
                         ssLOG_ERROR("Compile output: \n" << commandOutput);
                         return false;
                     }
+                    else
+                    {
+                        //TODO: Make this configurable
+                        //Attempt to capture warnings
+                        if(commandOutput.find(" warning") != std::string::npos)
+                            ssLOG_WARNING("Warning detected:\n" << commandOutput);
+                        else
+                            ssLOG_INFO("Compile output:\n" << commandOutput);
+                    }
                 }
                 
                 //Run cleanup if any
@@ -581,6 +590,8 @@ namespace
                     ssLOG_ERROR("Link output: \n" << linkOutput);
                     return false;
                 }
+                else
+                    ssLOG_INFO("Link output:\n" << linkOutput);
             }
             
             //Run cleanup if any
diff --git a/Src/runcpp2/Data/StageInfo.cpp b/Src/runcpp2/Data/StageInfo.cpp
@@ -326,8 +326,8 @@ bool runcpp2::Data::StageInfo::ConstructCommand(const SubstitutionMap& substitut
     
     for(int i = 0; i < currentRunParts.size(); ++i)
     {
-        ssLOG_INFO("Parsing run part at index: " << i);
-        ssLOG_INFO("Which is: \"" << currentRunParts.at(i).CommandPart << "\"");
+        ssLOG_DEBUG("Parsing run part at index: " << i);
+        ssLOG_DEBUG("Which is: \"" << currentRunParts.at(i).CommandPart << "\"");
         
         std::string currentEscapedPart;
         std::vector<std::string> substitutionsInCurrentPart;
diff --git a/Src/runcpp2/PlatformUtil.cpp b/Src/runcpp2/PlatformUtil.cpp
@@ -118,10 +118,11 @@ bool runcpp2::RunCommandAndGetOutput(   const std::string& command,
         return false;
     }
     
+    ssLOG_DEBUG("outOutput: \n" << outOutput.c_str());
+    
     if(outReturnCode != 0)
     {
-        ssLOG_DEBUG("Failed when running command");
-        ssLOG_DEBUG("outOutput: \n" << outOutput.c_str());
+        ssLOG_DEBUG("Failed when running command with return code: " << outReturnCode);
         return false;
     }
     
diff --git a/Src/runcpp2/main.cpp b/Src/runcpp2/main.cpp
@@ -169,12 +169,13 @@ bool GenerateScriptTemplate(const std::string& outputFilePathStr)
 
 int main(int argc, char* argv[])
 {
+    ssLOG_SET_CURRENT_THREAD_TARGET_LEVEL(ssLOG_LEVEL_WARNING);
+    
     //Parse command line options
     int currentArgIndex = 0;
     std::unordered_map<runcpp2::CmdOptions, std::string> currentOptions;
-
     {
-        static_assert(static_cast<int>(runcpp2::CmdOptions::COUNT) == 12, "Update this");
+        static_assert(static_cast<int>(runcpp2::CmdOptions::COUNT) == 13, "Update this");
         std::unordered_map<std::string, runcpp2::OptionInfo> longOptionsMap =
         {
             {
@@ -220,10 +221,14 @@ int main(int argc, char* argv[])
             {
                 "--version",
                 runcpp2::OptionInfo(runcpp2::CmdOptions::VERSION, false)
+            },
+            {
+                "--log-level",
+                runcpp2::OptionInfo(runcpp2::CmdOptions::LOG_LEVEL, true)
             }
         };
         
-        static_assert(static_cast<int>(runcpp2::CmdOptions::COUNT) == 12, "Update this");
+        static_assert(static_cast<int>(runcpp2::CmdOptions::COUNT) == 13, "Update this");
         std::unordered_map<std::string, const runcpp2::OptionInfo&> shortOptionsMap = 
         {
             {"-r", longOptionsMap.at("--reset-cache")},
@@ -253,7 +258,7 @@ int main(int argc, char* argv[])
     //Help message
     if(currentOptions.count(runcpp2::CmdOptions::HELP))
     {
-        static_assert(static_cast<int>(runcpp2::CmdOptions::COUNT) == 12, "Update this");
+        static_assert(static_cast<int>(runcpp2::CmdOptions::COUNT) == 13, "Update this");
         ssLOG_BASE("Usage: runcpp2 [options] [input_file]");
         ssLOG_BASE("Options:");
         ssLOG_BASE("    -r, --[r]eset-cache                     Deletes all cache and build everything from scratch");
@@ -266,11 +271,33 @@ int main(int argc, char* argv[])
         ssLOG_BASE("    -t, --create-script-[t]emplate <file>   Creates/prepend runcpp2 script info template");
         ssLOG_BASE("    -w, --[w]atch                           Watch script changes and output any compiling errors");
         ssLOG_BASE("    -b, --[b]uild                           Build the script and copy output files to the working directory");
-        ssLOG_BASE("    -v, --[v]ersion                           Show the version of runcpp2");
+        ssLOG_BASE("    -v, --[v]ersion                         Show the version of runcpp2");
+        ssLOG_BASE("        --log-level <level>                 Sets the log level (Normal, Info, Debug) for runcpp2.");
         
         return 0;
     }
     
+    //Set Log level
+    if(currentOptions.count(runcpp2::CmdOptions::LOG_LEVEL))
+    {
+        std::string level = currentOptions.at(runcpp2::CmdOptions::LOG_LEVEL);
+        runcpp2::Trim(level);
+        for(int i = 0; i < level.size(); ++i)
+            level[i] = std::tolower(level[i]);
+        
+        if(level == "info")
+            ssLOG_SET_CURRENT_THREAD_TARGET_LEVEL(ssLOG_LEVEL_INFO);
+        else if(level == "debug")
+            ssLOG_SET_CURRENT_THREAD_TARGET_LEVEL(ssLOG_LEVEL_DEBUG);
+        else if(level == "normal")
+            ssLOG_SET_CURRENT_THREAD_TARGET_LEVEL(ssLOG_LEVEL_WARNING);
+        else
+        {
+            ssLOG_ERROR("Invalid level: " << level);
+            return -1;
+        }
+    }
+    
     //Show user config path
     if(currentOptions.count(runcpp2::CmdOptions::SHOW_USER_CONFIG))
     {
@@ -294,7 +321,7 @@ int main(int argc, char* argv[])
             ssLOG_ERROR("Failed reset user config");
             return -1;
         }
-        
+        ssLOG_BASE("User config reset successful");
         return 0;
     }
     
@@ -304,7 +331,10 @@ int main(int argc, char* argv[])
         if(!GenerateScriptTemplate(currentOptions.at(runcpp2::CmdOptions::SCRIPT_TEMPLATE)))
             return -1;
         else
+        {
+            ssLOG_BASE("Script template generated");
             return 0;
+        }
     }
     
     std::vector<runcpp2::Data::Profile> profiles;
@@ -388,17 +418,19 @@ int main(int argc, char* argv[])
                         return -1;
                     
                     case runcpp2::PipelineResult::UNEXPECTED_FAILURE:
-                    case runcpp2::PipelineResult::SUCCESS:
                     case runcpp2::PipelineResult::INVALID_BUILD_DIR:
                     case runcpp2::PipelineResult::INVALID_SCRIPT_INFO:
                     case runcpp2::PipelineResult::NO_AVAILABLE_PROFILE:
                     case runcpp2::PipelineResult::DEPENDENCIES_FAILED:
                     case runcpp2::PipelineResult::COMPILE_LINK_FAILED:
                     case runcpp2::PipelineResult::INVALID_PROFILE:
                     case runcpp2::PipelineResult::RUN_SCRIPT_FAILED:
+                        ssLOG_BASE("Watching...");
+                        break;
+                    case runcpp2::PipelineResult::SUCCESS:
+                        ssLOG_BASE("No error. Watching...");
                         break;
                 }
-                ssLOG_BASE("No error. Watching...");
             }
             
             lastScriptWriteTime = ghc::filesystem::last_write_time(script, e);
diff --git a/Src/runcpp2/runcpp2.cpp b/Src/runcpp2/runcpp2.cpp
@@ -264,8 +264,14 @@ namespace
         
         if(compileFiles == nullptr)
         {
-            ssLOG_ERROR("Failed to get compile files for current platform");
-            return false;
+            ssLOG_INFO("No other files to be compiled files current platform");
+            
+            if(!scriptInfo.OtherFilesToBeCompiled.empty())
+            {
+                ssLOG_WARNING(  "Other source files are present, "
+                                "but none are included for current configuration. Is this intended?");
+            }
+            return true;
         }
         
         std::string foundProfileName;

Original file line number	Diff line number	Diff line change
`@@ -292,6 +292,15 @@ namespace`
`292`	`292`	`ssLOG_ERROR("Compile output: \n" << commandOutput);`
`293`	`293`	`return false;`
`294`	`294`	`}`
	`295`	`+ else`
	`296`	`+ {`
	`297`	`+ //TODO: Make this configurable`
	`298`	`+ //Attempt to capture warnings`
	`299`	`+ if(commandOutput.find(" warning") != std::string::npos)`
	`300`	`+ ssLOG_WARNING("Warning detected:\n" << commandOutput);`
	`301`	`+ else`
	`302`	`+ ssLOG_INFO("Compile output:\n" << commandOutput);`
	`303`	`+ }`
`295`	`304`	`}`
`296`	`305`
`297`	`306`	`//Run cleanup if any`
`@@ -581,6 +590,8 @@ namespace`
`581`	`590`	`ssLOG_ERROR("Link output: \n" << linkOutput);`
`582`	`591`	`return false;`
`583`	`592`	`}`
	`593`	`+ else`
	`594`	`+ ssLOG_INFO("Link output:\n" << linkOutput);`
`584`	`595`	`}`
`585`	`596`
`586`	`597`	`//Run cleanup if any`
Original file line number	Diff line number	Diff line change
`@@ -326,8 +326,8 @@ bool runcpp2::Data::StageInfo::ConstructCommand(const SubstitutionMap& substitut`
`326`	`326`
`327`	`327`	`for(int i = 0; i < currentRunParts.size(); ++i)`
`328`	`328`	`{`
`329`		`- ssLOG_INFO("Parsing run part at index: " << i);`
`330`		`- ssLOG_INFO("Which is: \"" << currentRunParts.at(i).CommandPart << "\"");`
	`329`	`+ ssLOG_DEBUG("Parsing run part at index: " << i);`
	`330`	`+ ssLOG_DEBUG("Which is: \"" << currentRunParts.at(i).CommandPart << "\"");`
`331`	`331`
`332`	`332`	`std::string currentEscapedPart;`
`333`	`333`	`std::vector<std::string> substitutionsInCurrentPart;`
Original file line number	Diff line number	Diff line change
`@@ -118,10 +118,11 @@ bool runcpp2::RunCommandAndGetOutput( const std::string& command,`
`118`	`118`	`return false;`
`119`	`119`	`}`
`120`	`120`
	`121`	`+ ssLOG_DEBUG("outOutput: \n" << outOutput.c_str());`
	`122`	`+`
`121`	`123`	`if(outReturnCode != 0)`
`122`	`124`	`{`
`123`		`- ssLOG_DEBUG("Failed when running command");`
`124`		`- ssLOG_DEBUG("outOutput: \n" << outOutput.c_str());`
	`125`	`+ ssLOG_DEBUG("Failed when running command with return code: " << outReturnCode);`
`125`	`126`	`return false;`
`126`	`127`	`}`
`127`	`128`