Tools: HEMTT ignore has_include (#9613)

* Tools: HEMTT ignore has_include

* Fix make.py and sqfvmChecker.py for changes

---------

Co-authored-by: PabstMirror <[email protected]>

addons/fire/addon.toml

@@ -1,2 +1,3 @@
-[rapify]
-enabled = false
+[tools]
+pboProject_noBinConfig = true
+sqfvm_skipConfigChecks = true

addons/fire/config.cpp

@@ -1,5 +1,6 @@
 #include "script_component.hpp"
 
+#pragma hemtt flag pe23_ignore_has_include
 #if __has_include("\z\ace\addons\nomedical\script_component.hpp")
 #define PATCH_SKIP "No Medical"
 #endif

addons/medical/addon.toml

@@ -1,2 +1,3 @@
-[rapify]
-enabled = false
+[tools]
+pboProject_noBinConfig = true
+sqfvm_skipConfigChecks = true

addons/medical/config.cpp

@@ -1,5 +1,6 @@
 #include "script_component.hpp"
 
+#pragma hemtt flag pe23_ignore_has_include
 #if __has_include("\z\ace\addons\nomedical\script_component.hpp")
 #define PATCH_SKIP "No Medical"
 #endif

addons/medical_ai/addon.toml

@@ -1,2 +1,3 @@
-[rapify]
-enabled = false
+[tools]
+pboProject_noBinConfig = true
+sqfvm_skipConfigChecks = true

addons/medical_ai/config.cpp

@@ -1,5 +1,6 @@
 #include "script_component.hpp"
 
+#pragma hemtt flag pe23_ignore_has_include
 #if __has_include("\z\ace\addons\nomedical\script_component.hpp")
 #define PATCH_SKIP "No Medical"
 #endif

addons/medical_blood/addon.toml

@@ -1,2 +1,3 @@
-[rapify]
-enabled = false
+[tools]
+pboProject_noBinConfig = true
+sqfvm_skipConfigChecks = true

addons/medical_blood/config.cpp

@@ -1,5 +1,6 @@
 #include "script_component.hpp"
 
+#pragma hemtt flag pe23_ignore_has_include
 #if __has_include("\z\ace\addons\nomedical\script_component.hpp")
 #define PATCH_SKIP "No Medical"
 #endif

addons/medical_damage/addon.toml

@@ -1,2 +1,3 @@
-[rapify]
-enabled = false
+[tools]
+pboProject_noBinConfig = true
+sqfvm_skipConfigChecks = true

addons/medical_damage/config.cpp

@@ -1,5 +1,6 @@
 #include "script_component.hpp"
 
+#pragma hemtt flag pe23_ignore_has_include
 #if __has_include("\z\ace\addons\nomedical\script_component.hpp")
 #define PATCH_SKIP "No Medical"
 #endif

addons/medical_engine/addon.toml

@@ -1,2 +1,3 @@
-[rapify]
-enabled = false
+[tools]
+pboProject_noBinConfig = true
+sqfvm_skipConfigChecks = true

addons/medical_engine/config.cpp

@@ -1,5 +1,6 @@
 #include "script_component.hpp"
 
+#pragma hemtt flag pe23_ignore_has_include
 #if __has_include("\z\ace\addons\nomedical\script_component.hpp")
 #define PATCH_SKIP "No Medical"
 #endif

addons/medical_feedback/addon.toml

@@ -1,2 +1,3 @@
-[rapify]
-enabled = false
+[tools]
+pboProject_noBinConfig = true
+sqfvm_skipConfigChecks = true

addons/medical_feedback/config.cpp

@@ -1,5 +1,6 @@
 #include "script_component.hpp"
 
+#pragma hemtt flag pe23_ignore_has_include
 #if __has_include("\z\ace\addons\nomedical\script_component.hpp")
 #define PATCH_SKIP "No Medical"
 #endif

addons/medical_gui/addon.toml

@@ -1,2 +1,3 @@
-[rapify]
-enabled = false
+[tools]
+pboProject_noBinConfig = true
+sqfvm_skipConfigChecks = true

addons/medical_gui/config.cpp

@@ -1,5 +1,6 @@
 #include "script_component.hpp"
 
+#pragma hemtt flag pe23_ignore_has_include
 #if __has_include("\z\ace\addons\nomedical\script_component.hpp")
 #define PATCH_SKIP "No Medical"
 #endif

addons/medical_statemachine/addon.toml

@@ -1,2 +1,3 @@
-[rapify]
-enabled = false
+[tools]
+pboProject_noBinConfig = true
+sqfvm_skipConfigChecks = true

addons/medical_statemachine/config.cpp

@@ -1,5 +1,6 @@
 #include "script_component.hpp"
 
+#pragma hemtt flag pe23_ignore_has_include
 #if __has_include("\z\ace\addons\nomedical\script_component.hpp")
 #define PATCH_SKIP "No Medical"
 #endif

addons/medical_status/addon.toml

@@ -1,2 +1,3 @@
-[rapify]
-enabled = false
+[tools]
+pboProject_noBinConfig = true
+sqfvm_skipConfigChecks = true

addons/medical_status/config.cpp

@@ -1,5 +1,6 @@
 #include "script_component.hpp"
 
+#pragma hemtt flag pe23_ignore_has_include
 #if __has_include("\z\ace\addons\nomedical\script_component.hpp")
 #define PATCH_SKIP "No Medical"
 #endif

addons/medical_treatment/addon.toml

@@ -1,2 +1,3 @@
-[rapify]
-enabled = false
+[tools]
+pboProject_noBinConfig = true
+sqfvm_skipConfigChecks = true

addons/medical_treatment/config.cpp

@@ -1,5 +1,6 @@
 #include "script_component.hpp"
 
+#pragma hemtt flag pe23_ignore_has_include
 #if __has_include("\z\ace\addons\nomedical\script_component.hpp")
 #define PATCH_SKIP "No Medical"
 #endif

addons/medical_vitals/addon.toml

@@ -1,2 +1,3 @@
-[rapify]
-enabled = false
+[tools]
+pboProject_noBinConfig = true
+sqfvm_skipConfigChecks = true

addons/medical_vitals/config.cpp

@@ -1,5 +1,6 @@
 #include "script_component.hpp"
 
+#pragma hemtt flag pe23_ignore_has_include
 #if __has_include("\z\ace\addons\nomedical\script_component.hpp")
 #define PATCH_SKIP "No Medical"
 #endif

addons/realisticnames/addon.toml

@@ -1,2 +1,3 @@
-[rapify]
-enabled = false
+[tools]
+pboProject_noBinConfig = true
+sqfvm_skipConfigChecks = true

addons/realisticnames/config.cpp

@@ -1,5 +1,6 @@
 #include "script_component.hpp"
 
+#pragma hemtt flag pe23_ignore_has_include
 #if __has_include("\z\ace\addons\norealisticnames\script_component.hpp")
 #define PATCH_SKIP "No Realistic Names"
 #endif

tools/make.py

@@ -1345,16 +1345,13 @@ def main(argv):
                     if os.path.isfile(addonTomlPath):
                         with open(addonTomlPath, "r") as f:
                             tomlFile = f.read()
-                            if "preprocess = false" in tomlFile: 
-                                print_error("'preprocess = false' not supported")
-                                raise
-                            skipPreprocessing = "[preprocess]\nenabled = false" in tomlFile or "[rapify]\nenabled = false" in tomlFile
+                            skipPreprocessing = "pboProject_noBinConfig = true".lower() in tomlFile.lower()
 
                     if os.path.isfile(os.path.join(work_drive, prefix, module, "$NOBIN$")):
                         print_green("$NOBIN$ Found. Proceeding with non-binarizing!")
                         cmd = [makepboTool, "-P","-A","-X=*.backup", os.path.join(work_drive, prefix, module),os.path.join(module_root, release_dir, project,"addons")]
                     elif skipPreprocessing:
-                        print_green("addon.toml set [preprocess.enabled = false]. Proceeding with non-binerized config build!")
+                        print_green("addon.toml set [pboProject_noBinConfig = true]. Proceeding with non-binerized config build!")
                         cmd = [pboproject, "-B", "-P", os.path.join(work_drive, prefix, module), "+Engine=Arma3", "-S", "+Noisy", "+Clean", "-Warnings", "+Mod="+os.path.join(module_root, release_dir, project), "-Key"]
                     else:
                         cmd = [pboproject, "+B", "-P", os.path.join(work_drive, prefix, module), "+Engine=Arma3", "-S", "+Noisy", "+Clean", "-Warnings", "+Mod="+os.path.join(module_root, release_dir, project), "-Key"]

tools/sqfvmChecker.py

@@ -32,7 +32,7 @@ def get_files_to_process(basePath):
                         with open(addonTomlPath, "rb") as f:
                             tomlFile = tomllib.load(f)
                             try:
-                                skipPreprocessing = not tomlFile.get('rapify')['enabled']
+                                skipPreprocessing = tomlFile.get('tools')['sqfvm_skipConfigChecks']
                             except:
                                 pass
                 if file == "config.cpp" and skipPreprocessing:
@@ -42,7 +42,7 @@ def get_files_to_process(basePath):
     return arma_files
 
 
-def process_file(filePath, skipA3Warnings=True):
+def process_file(filePath, skipA3Warnings=True, skipPragmaHemtt=True):
     with open(filePath, "r", encoding="utf-8", errors="ignore") as file:
         content = file.read()
         if content.startswith("//pragma SKIP_COMPILE"):
@@ -71,10 +71,8 @@ def process_file(filePath, skipA3Warnings=True):
             if line.startswith("[ERR]"):
                 fileHasError = True
             if not (
-                skipA3Warnings
-                and line.startswith("[WRN]")
-                and ("a3/" in line)
-                and (("Unexpected IFDEF" in line) or ("defined twice" in line))
+                (skipA3Warnings and line.startswith("[WRN]") and ("a3/" in line) and (("Unexpected IFDEF" in line) or ("defined twice" in line)))
+                or (skipPragmaHemtt and line.startswith("[WRN]") and ("Unknown pragma instruction 'hemtt'" in line))
             ):
                 print("  {}".format(line))
     return fileHasError