Handle files with conditional excludes that can be handled by VS.

Author: Sibras

include/projectGenerator.h

@@ -31,12 +31,23 @@ class ProjectGenerator
 private:
     using StaticList = vector<string>;
     using UnknownList = map<string, StaticList>;
+    struct ConfigConds
+    {
+        bool isStatic = false;
+        bool isShared = false;
+        bool is32 = false;
+        bool is64 = false;
+    };
+    using ConditionalList = map<string, ConfigConds>;
     ifstream m_inputFile;
     string m_inLine;
     StaticList m_includes;
     StaticList m_includesCPP;
     StaticList m_includesC;
     StaticList m_includesASM;
+    ConditionalList m_includesConditionalCPP;
+    ConditionalList m_includesConditionalC;
+    ConditionalList m_includesConditionalASM;
     StaticList m_includesH;
     StaticList m_includesRC;
     StaticList m_includesCU;
@@ -299,7 +310,14 @@ class ProjectGenerator
 
     bool checkProjectFiles();
 
-    bool createReplaceFiles(const StaticList& replaceIncludes, StaticList& existingIncludes);
+    /**
+     * Builds '_wrap' files to wrap source files in a conditional compilation statement.
+     * @param replaceIncludes              The list of files to scan.
+     * @param [in,out] existingIncludes    The list of existing processed files.
+     * @param [in,out] conditionalIncludes The list of existing conditional files.
+     */
+    bool createReplaceFiles(
+        const StaticList& replaceIncludes, StaticList& existingIncludes, ConditionalList& conditionalIncludes);
 
     bool findProjectFiles(const StaticList& includes, StaticList& includesC, StaticList& includesCPP,
         StaticList& includesASM, StaticList& includesH, StaticList& includesRC, StaticList& includesCU) const;

source/projectGenerator.cpp

@@ -422,6 +422,9 @@ void ProjectGenerator::outputProjectCleanup()
     m_includesCPP.clear();
     m_includesC.clear();
     m_includesASM.clear();
+    m_includesConditionalCPP.clear();
+    m_includesConditionalC.clear();
+    m_includesConditionalASM.clear();
     m_includesH.clear();
     m_includesRC.clear();
     m_includesCU.clear();
@@ -914,9 +917,9 @@ void ProjectGenerator::outputSourceFileType(StaticList& fileList, const string&
                 closed = true;
                 typeFilesTemp += excludeConfigPlatform;
                 if (bit32Only) {
-                    typeFilesTemp += "Win32";
-                } else if (bit64Only) {
                     typeFilesTemp += "x64";
+                } else {
+                    typeFilesTemp += "Win32";
                 }
                 typeFilesTemp += excludeConfigEnd;
             }
@@ -1004,14 +1007,41 @@ void ProjectGenerator::outputSourceFiles(string& projectTemplate, string& filter
             outputError("Assembly files found in project but assembly is disabled");
         }
     }
+    if (!m_includesConditionalASM.empty()) {
+        if (m_configHelper.isASMEnabled()) {
+            StaticList fileList;
+            for (auto& i : m_includesConditionalASM) {
+                fileList.clear();
+                fileList.emplace_back(i.first);
+                outputSourceFileType(fileList, (m_configHelper.m_useNASM) ? "NASM" : "YASM", "Source", projectTemplate,
+                    filterTemplate, foundObjects, foundFilters, false, i.second.isStatic, i.second.isShared,
+                    i.second.is32, i.second.is64);
+            }
+        } else {
+            outputError("Assembly files found in project but assembly is disabled");
+        }
+    }
 
     // Output C files
     outputSourceFileType(
         m_includesC, "ClCompile", "Source", projectTemplate, filterTemplate, foundObjects, foundFilters, true);
+    StaticList fileList;
+    for (auto& i : m_includesConditionalC) {
+        fileList.clear();
+        fileList.emplace_back(i.first);
+        outputSourceFileType(fileList, "ClCompile", "Source", projectTemplate, filterTemplate, foundObjects,
+            foundFilters, true, i.second.isStatic, i.second.isShared, i.second.is32, i.second.is64);
+    }
 
     // Output C++ files
     outputSourceFileType(
         m_includesCPP, "ClCompile", "Source", projectTemplate, filterTemplate, foundObjects, foundFilters, true);
+    for (auto& i : m_includesConditionalCPP) {
+        fileList.clear();
+        fileList.emplace_back(i.first);
+        outputSourceFileType(fileList, "ClCompile", "Source", projectTemplate, filterTemplate, foundObjects,
+            foundFilters, true, i.second.isStatic, i.second.isShared, i.second.is32, i.second.is64);
+    }
 
     // Output CUDA files
     if (!m_includesCU.empty()) {

source/projectGenerator_files.cpp

@@ -119,35 +119,36 @@ bool ProjectGenerator::checkProjectFiles()
         return false;
     }
     // Need to create local files for any replace objects
