Merge pull request #51 from Neko-Box-Coder/MSVCFix

Updating MSVC, adding logic for handling escape characters at the end for substitution

Author: Neko-Box-Coder

DefaultYAMLs/DefaultUserConfig.yaml

@@ -1,7 +1,7 @@
 # List of anchors that will be aliased later
 Templates:
-    MSVC_CompileFlags: &MSVC_CompileFlags
-        Flags: "/nologo /W4 /diagnostics:caret /D NDEBUG /utf-8 /Gm- /MD /EHa /TP /std:c++17 /GR /TP"
+    vs2022_v17+_CompileFlags: &vs2022_v17+_CompileFlags
+        Flags: "/nologo /W4 /diagnostics:caret /utf-8 /Gm- /MDd /EHar /TP /std:c++17 /GR /RTC1 /Zc:inline /Zi"
 
     "g++_CompileRunParts": &g++_CompileRunParts
     -   Type: Once
@@ -28,10 +28,13 @@ Templates:
     -   Type: Repeats
         CommandPart: " /I\"{IncludeDirectoryPath}\""
     -   Type: Once
-        CommandPart: " /Fo\"{OutputFileDirectory}{/}{ObjectLinkFile.Prefix}{InputFileName}{ObjectLinkFile.Extension}\" \"{InputFilePath}\""
+        CommandPart: " /Fo\"{OutputFileDirectory}{/}{ObjectLinkFile.Prefix}{InputFileName}{ObjectLinkFile.Extension}\" \
+            /Fd\"{OutputFileDirectory}{/}{DebugSymbolFile.Prefix}{InputFileName}{DebugSymbolFile.Extension}\" \
+            \"{InputFilePath}\""
 
     "vs2022_v17+_CompileExpectedOutputFiles": &vs2022_v17+_CompileExpectedOutputFiles
     -   "{OutputFileDirectory}{/}{ObjectLinkFile.Prefix}{InputFileName}{ObjectLinkFile.Extension}"
+    -   "{OutputFileDirectory}{/}{DebugSymbolFile.Prefix}{InputFileName}{DebugSymbolFile.Extension}"
 
     # The following fields set the prefixes and extensions for each type of the files
     # If the name of an object files are libtest.so and libtest2.so,
@@ -91,13 +94,14 @@ Templates:
                 Windows: ""
                 Unix: ""
             Extension:
-                Windows: ""
+                Windows: ".pdb"
                 Unix: ""
 
 # WARNING: All command substitutions in this file are passed directly to the shell.
 #          Exercise caution when using variables or user-provided input in your build commands
 #          to prevent potential security vulnerabilities.
 
+# TODO(NOW): Make it auto? Or DefaultProfile?
 # A profile to be used if not specified while running the build script
 PreferredProfile: "g++"
 
@@ -343,25 +347,25 @@ Profiles:
         CompileTypes:
             Executable:
                 Windows:
-                    <<: *MSVC_CompileFlags
+                    <<: *vs2022_v17+_CompileFlags
                     Executable: "CL.exe"
                     RunParts: *vs2022_v17+_CompileRunParts
                     ExpectedOutputFiles: *vs2022_v17+_CompileExpectedOutputFiles
             ExecutableShared:
                 Windows:
-                    <<: *MSVC_CompileFlags
+                    <<: *vs2022_v17+_CompileFlags
                     Executable: "CL.exe"
                     RunParts: *vs2022_v17+_CompileRunParts
                     ExpectedOutputFiles: *vs2022_v17+_CompileExpectedOutputFiles
             Static:
                 Windows:
-                    <<: *MSVC_CompileFlags
+                    <<: *vs2022_v17+_CompileFlags
                     Executable: "CL.exe"
                     RunParts: *vs2022_v17+_CompileRunParts
                     ExpectedOutputFiles: *vs2022_v17+_CompileExpectedOutputFiles
             Shared:
                 Windows:
-                    <<: *MSVC_CompileFlags
+                    <<: *vs2022_v17+_CompileFlags
                     Executable: "CL.exe"
                     RunParts: *vs2022_v17+_CompileRunParts
                     ExpectedOutputFiles: *vs2022_v17+_CompileExpectedOutputFiles
@@ -376,6 +380,7 @@ Profiles:
                     Flags: >-
                         /NOLOGO kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib
                         oleaut32.lib uuid.lib comdlg32.lib advapi32.lib /manifest:embed /SUBSYSTEM:CONSOLE
+                        /DEBUG /MANIFESTUAC:"level='asInvoker'"
                     Executable: "link.exe"
                     RunParts:
                     -   Type: Once
@@ -390,7 +395,7 @@ Profiles:
                     Flags: >-
                         /NOLOGO kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib
                         oleaut32.lib uuid.lib comdlg32.lib advapi32.lib /manifest:embed /SUBSYSTEM:CONSOLE
