vpc: Rollback MASM compilation as it doesn't work well with github ci builds

Author: dimhotepus

utils/vpc/projectgenerator_win32_2010.cpp

@@ -37,14 +37,13 @@ enum TypeKeyNames_e {
   TKN_COMPILE,
   TKN_RESOURCECOMPILE,
   TKN_CUSTOMBUILD,
-  TKN_MASM,
   TKN_NONE,
   TKN_MAX_COUNT,
 };
 
-static const char *s_TypeKeyNames[] = {
-    "Library",     "ClInclude", "ClCompile", "ResourceCompile",
-    "CustomBuild", "MASM",      "None"};
+static const char *s_TypeKeyNames[] = {"Library",     "ClInclude",
+                                       "ClCompile",   "ResourceCompile",
+                                       "CustomBuild", "None"};
 
 const char *CProjectGenerator_Win32_2010::GetKeyNameForFile(
     CProjectFile *pFile) {
@@ -60,8 +59,6 @@ const char *CProjectGenerator_Win32_2010::GetKeyNameForFile(
       pKeyName = s_TypeKeyNames[TKN_COMPILE];
     } else if (IsHFileExtension(pExtension)) {
       pKeyName = s_TypeKeyNames[TKN_INCLUDE];
-    } else if (IsMasmFileExtension(pExtension)) {
-      pKeyName = s_TypeKeyNames[TKN_MASM];
     } else if (!V_stricmp(pExtension, "lib")) {
       pKeyName = s_TypeKeyNames[TKN_LIBRARY];
     } else if (!V_stricmp(pExtension, "rc")) {
@@ -72,30 +69,6 @@ const char *CProjectGenerator_Win32_2010::GetKeyNameForFile(
   return pKeyName;
 }
 
-enum FileTypeNames_e {
-  FTN_DOCUMENT = 0,
-  FTN_NONE,
-  FTN_MAX_COUNT,
-};
-
-static const char *s_FileTypeNames[] = {"Document", ""};
-
-const char *CProjectGenerator_Win32_2010::GetFileTypeForFile(
-    CProjectFile *pFile) {
-  static_assert(V_ARRAYSIZE(s_FileTypeNames) == FTN_MAX_COUNT);
-
-  const char *pExtension = V_GetFileExtension(pFile->m_Name.Get());
-
-  const char *pKeyName = s_FileTypeNames[FTN_NONE];
-  if (pExtension) {
-    if (IsMasmFileExtension(pExtension)) {
-      pKeyName = s_FileTypeNames[FTN_DOCUMENT];
-    }
-  }
-
-  return pKeyName;
-}
-
 bool CProjectGenerator_Win32_2010::WritePropertyGroupTool(
     CProjectTool *pProjectTool, CProjectConfiguration *pConfiguration) {
   if (!pProjectTool) return true;
@@ -126,27 +99,13 @@ bool CProjectGenerator_Win32_2010::WriteFile(CProjectFile *pFile,
     return true;
   }
 
-  const char *pFileType = GetFileTypeForFile(pFile);
-  bool bHasFileType = pFileType && *pFileType;
-
   if (!pFile->m_Configs.Count()) {
-    if (!bHasFileType) {
-      m_XMLWriter.Write(
-          CFmtStrMax("<%s Include=\"%s\" />", pKeyName, pFile->m_Name.Get()));
-    } else {
-      m_XMLWriter.PushNode(pKeyName,
-                           CFmtStr("Include=\"%s\"", pFile->m_Name.Get()));
-      m_XMLWriter.Write(CFmtStrMax("<FileType>%s</FileType>", pFileType));
-      m_XMLWriter.PopNode(true);
-    }
+    m_XMLWriter.Write(
+        CFmtStrMax("<%s Include=\"%s\" />", pKeyName, pFile->m_Name.Get()));
   } else {
     m_XMLWriter.PushNode(pKeyName,
                          CFmtStr("Include=\"%s\"", pFile->m_Name.Get()));
 
-    if (bHasFileType) {
-      m_XMLWriter.Write(CFmtStrMax("<FileType>%s</FileType>", pFileType));
-    }
-
     for (intp i = 0; i < pFile->m_Configs.Count(); i++) {
       if (!WriteConfiguration(pFile->m_Configs[i])) return false;
     }

utils/vpc/projectgenerator_win32_2010.h

@@ -49,7 +49,6 @@ class CProjectGenerator_Win32_2010 : public IVCProjWriter {
                                const char *pFileTypeName);
 
   const char *GetKeyNameForFile(CProjectFile *pFile);
-  const char *GetFileTypeForFile(CProjectFile *pFile);
 
   CXMLWriter m_XMLWriter;
   CXMLWriter m_XMLFilterWriter;

utils/vpc/sys_utils.h

@@ -137,12 +137,6 @@ inline bool IsHFileExtension(const char *pExtension) {
          !V_stricmp(pExtension, "hh") || !V_stricmp(pExtension, "h");
 }
 
-inline bool IsMasmFileExtension(const char *pExtension) {
-  if (!pExtension) return false;
-
-  return !V_stricmp(pExtension, "asm") || !V_stricmp(pExtension, "masm");
-}
-
 CUtlString Sys_GuidFromFileName(const char *szFileName);
 
 #endif  // VPC_SYS_UTILS_H_