Moving methods in runcpp2 out

Neko-Box-Coder · Neko-Box-Coder · commit 49ac3277354f · 2024-03-02T02:01:01.000Z
diff --git a/Include/runcpp2/CompilerProfileHelper.hpp b/Include/runcpp2/CompilerProfileHelper.hpp
@@ -0,0 +1,24 @@
+#ifndef RUNCPP2_COMPILER_PROFILE_HELPER_HPP
+#define RUNCPP2_COMPILER_PROFILE_HELPER_HPP
+
+#include "runcpp2/Data/CompilerProfile.hpp"
+#include "runcpp2/Data/ScriptInfo.hpp"
+namespace runcpp2
+{
+    bool IsProfileAvailableOnSystem(const CompilerProfile& profile);
+
+    bool IsProfileValidForScript(   const CompilerProfile& profile, 
+                                    const ScriptInfo& scriptInfo, 
+                                    const std::string& scriptPath);
+
+    std::vector<ProfileName> GetAvailableProfiles(  const std::vector<CompilerProfile>& profiles,
+                                                    const ScriptInfo& scriptInfo,
+                                                    const std::string& scriptPath);
+
+    int GetPreferredProfileIndex(   const std::string& scriptPath,
+                                    const ScriptInfo& scriptInfo,
+                                    const std::vector<CompilerProfile>& profiles, 
+                                    const std::string& configPreferredProfile);
+}
+
+#endif
diff --git a/Include/runcpp2/CompilingLinking.hpp b/Include/runcpp2/CompilingLinking.hpp
@@ -0,0 +1,15 @@
+#ifndef RUNCPP2_COMPILING_LINKING_HPP
+#define RUNCPP2_COMPILING_LINKING_HPP
+
+#include "runcpp2/Data/CompilerProfile.hpp"
+#include "runcpp2/Data/ScriptInfo.hpp"
+#include <string>
+
+namespace runcpp2 
+{
+    bool CompileAndLinkScript(  const std::string& scriptPath, 
+                                const ScriptInfo& scriptInfo,
+                                const CompilerProfile& profile);
+}
+
+#endif
diff --git a/Include/runcpp2/ConfigParsing.hpp b/Include/runcpp2/ConfigParsing.hpp
@@ -0,0 +1,21 @@
+#ifndef RUNCPP2_CONFIG_PARSING_HPP
+#define RUNCPP2_CONFIG_PARSING_HPP
+
+#include "runcpp2/Data/CompilerProfile.hpp"
+#include "runcpp2/Data/ScriptInfo.hpp"
+#include <string>
+#include <vector>
+namespace runcpp2
+{
+    bool ParseCompilerProfiles( const std::string& compilerProfilesString, 
+                                std::vector<CompilerProfile>& outProfiles,
+                                std::string& outPreferredProfile);
+    
+    bool ReadUserConfig(std::vector<CompilerProfile>& outProfiles, 
+                        std::string& outPreferredProfile);
+    
+    bool ParseScriptInfo(   const std::string& scriptInfo, 
+                            ScriptInfo& outScriptInfo);
+}
+
+#endif
diff --git a/Include/runcpp2/Data/CompilerInfo.hpp b/Include/runcpp2/Data/CompilerInfo.hpp
@@ -1,5 +1,5 @@
-#ifndef RUNCPP2_COMPILER_INFO_HPP
-#define RUNCPP2_COMPILER_INFO_HPP
+#ifndef RUNCPP2_DATA_COMPILER_INFO_HPP
+#define RUNCPP2_DATA_COMPILER_INFO_HPP
 
 #include "yaml-cpp/yaml.h"
 
diff --git a/Include/runcpp2/Data/CompilerProfile.hpp b/Include/runcpp2/Data/CompilerProfile.hpp
@@ -1,5 +1,5 @@
-#ifndef RUNCPP2_COMPILER_PROFILE_HPP
-#define RUNCPP2_COMPILER_PROFILE_HPP
+#ifndef RUNCPP2_DATA_COMPILER_PROFILE_HPP
+#define RUNCPP2_DATA_COMPILER_PROFILE_HPP
 
 #include "runcpp2/Data/CompilerInfo.hpp"
 #include "runcpp2/Data/LinkerInfo.hpp"