-                        /DLL
+                        /DEBUG /DLL /MANIFESTUAC:"level='asInvoker'"
                     Executable: "link.exe"
                     RunParts:
                     -   Type: Once
@@ -422,7 +427,7 @@ Profiles:
                     Flags: >-
                         /NOLOGO kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib
                         oleaut32.lib uuid.lib comdlg32.lib advapi32.lib /manifest:embed /SUBSYSTEM:CONSOLE
-                        /DLL
+                        /DEBUG /DLL /MANIFESTUAC:"level='asInvoker'"
                     Executable: "link.exe"
                     RunParts:
                     -   Type: Once

Examples/CivetwebStaticWebServer.cpp

@@ -18,7 +18,7 @@
             DefaultProfile:
                 SearchLibraryNames: ["civetweb"]
                 SearchDirectories: ["./output/src"]
-    Setup: ["mkdir output", "cd output && cmake .."]
+    Setup: ["mkdir output", "cd output && cmake .. -DCIVETWEB_BUILD_TESTING=OFF -DCIVETWEB_ENABLE_ASAN=OFF"]
     Build: ["cd output && cmake --build . -j 16"]
 */
 

Examples/CppStaticWebServer.cpp

@@ -8,8 +8,7 @@
             URL: "https://github.com/yhirose/cpp-httplib.git"
             Branch: "v0.20.0"
     LibraryType: Header
-    IncludePaths:
-    -   "./"
+    IncludePaths: ["./"]
 */
 
 #include "httplib.h"

Examples/MatplotExample.cpp

@@ -1,5 +1,10 @@
 /* runcpp2
 
+OverrideCompileFlags:
+    Windows:
+        msvc:
+            Append: "/wd4251"
+Defines: ["MATPLOT_BUILD_HIGH_RESOLUTION_WORLD_MAP"]
 Dependencies:
 -   Name: matplotplusplus
     Platforms: [DefaultPlatform]
@@ -17,12 +22,13 @@
                 SearchDirectories: ["./build/source/matplot"]
         Windows:
             DefaultProfile:
-                SearchLibraryNames: ["libmatplot"]
+                SearchLibraryNames: ["matplot"]
                 SearchDirectories: ["./build/source/matplot/debug"]
     Setup:
     -   "mkdir build"
     -   "cd build && cmake .. -DMATPLOTPP_BUILD_WITH_SANITIZERS=OFF -DMATPLOTPP_BUILD_EXAMPLES=OFF -DMATPLOTPP_BUILD_INSTALLER=OFF -DMATPLOTPP_BUILD_PACKAGE=OFF -DBUILD_SHARED_LIBS=ON"
-    -   "cd build && cmake --build . -j 16"*/
+    -   "cd build && cmake --build . -j 16"
+*/
 
 #include "matplot/matplot.h"
 
@@ -33,9 +39,9 @@ int main()
 {
     //NOTE: Alternatively, you can put this under "Setup" section in runcpp2 build settings
 #ifdef _WIN32
-    if(system("which gnuplot") != 0)
-#else
     if(system("where gnuplot") != 0)
+#else
+    if(system("which gnuplot") != 0)
 #endif
     {
         std::cout << "Failed to find gnuplot, please install it on the system" << std::endl;
@@ -45,7 +51,6 @@ int main()
     auto f1 = matplot::figure();
     matplot::plot(matplot::vector_1d{1., 2., 3.}, matplot::vector_1d{2., 4., 6.});
 
-
     auto f2 = matplot::figure();
     matplot::scatter(matplot::iota(1, 20), matplot::rand(20, 0, 1));
 

Examples/SDLWindow.cpp

@@ -16,10 +16,12 @@
             DefaultProfile:
                 SearchLibraryNames: ["SDL2"]
                 SearchDirectories: ["./build/debug"]
+                ExcludeLibraryNames: ["SDL2-static", "SDL2_test"]
         Unix:
             DefaultProfile:
                 SearchLibraryNames: ["SDL2"]
                 SearchDirectories: ["./build"]
+                ExcludeLibraryNames: ["SDL2-static", "SDL2_test"]
     Setup: ["mkdir build", "cd build && cmake .."]
     Build: ["cd build && cmake --build . -j 16"]
 
@@ -33,7 +35,7 @@
 */
 
 
-#include <SDL2/SDL.h>
+#include "SDL.h"
 
 #include <iostream>
 

Examples/index.html

@@ -0,0 +1,10 @@
+<!-- From https://www.w3schools.com/html/html_basic.asp -->
+<!DOCTYPE html>
+<html>
+<body>
+
+<h1>My First Heading</h1>
+<p>My first paragraph.</p>
+
+</body>
+</html> 

Src/runcpp2/CompilingLinking.cpp

@@ -312,7 +312,8 @@ namespace
                         i,
                         &profile,
                         &currentOutputTypeInfo,
-                        substitutionMap,
+                        substitutionMap,    //NOTE: substitutionMap is used by the next source file, 
+                                            //      therefore need to copy it.
                         &buildDir,
                         compileAsExecutable,
                         &scriptInfo,
@@ -437,7 +438,7 @@ namespace
 
                         return true;
                     }
-                )
+                ) //std::async
             ); //actions.emplace_back
             finished.emplace_back(false);
 
