Move GSLocalization.h parsing regex pattern to FillLocalizationMappingTable

Author: tpolyakgs

BuildAddOn.py

@@ -215,7 +215,7 @@ def GetProjectGenerationParams (args, workspaceRootFolder, buildPath, platformNa
             '-G', GetInstalledVisualStudioGenerator (),
             '-T', GetToolset (int (version)),
         ])
-        localizationMappingTable = FillLocalizationMappingTable (devkitDir, r'#define\s+VERSION_APPENDIX\s+"([A-Z]+)"[\s\S]*?#define\s+WIN_LANGCHARSET_STR\s+"([^"]+)"')
+        localizationMappingTable = FillLocalizationMappingTable (devkitDir)
         winLangCharsetStr = '040904b0'
         if languageCode != 'INT':
             winLangCharsetStr = localizationMappingTable.get (languageCode, winLangCharsetStr)

CompileResources.py

@@ -16,7 +16,7 @@
 
 class ResourceCompiler (object):
     def __init__ (self, devKitPath: Path, acVersion: str, buildNum: str, addonName: str, languageCode: str, defaultLanguageCode: str,
-                  pattern: str, sourcesPath: Path, resourcesPath: Path, resourceObjectsPath: Path, permissiveLocalization: bool):
+                  sourcesPath: Path, resourcesPath: Path, resourceObjectsPath: Path, permissiveLocalization: bool):
         self.devKitPath = devKitPath
         self.acVersion = acVersion
         self.buildNum = buildNum
@@ -29,7 +29,7 @@ def __init__ (self, devKitPath: Path, acVersion: str, buildNum: str, addonName:
         self.permissiveLocalization = permissiveLocalization
         self.resConvPath = None
         self.nativeResourceFileExtension = None
-        self.localizationMappingTable = FillLocalizationMappingTable (devKitPath, pattern)
+        self.localizationMappingTable = FillLocalizationMappingTable (devKitPath)
 
     def GetPlatformDevKitLinkKey (self) -> str:
         return ""
@@ -259,7 +259,7 @@ def RunResConv (self, platformSign: str, codepage: str, inputFilePath: Path) ->
 class WinResourceCompiler (ResourceCompiler):
     def __init__ (self, devKitPath: Path, acVersion: str, buildNum: str, addonName: str, languageCode: str, defaultLanguageCode: str, sourcesPath: Path, resourcesPath: Path, resourceObjectsPath: Path, permissiveLocalization: bool):
         super (WinResourceCompiler, self).__init__ (devKitPath, acVersion, buildNum, addonName, languageCode, defaultLanguageCode,
-            r'#define\s+VERSION_APPENDIX\s+"([A-Z]+)"[\s\S]*?#define\s+WIN_LANGCHARSET_STR\s+"([^"]+)"', sourcesPath, resourcesPath, resourceObjectsPath, permissiveLocalization)
+            sourcesPath, resourcesPath, resourceObjectsPath, permissiveLocalization)
         self.resConvPath = devKitPath / 'Tools' / 'Win' / 'ResConv.exe'
         self.nativeResourceFileExtension = '.rc2'
 
@@ -332,7 +332,7 @@ def CompileNativeResource (self, resultResourcePath: Path) -> None:
 class MacResourceCompiler (ResourceCompiler):
     def __init__ (self, devKitPath: Path, acVersion: str, buildNum: str, addonName: str, languageCode: str, defaultLanguageCode: str, sourcesPath: Path, resourcesPath: Path, resourceObjectsPath: Path, permissiveLocalization: bool):
         super (MacResourceCompiler, self).__init__ (devKitPath, acVersion, buildNum, addonName, languageCode, defaultLanguageCode,
-            r'#define\s+VERSION_APPENDIX\s+"([A-Z]+)"[\s\S]*?#define\s+MAC_REGION_NAME\s+"([^"]+)"', sourcesPath, resourcesPath, resourceObjectsPath, permissiveLocalization)
+            sourcesPath, resourcesPath, resourceObjectsPath, permissiveLocalization)
         self.resConvPath = devKitPath / 'Tools' / 'OSX' / 'ResConv'
         self.nativeResourceFileExtension = '.ro'
 

LocalizationMappingTable.py

@@ -1,7 +1,18 @@
+import platform
 import re
 
-def FillLocalizationMappingTable (devKitPath, pattern: str) -> str:
+
+def FillLocalizationMappingTable (devKitPath) -> str:
     # Dynamically generate a mapping table from GSLocalization.h
+    pattern = None
+    system = platform.system ()
+    if system == 'Windows':
+        pattern = r'#define\s+VERSION_APPENDIX\s+"([A-Z]+)"[\s\S]*?#define\s+WIN_LANGCHARSET_STR\s+"([^"]+)"'
+    elif  system == 'Darwin':
+        pattern = r'#define\s+VERSION_APPENDIX\s+"([A-Z]+)"[\s\S]*?#define\s+MAC_REGION_NAME\s+"([^"]+)"'
+    
+    assert pattern, 'Platform is not supported'
+
     gsLocalizationPath = devKitPath / 'Inc' / 'GSLocalization.h'
     with open(gsLocalizationPath, 'r', encoding='utf-8') as f:
         gsLocalizationContent = f.read ()