diff --git a/Include/runcpp2/Data/DependencyInfo.hpp b/Include/runcpp2/Data/DependencyInfo.hpp
@@ -1,5 +1,5 @@
-#ifndef RUNCPP2_DEPENDENCY_INFO_HPP
-#define RUNCPP2_DEPENDENCY_INFO_HPP
+#ifndef RUNCPP2_DATA_DEPENDENCY_INFO_HPP
+#define RUNCPP2_DATA_DEPENDENCY_INFO_HPP
 
 #include "runcpp2/Data/DependencyLibraryType.hpp"
 #include "runcpp2/Data/DependencySource.hpp"
diff --git a/Include/runcpp2/Data/DependencyLibraryType.hpp b/Include/runcpp2/Data/DependencyLibraryType.hpp
@@ -1,5 +1,5 @@
-#ifndef RUNCPP2_DEPENDENCY_LIBRARY_TYPE_HPP
-#define RUNCPP2_DEPENDENCY_LIBRARY_TYPE_HPP
+#ifndef RUNCPP2_DATA_DEPENDENCY_LIBRARY_TYPE_HPP
+#define RUNCPP2_DATA_DEPENDENCY_LIBRARY_TYPE_HPP
 
 namespace runcpp2
 {
diff --git a/Include/runcpp2/Data/DependencySearchProperty.hpp b/Include/runcpp2/Data/DependencySearchProperty.hpp
@@ -1,5 +1,5 @@
-#ifndef RUNCPP2_DEPENDENCY_SEARCH_PROPERTY_HPP
-#define RUNCPP2_DEPENDENCY_SEARCH_PROPERTY_HPP
+#ifndef RUNCPP2_DATA_DEPENDENCY_SEARCH_PROPERTY_HPP
+#define RUNCPP2_DATA_DEPENDENCY_SEARCH_PROPERTY_HPP
 
 #include "yaml-cpp/yaml.h"
 #include <string>
diff --git a/Include/runcpp2/Data/DependencySetup.hpp b/Include/runcpp2/Data/DependencySetup.hpp
@@ -1,5 +1,5 @@
-#ifndef RUNCPP2_DEPENDENCY_SETUP_HPP
-#define RUNCPP2_DEPENDENCY_SETUP_HPP
+#ifndef RUNCPP2_DATA_DEPENDENCY_SETUP_HPP
+#define RUNCPP2_DATA_DEPENDENCY_SETUP_HPP
 
 #include "runcpp2/Data/ParseCommon.hpp"
 
diff --git a/Include/runcpp2/Data/DependencySource.hpp b/Include/runcpp2/Data/DependencySource.hpp
@@ -1,5 +1,5 @@
-#ifndef RUNCPP2_DEPENDENCY_SOURCE_HPP
-#define RUNCPP2_DEPENDENCY_SOURCE_HPP
+#ifndef RUNCPP2_DATA_DEPENDENCY_SOURCE_HPP
+#define RUNCPP2_DATA_DEPENDENCY_SOURCE_HPP
 
 #include "runcpp2/Data/DependencySourceType.hpp"
 #include "yaml-cpp/yaml.h"
diff --git a/Include/runcpp2/Data/DependencySourceType.hpp b/Include/runcpp2/Data/DependencySourceType.hpp
@@ -1,5 +1,5 @@
-#ifndef RUNCPP2_DEPENDENCY_SOURCE_TYPE_HPP
-#define RUNCPP2_DEPENDENCY_SOURCE_TYPE_HPP
+#ifndef RUNCPP2_DATA_DEPENDENCY_SOURCE_TYPE_HPP
+#define RUNCPP2_DATA_DEPENDENCY_SOURCE_TYPE_HPP
 
 namespace runcpp2
 {
diff --git a/Include/runcpp2/Data/FlagsOverrideInfo.hpp b/Include/runcpp2/Data/FlagsOverrideInfo.hpp
@@ -1,5 +1,5 @@
-#ifndef RUNCPP2_FLAGS_OVERRIDE_INFO_HPP
-#define RUNCPP2_FLAGS_OVERRIDE_INFO_HPP
+#ifndef RUNCPP2_DATA_FLAGS_OVERRIDE_INFO_HPP
+#define RUNCPP2_DATA_FLAGS_OVERRIDE_INFO_HPP
 
 #include "yaml-cpp/yaml.h"
 #include <string>
diff --git a/Include/runcpp2/Data/LinkerInfo.hpp b/Include/runcpp2/Data/LinkerInfo.hpp
@@ -1,5 +1,5 @@
-#ifndef RUNCPP2_LINKER_INFO_HPP
-#define RUNCPP2_LINKER_INFO_HPP
+#ifndef RUNCPP2_DATA_LINKER_INFO_HPP
+#define RUNCPP2_DATA_LINKER_INFO_HPP
 
 #include "yaml-cpp/yaml.h"
 #include <string>
diff --git a/Include/runcpp2/Data/ParseCommon.hpp b/Include/runcpp2/Data/ParseCommon.hpp
@@ -1,5 +1,5 @@
-#ifndef RUNCPP2_PARSE_COMMON_HPP
-#define RUNCPP2_PARSE_COMMON_HPP
+#ifndef RUNCPP2_DATA_PARSE_COMMON_HPP
+#define RUNCPP2_DATA_PARSE_COMMON_HPP
 
 #include <string>
 
diff --git a/Include/runcpp2/Data/ScriptInfo.hpp b/Include/runcpp2/Data/ScriptInfo.hpp
@@ -1,5 +1,5 @@
-#ifndef RUNCPP2_SCRIPT_INFO_HPP
-#define RUNCPP2_SCRIPT_INFO_HPP
+#ifndef RUNCPP2_DATA_SCRIPT_INFO_HPP
+#define RUNCPP2_DATA_SCRIPT_INFO_HPP
 
 #include "runcpp2/Data/DependencyInfo.hpp"
 #include "runcpp2/Data/FlagsOverrideInfo.hpp"
diff --git a/Include/runcpp2/DependenciesSetupHelper.hpp b/Include/runcpp2/DependenciesSetupHelper.hpp
@@ -0,0 +1,32 @@
+#ifndef RUNCPP2_DEPENDENCIES_SETUP_HELPER_HPP
+#define RUNCPP2_DEPENDENCIES_SETUP_HELPER_HPP
+
+#include "runcpp2/Data/DependencyInfo.hpp"
+#include "runcpp2/Data/ScriptInfo.hpp"
+#include <vector>
+namespace runcpp2
+{
+    bool GetDependenciesPaths(  const std::vector<DependencyInfo>& dependencies,
+                                std::vector<std::string>& copiesPaths,
+                                std::vector<std::string>& sourcesPaths,
+                                std::string runcpp2ScriptDir,
+                                std::string scriptDir);
+    
+    bool PopulateLocalDependencies( const std::vector<DependencyInfo>& dependencies,
+                                    const std::vector<std::string>& dependenciesCopiesPaths,
+                                    const std::vector<std::string>& dependenciesSourcesPaths,
+                                    const std::string runcpp2ScriptDir);
+
+    bool RunDependenciesSetupSteps( const ProfileName& profileName,
+                                    const std::vector<DependencyInfo>& dependencies,
+                                    const std::vector<std::string>& dependenciesCopiesPaths);
+    
+    bool SetupScriptDependencies(   const ProfileName& profileName,
+                                    const std::string& scriptPath, 
+                                    const ScriptInfo& scriptInfo,
+                                    bool resetDependencies,
+                                    std::vector<std::string>& outDependenciesLocalCopiesPaths,
+                                    std::vector<std::string>& outDependenciesSourcePaths);
+}
+
+#endif
diff --git a/Include/runcpp2/runcpp2.hpp b/Include/runcpp2/runcpp2.hpp
@@ -9,94 +9,25 @@
 
 namespace runcpp2
 {
-    //class YAML_NodeStruct
-    //{
-    //    public:
-    //        virtual bool ParseYAML_Node(YAML::Node& profileNode) = 0;
-    //        virtual std::string ToString() const = 0;
-    //};
-    
-    //--------------------------------------------
-    //YAML Parsing
-    //--------------------------------------------
-    bool ParseCompilerProfiles( const std::string& compilerProfilesString, 
-                                std::vector<CompilerProfile>& outProfiles,
-                                std::string& outPreferredProfile);
-    
-    bool ReadUserConfig(std::vector<CompilerProfile>& outProfiles, 
-                        std::string& outPreferredProfile);
-    
-    bool ParseScriptInfo(   const std::string& scriptInfo, 
-                            ScriptInfo& outScriptInfo);
-    
-    //--------------------------------------------
-    //Directory setup
-    //--------------------------------------------
     bool CreateRuncpp2ScriptDirectory(const std::string& scriptPath);
 
-
-    //--------------------------------------------
-    //Dependencies setup
-    //--------------------------------------------
-    bool GetDependenciesPaths(  const std::vector<DependencyInfo>& dependencies,
-                                std::vector<std::string>& copiesPaths,
-                                std::vector<std::string>& sourcesPaths,
-                                std::string runcpp2ScriptDir,
-                                std::string scriptDir);
-    
-    bool PopulateLocalDependencies( const std::vector<DependencyInfo>& dependencies,
-                                    const std::vector<std::string>& dependenciesCopiesPaths,
-                                    const std::vector<std::string>& dependenciessourcesPaths,
-                                    const std::string runcpp2ScriptDir);
-
-    bool RunDependenciesSetupSteps( const ProfileName& profileName,
-                                    const std::vector<DependencyInfo>& dependencies,
-                                    const std::vector<std::string>& dependenciesCopiesPaths);
-    
-    bool SetupScriptDependencies(   const ProfileName& profileName,
-                                    const std::string& scriptPath, 
-                                    const ScriptInfo& scriptInfo,
-                                    bool resetDependencies,
-                                    std::vector<std::string>& outDependenciesLocalCopiesPaths,
-                                    std::vector<std::string>& outDependenciesSourcePaths);
-    
-    //--------------------------------------------
-    //Compiling and Linking
-    //--------------------------------------------
     bool CopyDependenciesBinaries(  const std::string& scriptPath, 
                                     const ScriptInfo& scriptInfo,
                                     const std::vector<std::string>& dependenciesCopiesPaths,
                                     const CompilerProfile& profile);
 
-    bool CompileAndLinkScript(  const std::string& scriptPath, 
-                                const ScriptInfo& scriptInfo,
-                                const CompilerProfile& profile);
-
     //--------------------------------------------
     //Profile check
     //--------------------------------------------
-    bool IsProfileAvailableOnSystem(const CompilerProfile& profile);
-
-    bool IsProfileValidForScript(   const CompilerProfile& profile, 
-                                    const ScriptInfo& scriptInfo, 
-                                    const std::string& scriptPath);
-
-    std::vector<ProfileName> GetAvailableProfiles(  const std::vector<CompilerProfile>& profiles,
-                                                    const ScriptInfo& scriptInfo,
-                                                    const std::string& scriptPath);
-
-    int GetPreferredProfileIndex(   const std::string& scriptPath,
-                                    const ScriptInfo& scriptInfo,
-                                    const std::vector<CompilerProfile>& profiles, 
-                                    const std::string& configPreferredProfile);
+    
 
     //--------------------------------------------
     //Running
     //--------------------------------------------
     bool RunScript( const std::string& scriptPath, 
                     const std::vector<CompilerProfile>& profiles,
                     const std::string& configPreferredProfile,
-                    const std::string& runArgs);
+                    const std::vector<std::string>& runArgs);
 
 
 
diff --git a/Src/runcpp2/CompilerProfileHelper.cpp b/Src/runcpp2/CompilerProfileHelper.cpp
diff --git a/Src/runcpp2/CompilingLinking.cpp b/Src/runcpp2/CompilingLinking.cpp
diff --git a/Src/runcpp2/ConfigParsing.cpp b/Src/runcpp2/ConfigParsing.cpp
diff --git a/Src/runcpp2/DependenciesSetupHelper.cpp b/Src/runcpp2/DependenciesSetupHelper.cpp
diff --git a/Src/runcpp2/main.cpp b/Src/runcpp2/main.cpp
diff --git a/Src/runcpp2/runcpp2.cpp b/Src/runcpp2/runcpp2.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-#ifndef RUNCPP2_DEPENDENCY_LIBRARY_TYPE_HPP`
`2`		`-#define RUNCPP2_DEPENDENCY_LIBRARY_TYPE_HPP`
	`1`	`+#ifndef RUNCPP2_DATA_DEPENDENCY_LIBRARY_TYPE_HPP`
	`2`	`+#define RUNCPP2_DATA_DEPENDENCY_LIBRARY_TYPE_HPP`
`3`	`3`
`4`	`4`	`namespace runcpp2`
`5`	`5`	`{`