Merge pull request #56 from Neko-Box-Coder/DependencyChangeErrorFix

Fixing misleading error and equality typo for dependency

Author: Neko-Box-Coder

Examples/CivetwebStaticWebServer.cpp

@@ -1,5 +1,7 @@
 /* runcpp2
 
+BuildType: InternalExecutable
+
 Dependencies:
 -   Name: civetweb
     Platforms: [DefaultPlatform]
@@ -18,8 +20,10 @@
             DefaultProfile:
                 SearchLibraryNames: ["civetweb"]
                 SearchDirectories: ["./output/src"]
-    Setup: ["mkdir output", "cd output && cmake .. -DCIVETWEB_BUILD_TESTING=OFF -DCIVETWEB_ENABLE_ASAN=OFF"]
-    Build: ["cd output && cmake --build . -j 16"]
+    Setup:
+    -   "mkdir output"
+    -   "cd output && cmake .. -DCIVETWEB_BUILD_TESTING=OFF -DCIVETWEB_ENABLE_ASAN=OFF"
+    -   "cd output && cmake --build . -j 16"
 */
 
 extern "C" {

Src/runcpp2/CompilingLinking.cpp

@@ -616,7 +616,7 @@ namespace
                     {
                         ssLOG_WARNING(  "Trying to link static dependency when script is being " <<
                                         "built as shared. Linking might not work on some platforms.");
-                        
+                        ssLOG_WARNING(  "If failing to link, consider using --executable instead");
                         //TODO: Maybe revert the default back to executable?
                     }
 

Src/runcpp2/Data/DependencySource.cpp

@@ -104,10 +104,7 @@ bool runcpp2::Data::DependencySource::Equals(const DependencySource& other) cons
             return git->Equals(*otherGit);
         }
         else
-        {
-            ssLOG_ERROR("Invalid DependencySource type");
             return false;
-        }
     }
     else if(mpark::get_if<LocalSource>(&Source))
     {
@@ -118,10 +115,7 @@ bool runcpp2::Data::DependencySource::Equals(const DependencySource& other) cons
             return local->Equals(*otherLocal);
         }
         else
-        {
-            ssLOG_ERROR("Invalid DependencySource type");
             return false;
-        }
     }
 
     ssLOG_ERROR("Invalid DependencySource type");

Src/runcpp2/Data/ScriptInfo.cpp

@@ -383,15 +383,15 @@ bool runcpp2::Data::ScriptInfo::Equals(const ScriptInfo& other) const
         Cleanup.size() != other.Cleanup.size() ||
         Populated != other.Populated)
     {
-        return true;
+        return false;
     }
 
     for(const auto& it : RequiredProfiles)
     {
         if( other.RequiredProfiles.count(it.first) == 0 || 
             other.RequiredProfiles.at(it.first) != it.second)
         {
-            return true;
+            return false;
         }
     }
 
@@ -400,7 +400,7 @@ bool runcpp2::Data::ScriptInfo::Equals(const ScriptInfo& other) const
         if( other.OverrideCompileFlags.count(it.first) == 0 || 
             !other.OverrideCompileFlags.at(it.first).Equals(it.second))
         {
-            return true;
+            return false;
         }
     }
 
@@ -409,7 +409,7 @@ bool runcpp2::Data::ScriptInfo::Equals(const ScriptInfo& other) const
         if( other.OverrideLinkFlags.count(it.first) == 0 || 
             !other.OverrideLinkFlags.at(it.first).Equals(it.second))
         {
-            return true;
+            return false;
         }
     }
 
@@ -418,7 +418,7 @@ bool runcpp2::Data::ScriptInfo::Equals(const ScriptInfo& other) const
         if( other.OtherFilesToBeCompiled.count(it.first) == 0 || 
             !other.OtherFilesToBeCompiled.at(it.first).Equals(it.second))
         {
-            return true;
+            return false;
         }
     }
 
@@ -427,44 +427,44 @@ bool runcpp2::Data::ScriptInfo::Equals(const ScriptInfo& other) const
         if( other.IncludePaths.count(it.first) == 0 || 
             !other.IncludePaths.at(it.first).Equals(it.second))
         {
-            return true;
+            return false;
         }
     }
 
     for(size_t i = 0; i < Dependencies.size(); ++i)
     {
         if(!Dependencies[i].Equals(other.Dependencies[i]))
-            return true;
+            return false;
     }
 
     for(const auto& it : Defines)
     {
         if(other.Defines.count(it.first) == 0 || !other.Defines.at(it.first).Equals(it.second))
-            return true;
+            return false;
     }
 
     for(const auto& it : Setup)
     {
         if(other.Setup.count(it.first) == 0 || !other.Setup.at(it.first).Equals(it.second))
-            return true;
+            return false;
     }
 
     for(const auto& it : PreBuild)
     {
         if(other.PreBuild.count(it.first) == 0 || !other.PreBuild.at(it.first).Equals(it.second))
-            return true;
+            return false;
     }
 
     for(const auto& it : PostBuild)
     {
         if(other.PostBuild.count(it.first) == 0 || !other.PostBuild.at(it.first).Equals(it.second))
-            return true;
+            return false;
     }
 
     for(const auto& it : Cleanup)
     {
         if(other.Cleanup.count(it.first) == 0 || !other.Cleanup.at(it.first).Equals(it.second))
-            return true;
+            return false;
     }
 
     return true;

mkdocs/docs/TODO.md

@@ -36,6 +36,9 @@
 
 ## High Priority
 
+- Rename "OtherFilesToBeCompiled" to "SourceFiles"
+- Expose/rename "InternalExecutableShared" and change BuildType to be platform map
+    - This ties to the warning in `CompilingLinking.cpp:619`
 - Update `FileProperties.hpp` to use list of string for prefix and extension
     - Merge `SharedLinkFile` and `SharedLibraryFile`
 - Add the ability for user to specify custom substitution options which applies to all fields