WIP

Neko-Box-Coder · Neko-Box-Coder · commit fd7c5c11d615 · 2024-02-15T01:50:53.000Z
diff --git a/.gitmodules b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "yaml-cpp"]
 	path = External/yaml-cpp
 	url = https://github.com/jbeder/yaml-cpp.git
+[submodule "filesystem"]
+	path = External/filesystem
+	url = https://github.com/gulrak/filesystem.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,6 +16,8 @@ add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/yaml-cpp")
 # =========================================================================
 # mkdirp
 # =========================================================================
+
+
 add_library(path_normalize "${CMAKE_CURRENT_LIST_DIR}/External/mkdirp/deps/path-normalize/path-normalize.c")
 target_include_directories(path_normalize PUBLIC "${CMAKE_CURRENT_LIST_DIR}/External/mkdirp/deps")
 
@@ -27,6 +29,10 @@ target_include_directories(mkdirp PUBLIC "${CMAKE_CURRENT_LIST_DIR}/External/mkd
 
 target_link_libraries(mkdirp PRIVATE path_normalize strdup)
 
+# =========================================================================
+# filesystem
+# =========================================================================
+add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/filesystem")
 
 # =========================================================================
 # Generate yaml files as c
@@ -72,4 +78,4 @@ target_include_directories(runcpp2 PRIVATE  "${CMAKE_CURRENT_LIST_DIR}/Include"
                                             "${CMAKE_CURRENT_LIST_DIR}/External/tinydir"
                                             "${CMAKE_CURRENT_LIST_DIR}/External/cfgpath")
 
-target_link_libraries(runcpp2 PRIVATE CLI11::CLI11 ssLogger mkdirp yaml-cpp)
+target_link_libraries(runcpp2 PRIVATE CLI11::CLI11 ssLogger yaml-cpp ghc_filesystem)
diff --git a/DefaultYAMLs/CompilerProfilesSchema.json b/DefaultYAMLs/CompilerProfilesSchema.json
@@ -5,6 +5,11 @@
     "type": "object",
     "properties": 
     {
+        "PreferredProfile": 
+        {
+            "type": "string",
+            "description": "A default compiler profile to be used if not specified while running the build script"
+        },
         "CompilerProfiles": 
         {
             "type": "array",
diff --git a/DefaultYAMLs/DefaultCompilerProfiles.yaml b/DefaultYAMLs/DefaultCompilerProfiles.yaml
@@ -1,25 +1,22 @@
 # yaml-language-server: $schema=./CompilerProfilesSchema.json
 
 ---
+PreferredProfile: "g++"
 CompilerProfiles:
 -   Name: "g++"
     FileExtensions: [cpp, cc, cxx]
     Languages: ["c++"]
     SetupSteps: []
     ObjectFileExtensions:
         Windows: obj
-        #Or Unix: o
-        Linux: o
-        MacOS: o
+        Unix: o
     SharedLibraryExtensions:
         Windows: [dll, lib]
         Linux: [so]
         MacOS: [dylib]
     StaticLibraryExtensions:
         Windows: [lib]
-        #Or Unix: a
-        Linux: [a]
-        MacOS: [a]
+        Unix: [a]
     DebugSymbolFileExtensions:
         Windows: []
         Unix: []
diff --git a/DefaultYAMLs/DefaultScriptInfo.yaml b/DefaultYAMLs/DefaultScriptInfo.yaml
@@ -5,10 +5,11 @@ Language: "c++"
 PreferredProfiles: ["g++"]
 Dependencies:
 -   Name: lib1
-    LibraryType: static
+    Platforms: [Windows, Linux, MacOS]
+    LibraryType: Static
     SearchLibraryName: lib1
     Source:
-        Type: git
+        Type: Git
         Value: "https://github.com/USER/REPO.git"
     Setup:
         Windows:
@@ -20,10 +21,11 @@ Dependencies:
         -   "cd build && cmake .."
         -   "cd build && cmake --build . --config Release"
 -   Name: lib2
-    LibraryType: object
+    Platforms: [All]
+    LibraryType: Object
     SearchLibraryName: lib2
     Source:
-        Type: local
+        Type: Local
         Value: "./lib2"
     Setup:
         Windows:
diff --git a/DefaultYAMLs/ScriptInfoSchema.json b/DefaultYAMLs/ScriptInfoSchema.json
@@ -33,11 +33,19 @@
                         "type": "string",
                         "description": "Dependency name"
                     },
+                    "Platforms": 
+                    {
+                        "type": "array",
+                        "items":
+                        {
+                            "type":"string"
+                        }
+                    },
                     "LibraryType": 
                     {
                         "type": "string", 
-                        "enum": ["static", "object", "shared"],
-                        "description": "Library Type (static, object, shared)"
+                        "enum": ["Static", "Object", "Shared", "Header"],
+                        "description": "Library Type (Static, Object, Shared, Header)"
                     },
                     "SearchLibraryName": 
                     {
@@ -52,8 +60,8 @@
                             "Type": 
                             {
                                 "type": "string", 
-                                "enum": ["git", "local"],
-                                "description": "The type of the dependency (git/local)"
+                                "enum": ["Git", "Local"],
+                                "description": "The type of the dependency (Git/Local)"
                             },
                             "Value": 
                             {
@@ -94,6 +102,14 @@
                                 }
                             },
                             "MacOS": 
+                            {
+                                "type": "array",
+                                "items":
+                                {
+                                    "type":"string"
+                                }
+                            },
+                            "All": 
                             {
                                 "type": "array",
                                 "items":
@@ -108,6 +124,7 @@
                 "required": 
                 [
                     "Name", 
+                    "Platforms",
                     "LibraryType", 
                     "SearchLibraryName", 
                     "Source"
diff --git a/External/filesystem b/External/filesystem
@@ -0,0 +1 @@
+Subproject commit 8a2edd6d92ed820521d42c94d179462bf06b5ed3
diff --git a/Include/runcpp2/CompilerProfile.hpp b/Include/runcpp2/CompilerProfile.hpp
@@ -6,6 +6,7 @@
 
 #include <string>
 #include <unordered_map>
+#include <unordered_set>
 #include <vector>
 
 namespace runcpp2
@@ -14,8 +15,8 @@ namespace runcpp2
     {
         public:
             std::string Name;
-            std::vector<std::string> FileExtensions;
-            std::vector<std::string> Languages;
+            std::unordered_set<std::string> FileExtensions;
+            std::unordered_set<std::string> Languages;
             std::vector<std::string> SetupSteps;
             std::unordered_map<std::string, std::string> ObjectFileExtensions;
             std::unordered_map<std::string, std::vector<std::string>> SharedLibraryExtensions;
diff --git a/Include/runcpp2/DependencyInfo.hpp b/Include/runcpp2/DependencyInfo.hpp
@@ -4,13 +4,15 @@
 #include "runcpp2/DependencyLibraryType.hpp"
 #include "runcpp2/DependencySource.hpp"
 #include <string>
+#include <unordered_set>
 
 namespace runcpp2
 {
     class DependencyInfo
     {
         public:
             std::string Name;
+            std::unordered_set<std::string> Platforms;
             DependencyLibraryType LibraryType;
             std::string SearchLibraryName;
             DependencySource Source;
diff --git a/Include/runcpp2/DependencyLibraryType.hpp b/Include/runcpp2/DependencyLibraryType.hpp
@@ -8,6 +8,7 @@ namespace runcpp2
         STATIC,
         SHARED,
         OBJECT,
+        HEADER,
         COUNT
     };
 }
diff --git a/Include/runcpp2/PlatformUtil.hpp b/Include/runcpp2/PlatformUtil.hpp
@@ -10,21 +10,21 @@ namespace runcpp2
 
 namespace Internal
 {
-    char GetAltFileSystemSeparator();
+    //char GetAltFileSystemSeparator();
     
-    char GetFileSystemSeparator();
+    //char GetFileSystemSeparator();
 
-    std::string ProcessPath(const std::string& path);
+    //std::string ProcessPath(const std::string& path);
 
-    bool FileOrDirectoryExists(const std::string& path, bool& outIsDir);
+    //bool FileOrDirectoryExists(const std::string& path, bool& outIsDir);
     
-    std::string GetFileDirectory(const std::string& filePath);
+    //std::string GetFileDirectory(const std::string& filePath);
     
-    std::string GetFileNameWithExtension(const std::string& filePath);
+    //std::string GetFileNameWithExtension(const std::string& filePath);
     
-    std::string GetFileNameWithoutExtension(const std::string& filePath);
+    //std::string GetFileNameWithoutExtension(const std::string& filePath);
     
-    std::string GetFileExtension(const std::string& filePath);
+    //std::string GetFileExtension(const std::string& filePath);
     
     std::vector<std::string> GetPlatformNames();
 }
diff --git a/Include/runcpp2/ScriptInfo.hpp b/Include/runcpp2/ScriptInfo.hpp
@@ -6,14 +6,15 @@
 
 #include <string>
 #include <vector>
+#include <unordered_set>
 
 namespace runcpp2
 {
     class ScriptInfo
     {
         public:
             std::string Language;
-            std::vector<std::string> PreferredProfiles;
+            std::unordered_set<std::string> PreferredProfiles;
             std::vector<DependencyInfo> Dependencies;
             
             FlagsOverrideInfo OverrideCompileFlags;
diff --git a/Include/runcpp2/runcpp2.hpp b/Include/runcpp2/runcpp2.hpp
@@ -17,31 +17,62 @@ namespace runcpp2
     //};
     
     bool ParseCompilerProfiles( const std::string& compilerProfilesString, 
-                                std::vector<CompilerProfile>& outProfiles);
+                                std::vector<CompilerProfile>& outProfiles,
+                                std::string& outPreferredProfile);
     
-    bool ReadUserConfig(std::vector<CompilerProfile>& outProfiles);
+    bool ReadUserConfig(std::vector<CompilerProfile>& outProfiles, 
+                        std::string& outPreferredProfile);
     
-    bool GetScriptInfoString(   const std::string& processedScriptPath, 
+    bool GetScriptInfoString(   const std::string& scriptPath, 
                                 std::string& outScriptInfoString);
     
     bool ParseScriptInfo(   const std::string& scriptInfo, 
                             ScriptInfo& outScriptInfo);
     
-    bool CreateRuncpp2ScriptDirectory(const std::string& processedScriptPath);
+    bool CreateRuncpp2ScriptDirectory(const std::string& scriptPath);
+
+    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 std::vector<DependencyInfo>& dependencies,
+                                    const std::vector<std::string>& dependenciesCopiesPaths);
+    
+    bool SetupScriptDependencies(   const std::string& scriptPath, 
+                                    const ScriptInfo& scriptInfo,
+                                    bool resetDependencies);
     
-    bool SetupScriptDependencies(   const std::string& processedScriptPath, 
-                                    const ScriptInfo& scriptInfo);
+    int GetPerferredProfileIndex(   const std::string& scriptPath,
+                                    const ScriptInfo& scriptInfo,
+                                    const std::vector<CompilerProfile>& profiles, 
+                                    const std::string& configPreferredProfile);
     
-    bool CopyDependencies(  const std::string& processedScriptPath, 
-                            const ScriptInfo& scriptInfo);
+    bool CopyDependenciesBinaries(  const std::string& scriptPath, 
+                                    const ScriptInfo& scriptInfo,
+                                    const std::vector<std::string>& dependenciesCopiesPaths,
+                                    const std::vector<CompilerProfile>& profiles,
+                                    const std::string& configPreferredProfile);
 
-    bool CompileAndLinkScript(  const std::string& processedScriptPath, 
+    bool CompileAndLinkScript(  const std::string& scriptPath, 
                                 const ScriptInfo& scriptInfo,
                                 const std::vector<CompilerProfile>& profiles);
 
+    bool IsProfileAvailableOnSystem(const CompilerProfile& profile);
 
+    bool IsProfileValidForScript(   const CompilerProfile& profile, 
+                                    const ScriptInfo& scriptInfo, 
+                                    const std::string& scriptPath);
 
-    bool RunScript(const std::string& scriptPath, const std::vector<CompilerProfile>& profiles);
+    bool RunScript( const std::string& scriptPath, 
+                    const std::vector<CompilerProfile>& profiles,
+                    const std::string& configPreferredProfile);
 
 
 
diff --git a/Src/runcpp2/CompilerProfile.cpp b/Src/runcpp2/CompilerProfile.cpp
@@ -29,12 +29,12 @@ namespace runcpp2
         Name = profileNode["Name"].as<std::string>();
         
         for(int i = 0; i < profileNode["FileExtensions"].size(); ++i)
-            FileExtensions.push_back(profileNode["FileExtensions"][i].as<std::string>());
+            FileExtensions.insert(profileNode["FileExtensions"][i].as<std::string>());
         
         if(profileNode["Languages"])
         {
             for(int i = 0; i < profileNode["Languages"].size(); ++i)
-                Languages.push_back(profileNode["Languages"][i].as<std::string>());
+                Languages.insert(profileNode["Languages"][i].as<std::string>());
         }
         
         if(profileNode["SetupSteps"])
@@ -103,12 +103,12 @@ namespace runcpp2
         out += indentation + "Name: " + Name + "\n";
         
         out += indentation + "FileExtensions:\n";
-        for(int i = 0; i < FileExtensions.size(); ++i)
-            out += indentation + "-   " + FileExtensions[i] + "\n";
+        for(auto it = FileExtensions.begin(); it != FileExtensions.end(); ++it)
+            out += indentation + "-   " + *it + "\n";
         
         out += indentation + "Languages:\n";
-        for(int i = 0; i < Languages.size(); ++i)
-            out += indentation + "-   " + Languages[i] + "\n";
+        for(auto it = Languages.begin(); it != Languages.end(); ++it)
+            out += indentation + "-   " + *it + "\n";
         
         out += indentation + "SetupSteps:\n";
         for(int i = 0; i < SetupSteps.size(); ++i)
diff --git a/Src/runcpp2/DependencyInfo.cpp b/Src/runcpp2/DependencyInfo.cpp
diff --git a/Src/runcpp2/DependencySource.cpp b/Src/runcpp2/DependencySource.cpp
diff --git a/Src/runcpp2/PlatformUtil.cpp b/Src/runcpp2/PlatformUtil.cpp
diff --git a/Src/runcpp2/ScriptInfo.cpp b/Src/runcpp2/ScriptInfo.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
`@@ -5,6 +5,11 @@`
`5`	`5`	`"type": "object",`
`6`	`6`	`"properties":`
`7`	`7`	`{`
	`8`	`+ "PreferredProfile":`
	`9`	`+ {`
	`10`	`+ "type": "string",`
	`11`	`+ "description": "A default compiler profile to be used if not specified while running the build script"`
	`12`	`+ },`
`8`	`13`	`"CompilerProfiles":`
`9`	`14`	`{`
`10`	`15`	`"type": "array",`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ namespace runcpp2`
`8`	`8`	`STATIC,`
`9`	`9`	`SHARED,`
`10`	`10`	`OBJECT,`
	`11`	`+ HEADER,`
`11`	`12`	`COUNT`
`12`	`13`	`};`
`13`	`14`	`}`