-    if (!createReplaceFiles(replaceCIncludes, m_includesC)) {
+    if (!createReplaceFiles(replaceCIncludes, m_includesC, m_includesConditionalC)) {
         return false;
     }
-    if (!createReplaceFiles(replaceCPPIncludes, m_includesCPP)) {
+    if (!createReplaceFiles(replaceCPPIncludes, m_includesCPP, m_includesConditionalCPP)) {
         return false;
     }
-    if (!createReplaceFiles(replaceASMIncludes, m_includesASM)) {
+    if (!createReplaceFiles(replaceASMIncludes, m_includesASM, m_includesConditionalASM)) {
         return false;
     }
     return true;
 }
 
-bool ProjectGenerator::createReplaceFiles(const StaticList& replaceIncludes, StaticList& existingIncludes)
+bool ProjectGenerator::createReplaceFiles(
+    const StaticList& replaceIncludes, StaticList& existingIncludes, ConditionalList& conditionalIncludes)
 {
     for (const auto& replaceInclude : replaceIncludes) {
-        // Check hasnt already been included as a fixed object
+        // Check hasn't already been included as a fixed object
         if (find(existingIncludes.begin(), existingIncludes.end(), replaceInclude) != existingIncludes.end()) {
             // skip this item
             continue;
         }
         // Convert file to format required to search ReplaceIncludes
         const uint extPos = replaceInclude.rfind('.');
-        const uint cutPos = replaceInclude.rfind('/') + 1;
+        const uint cutPos = replaceInclude.find('/', 5) + 1;
         string filename = replaceInclude.substr(cutPos, extPos - cutPos);
         string extension = replaceInclude.substr(extPos);
         string outFile = m_configHelper.m_solutionDirectory + m_projectName + "/" + filename + "_wrap" + extension;
         string newOutFile;
         m_configHelper.makeFileProjectRelative(outFile, newOutFile);
-        // Check hasnt already been included as a wrapped object
+        // Check hasn't already been included as a wrapped object
         if (find(existingIncludes.begin(), existingIncludes.end(), newOutFile) != existingIncludes.end()) {
             // skip this item
             outputInfo(newOutFile);
@@ -167,26 +168,65 @@ bool ProjectGenerator::createReplaceFiles(const StaticList& replaceIncludes, Sta
         }
         // Get the files dynamic config requirement
         string idents;
+        bool isStatic = false;
+        bool isShared = false;
+        bool is32 = false;
+        bool is64 = false;
+        bool hasOther = false;
         for (auto include = m_replaceIncludes[origName].begin(); include < m_replaceIncludes[origName].end();
              ++include) {
             idents += *include;
             if ((include + 1) < m_replaceIncludes[origName].end()) {
                 idents += " || ";
             }
+            if (*include == "ARCH_X86_32" || *include == "!ARCH_X86_64") {
+                is32 = true;
+            } else if (*include == "ARCH_X86_64" || *include == "!ARCH_X86_32") {
+                is64 = true;
+            } else if (*include == "CONFIG_SHARED" || *include == "!CONFIG_STATIC") {
+                isShared = true;
+            } else if (*include == "CONFIG_STATIC" || *include == "!CONFIG_SHARED") {
+                isStatic = true;
+            } else {
+                hasOther = true;
+            }
+        }
+        // Check for config requirement that can be handled by VS (i.e. static/shared|32/64bit)
+        if ((isShared || isStatic || is32 || is64) && !hasOther) {
+            // Check if already a conditional file
+            auto j = conditionalIncludes.find(replaceInclude);
+            if (j != conditionalIncludes.end()) {
+                if (j->second.isStatic != isStatic || j->second.isShared != isShared || j->second.is32 != is32 ||
+                    j->second.is64 != is64) {
+                    outputError("Duplicate conditional files found with different conditions (" + replaceInclude + ")");
+                    // TODO: Remove and make wrapped
+                    return false;
+                }
+            }
+            conditionalIncludes.emplace(replaceInclude, ConfigConds{isStatic, isShared, is32, is64});
+            continue;
         }
         // Create new file to wrap input object
         string prettyFile = "../" + replaceInclude;
         string newFile = getCopywriteHeader(filename + extension + " file wrapper for " + m_projectName);
         newFile += "\n\
 \n\
 #include \"config.h\"\n";
-        if (m_configHelper.m_configComponentsStart > 0) {
+        if (m_configHelper.m_configComponentsStart > 0 && extension != ".asm") {
             newFile += "#include \"config_components.h\"\n";
         }
         newFile += "#if " + idents + "\n\
 #   include \"" +
             prettyFile + "\"\n\
 #endif";
+        // Check if assembly file
+        if (extension == ".asm") {
+            replace(newFile.begin(), newFile.end(), '#', '%');
+            findAndReplace(newFile, ".h", ".asm");
+            findAndReplace(newFile, "/**", ";");
+            findAndReplace(newFile, " */", ";");
+            findAndReplace(newFile, " *", ";");
+        }
         // Write output project
         if (!makeDirectory(m_configHelper.m_solutionDirectory + m_projectName)) {
             outputError("Failed creating local " + m_projectName + " directory");