@@ -491,8 +492,8 @@ namespace
 
                 actions.clear();
                 finished.clear();
-            }
-        }
+            } //if(actions.size() >= maxThreads || i == sourceFiles.size() - 1)
+        } //for(int i = 0; i < sourceFiles.size(); ++i)
 
         ssLOG_OUTPUT_ALL_CACHE_GROUPED();
         return !failedAny;

Src/runcpp2/Data/StageInfo.cpp

@@ -282,7 +282,54 @@ namespace
                 ssLOG_ERROR("INTERNAL ERROR, missing substitution value for \"" << substitution << "\"");
                 return false;
             }
-            const std::string& currentValue = substitutionMap.at(substitution).at(substituteValueIndex);
+            
+            std::string currentValue = substitutionMap.at(substitution).at(substituteValueIndex);
+            
+            //Escape escapes character at the end if any
+            {
+                std::vector<char> escapeChars = {'\\'};
+                #ifdef _WIN32
+                    escapeChars.emplace_back('^');
+                #endif
+                if(!currentValue.empty())
+                {
+                    int currentValIndex = currentValue.size();
+                    while(currentValIndex > 0)
+                    {
+                        --currentValIndex;
+                        bool found = false;
+                        for(int j = 0; j < escapeChars.size(); ++j)
+                        {
+                            if(currentValue[currentValIndex] == escapeChars[j])
+                            {
+                                found = true;
+                                break;
+                            }
+                        }
+                        
+                        if(!found)
+                        {
+                            ++currentValIndex;
+                            break;
+                        }
+                    }
+                    
+                    if(currentValIndex < currentValue.size())
+                    {
+                        const std::string foundEscapes = currentValue.substr(currentValIndex);
+                        std::string newEndEscapes;
+                        //Just repeat the escape characters
+                        for(int j = 0; j < foundEscapes.size(); ++j)
+                        {
+                            newEndEscapes.push_back(foundEscapes[j]);
+                            newEndEscapes.push_back(foundEscapes[j]);
+                        }
+                    
+                        currentValue = currentValue.substr(0, currentValIndex) + newEndEscapes;
+                    }
+                }
+            }
+            
             ssLOG_DEBUG("Replacing \"" << substitution << "\" with \"" << currentValue << 
                         "\" in \"" << escapedString << "\"");
 
@@ -436,8 +483,8 @@ bool runcpp2::Data::StageInfo::ConstructCommand(const SubstitutionMap& substitut
             {
                 if(substitutionMap.count(substitutionsInCurrentPart.at(j)) == 0)
                 {
-                    ssLOG_DEBUG("No substitution found for " << substitutionsInCurrentPart.at(j) << " in " <<
-                                currentRunParts.at(i).CommandPart);
+                    ssLOG_DEBUG("No substitution found for " << substitutionsInCurrentPart.at(j) << 
+                                " in " << currentRunParts.at(i).CommandPart);
 
                     ssLOG_DEBUG("Current run part is type repeat, skipping to next");
                     continue;

Src/runcpp2/DependenciesHelper.cpp

@@ -234,8 +234,16 @@ namespace
 
                 dependencies.at(i) 
                             ->AbsoluteIncludePaths
-                            .push_back(ghc::filesystem::absolute(   dependenciesCopiesPaths.at(i) + "/" + 
-                                                                    dependencies.at(i)->IncludePaths.at(j)).string());
+                            .push_back
+                            (
+                                ghc::filesystem::absolute
+                                (
+                                    dependenciesCopiesPaths.at(i) + 
+                                    "/" + 
+                                    dependencies.at(i)->IncludePaths.at(j)
+                                )
+                                .string()
+                            );
 
                 ssLOG_DEBUG("Include path added: " << dependencies.at(i)->AbsoluteIncludePaths.back());
             }

Src/runcpp2/runcpp2.cpp

@@ -502,7 +502,7 @@ runcpp2::StartPipeline( const std::string& scriptPath,
         if(result != PipelineResult::SUCCESS)
             return result;
 
-        //Check if script info has changed if provided
+        //Check if script info has changed if provided and run setup if needed
         bool recompileNeeded = false;
         bool relinkNeeded = false;
         std::vector<std::string> changedDependencies;