Add sqfc support

.gitignore

@@ -25,3 +25,6 @@ Thumbs.db
 *#
 
 tools/ndocs-project/Data/*
+
+ArmaScriptCompiler.exe
+*.sqfc

addons/accessory/CfgEventHandlers.hpp

@@ -1,11 +1,11 @@
 class Extended_PreStart_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
     };
 };
 
 class Extended_PreInit_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
     };
 };

addons/characters/CfgEventHandlers.hpp

@@ -1,5 +1,5 @@
 class Extended_PreInit_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
     };
 };

addons/common/CfgEventHandlers.hpp

@@ -1,19 +1,19 @@
 
 class Extended_PreStart_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
     };
 };
 
 class Extended_PreInit_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preInit));
-        clientInit = QUOTE(call COMPILE_FILE(XEH_preClientInit));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
+        clientInit = QUOTE(call COMPILE_SCRIPT(XEH_preClientInit));
     };
 };
 
 class Extended_PostInit_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_postInit));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
     };
 };

addons/diagnostic/CfgEventHandlers.hpp

@@ -1,12 +1,12 @@
 class Extended_PreStart_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
     };
 };
 
 class Extended_PreInit_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
     };
 };
 

addons/disposable/CfgEventHandlers.hpp

@@ -1,12 +1,12 @@
 class Extended_PreStart_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
     };
 };
 
 class Extended_PreInit_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
     };
 };
 

addons/events/CfgEventHandlers.hpp

@@ -1,18 +1,18 @@
 class Extended_PreStart_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
     };
 };
 
 class Extended_PreInit_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
     };
 };
 
 class Extended_PostInit_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_postInit));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
     };
 };
 

addons/help/CfgEventhandlers.hpp

@@ -1,17 +1,17 @@
 class Extended_PreStart_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
     };
 };
 
 class Extended_PreInit_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
     };
 };
 
 class Extended_PostInit_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_postInit));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
     };
 };

addons/keybinding/CfgEventHandlers.hpp

@@ -1,12 +1,12 @@
 class Extended_PreStart_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
     };
 };
 
 class Extended_PreInit_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
     };
 };
 

addons/main/script_macros_common.hpp

@@ -854,6 +854,8 @@ Macro: ISNILS()
 #define COMPILE_FILE2(var1) COMPILE_FILE2_SYS('var1')
 #define COMPILE_FILE2_CFG(var1) COMPILE_FILE2_CFG_SYS('var1')
 
+#define COMPILE_SCRIPT(var1) compileScript ['PATHTO_SYS(PREFIX,COMPONENT_F,var1)']
+
 
 #define VERSIONING_SYS(var1) class CfgSettings \
 { \

addons/network/CfgEventHandlers.hpp

@@ -1,5 +1,5 @@
 class Extended_PreInit_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
     };
 };

addons/optics/CfgEventHandlers.hpp

@@ -1,12 +1,12 @@
 class Extended_PreStart_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
     };
 };
 
 class Extended_PreInit_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
     };
 };
 

addons/settings/CfgEventHandlers.hpp

@@ -1,18 +1,18 @@
 class Extended_PreStart_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
     };
 };
 
 class Extended_PreInit_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
     };
 };
 
 class Extended_PostInit_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_postInit));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
     };
 };
 

addons/statemachine/CfgEventHandlers.hpp

@@ -1,11 +1,11 @@
 class Extended_PreStart_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
     };
 };
 
 class Extended_PreInit_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
     };
 };

addons/ui/CfgEventHandlers.hpp

@@ -1,12 +1,12 @@
 class Extended_PreStart_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
     };
 };
 
 class Extended_PreInit_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
     };
 };
 

addons/vectors/CfgEventHandlers.hpp

@@ -1,5 +1,5 @@
 class Extended_PreInit_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
     };
 };

addons/versioning/CfgEventHandlers.hpp

@@ -1,19 +1,19 @@
 class Extended_PreStart_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
     };
 };
 
 class Extended_PreInit_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
     };
 };
 
 class Extended_PostInit_EventHandlers {
     class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_postInit));
-        serverInit = QUOTE(call COMPILE_FILE(XEH_postInitServer));
-        clientInit = QUOTE(call COMPILE_FILE(XEH_postInitClient));
+        init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
+        serverInit = QUOTE(call COMPILE_SCRIPT(XEH_postInitServer));
+        clientInit = QUOTE(call COMPILE_SCRIPT(XEH_postInitClient));
     };
 };

hemtt.toml

@@ -21,9 +21,11 @@ authority = "{{prefix}}_{{version}}-{{git \"id 8\"}}"
 check = [
     "!version_set"
 ]
+prebuild = ["!compile_sqf"]
 releasebuild = [
     "@zip CBA_A3_v{{semver.major}}.{{semver.minor}}.{{semver.patch}}",
     "!version_unset"
+	,"!compile_sqf_cleanup"
 ]
 
 [header_exts]
@@ -58,3 +60,19 @@ steps_windows = [
 ]
 only_release = true
 show_output = true
+
+[scripts.compile_sqf]
+steps_windows = [
+    "echo 'compile_sqf'",
+    "py tools/compile_sqf.py cleanup build"
+]
+only_release = true
+show_output = true
+
+[scripts.compile_sqf_cleanup]
+steps_windows = [
+    "echo 'compile_sqf_cleanup'",
+    "py tools/compile_sqf.py cleanup"
+]
+only_release = true
+show_output = true

sqfc.json

@@ -0,0 +1,17 @@
+{
+    "inputDirs": [
+        "P:/x/cba/addons/"
+    ],
+    "includePaths": [
+        "P:/"
+    ],
+    "excludeList": [
+        "\\initsettings.sqf",
+        "\\initkeybinds.sqf",
+        "\\xeh_prep.sqf",
+        "\\backwards_comp.sqf",
+        "settings\\gui_createCategory.sqf"
+    ],
+    "outputDir": "P:/",
+    "workerThreads": 12
+}

tools/compile_sqf.py

@@ -0,0 +1,40 @@
+import os
+import sys
+import subprocess
+
+# Handle script being called from either base or /tools folder (e.g. hemmt will run from base)
+addon_base_path = os.getcwd()
+if os.path.basename(addon_base_path) == "tools":
+    addon_base_path = os.path.dirname(addon_base_path)
+
+
+def cleanup():
+    count = 0
+    for root, _dirs, files in os.walk(os.path.join(addon_base_path, "addons")):
+        for file in files:
+            if file.endswith(".sqfc"):
+                os.remove(os.path.join(root, file))
+                count += 1
+    print("cleaned [{} sqfc files]".format(count))
+
+
+def build(verbose):
+    compiler_exe = os.path.join(addon_base_path, "ArmaScriptCompiler.exe")
+    if not os.path.isfile(compiler_exe):
+        print("Warning: ArmaScriptCompiler.exe not found in base folder - skipping compiling")
+        return
+        # raise FileNotFoundError("ArmaScriptCompiler not found")
+    ret = subprocess.call([compiler_exe], cwd=addon_base_path, stdout=verbose)
+    print("compiled [ret {}]".format(ret))
+
+
+def main(argv):
+    # print("compile_sqf.py [Base: {}]".format(addon_base_path))
+    if ("cleanup" in argv) or (len(argv) < 2):
+        cleanup()
+    if ("build" in argv) or (len(argv) < 2):
+        build("verbose" in argv)
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))

tools/make.py

@@ -392,6 +392,9 @@ def copy_optionals_for_building(mod,pbos):
 
     try:
         for dir_name in src_directories:
+            # Ignore PBOs from HEMMT
+            if (os.path.isfile(os.path.join(optionals_root,dir_name))):
+                continue
             mod.append(dir_name)
             #userconfig requires special handling since it is not a PBO source folder.
             #CfgConvert fails to build server.pbo if userconfig is not found in P:\