Switch to HEMTT v1 (#196)

* Remove old hemtt binary from project files

* Remove two leftover files from removed debug component

* Update script_debug.hpp

HEMTT 1.0 does not like `/* */` as macro, use semicolon to have same functionality

* Fix config issues

Remove autoquote and additional comma

* Update .gitignore

* Add HEMTT 1.0 configuration files

* Add hemtt.launch config

Neat!

* Remove unused Publish.ps1

* Replace Set-Version.ps1 with RHAI hook

* Use version without build hash in mod.cpp

* Switch to HEMTT v1 in Windows 2022

* Re-enable binarization for nightvision p3d

* Add ace launch profile

* Apply cargo clippy suggestions

* Fix arma.build workflow

* Add SOGPF launch profile

* Do not generate SQFC for settings files

These are not valid SQF standalone

* Do not generate SQFC for settings and keybind files

These are not valid SQF standalone

* Update CBA script_macros_common.hpp

* Add WW2 launch config

* Fix duplicated macros

* Fix duplicate macros in BI defines

* Add SQFC support

.github/workflows/arma.yml

@@ -33,19 +33,21 @@ jobs:
       continue-on-error: true # No failure due to many false-positives
 
   build:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
     - name: Checkout the source code
       uses: actions/checkout@master
     - name: Pull Arma3Tools
       run: |
         echo ${{ secrets.CR_PAT }} | docker login -u ${{ secrets.CR_USER }} --password-stdin ghcr.io
-        docker pull ghcr.io/armaforces/arma3tools:latest
+        docker pull ghcr.io/armaforces/arma3tools:v2
     - name: Build using HEMTT
       run: |
-        docker run -v "$(pwd):c:/workdir" -e CI=$True ghcr.io/armaforces/arma3tools:latest hemtt build --release --ci --time
+        docker run -v "$(pwd):c:/workdir" -e CI=$True ghcr.io/armaforces/arma3tools:v2 hemtt release
 
     - uses: actions/upload-artifact@v2
       with:
         name: armaforces_mods
-        path: releases/*.zip
+        path: |
+            releases/*.zip
+            !releases/afm-latest.zip

.github/workflows/release.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build_addon:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
     - name: Set VERSION env
       run: echo VERSION=${GITHUB_REF:11} >> $GITHUB_ENV

.gitignore

@@ -1,6 +1,5 @@
 # Build output
-addons/*.pbo
-keys/*
+.hemttout/*
 
 # Releases
 releases/*

.hemtt/hooks/post_release/set_version.rhai

@@ -0,0 +1,14 @@
+
+let modCpp = HEMTT_OUTPUT
+    .join("mod.cpp")
+    .open_file()
+    .read()
+;
+
+modCpp.replace("0.0.0", `${HEMTT_PROJECT_VERSION_MAJOR}.${HEMTT_PROJECT_VERSION_MINOR}.${HEMTT_PROJECT_VERSION_PATCH}`);
+
+HEMTT_OUTPUT
+    .join("mod.cpp")
+    .create_file()
+    .write(modCpp)
+;

.hemtt/project.toml

@@ -0,0 +1,74 @@
+
+name = "ArmaForces Mods"
+mainprefix = "z"
+prefix = "afm"
+
+[files]
+include = [
+    "LICENSE",
+    "mod.cpp",
+    "README.md",
+    "armaforces_mods_x64.dll",
+]
+
+exclude = ["*.psd", "*.png", "*.tga"]
+
+[properties]
+author = "ArmaForces"
+
+[version]
+path = "addons/main/script_version.hpp"
+
+[asc]
+exclude = [
+    "initSettings.sqf",
+    "initKeybinds.sqf",
+    "initSettingsChannelNames.sqf",
+]
+
+[hemtt.launch]
+workshop = [
+    "450814997", # CBA_A3
+    "2369477168", # ADT
+]
+parameters = [
+    "-name=dev",
+    "-window",
+]
+
+[hemtt.launch.ace]
+workshop = [
+    "450814997", # CBA_A3
+    "2369477168", # ADT
+    "463939057", # ACE
+]
+parameters = [
+    "-name=dev",
+    "-window",
+]
+
+[hemtt.launch.vn]
+workshop = [
+    "450814997", # CBA_A3
+    "2369477168", # ADT
+]
+parameters = [
+    "-name=dev",
+    "-window",
+]
+dlc = [
+    "S.O.G. Prairie Fire",
+]
+
+[hemtt.launch.ww2]
+workshop = [
+    "450814997", # CBA_A3
+    "2369477168", # ADT
+]
+parameters = [
+    "-name=dev",
+    "-window",
+]
+dlc = [
+    "Spearhead 1944",
+]

addons/acre/CfgEventHandlers.hpp

@@ -1,15 +1,15 @@
 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/ai_disembark/CfgEventHandlers.hpp

@@ -1,10 +1,10 @@
 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/back_to_game/CfgEventHandlers.hpp

@@ -1,15 +1,15 @@
 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/common/CfgEventHandlers.hpp

@@ -1,15 +1,15 @@
 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/common/ui/RscModal.hpp

@@ -1,5 +1,3 @@
-#include "script_component.hpp"
-
 class RscText;
 class RscTitle;
 class RscButtonMenuOK;

addons/curator/CfgEventHandlers.hpp

@@ -1,15 +1,15 @@
 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/debug_console/CfgEventHandlers.hpp

@@ -1,16 +1,16 @@
 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/extension/CfgEventHandlers.hpp

@@ -1,15 +1,15 @@
 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/extension_attendance/CfgEventHandlers.hpp

@@ -1,15 +1,15 @@
 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/extension_main_menu/CfgEventHandlers.hpp

@@ -1,23 +1,23 @@
 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));
     };
 };
 
 class Extended_DisplayLoad_EventHandlers {
     class RscDisplayMain {
         ADDON = QUOTE(with uiNamespace do {\
-            [_this select 0] call COMPILE_FILE(XEH_mainDisplay);\
+            [_this select 0] call COMPILE_SCRIPT(XEH_mainDisplay);\
         });
     };
 };

addons/fatigue/CfgEventHandlers.hpp

@@ -1,15 +1,15 @@
 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/flags/CfgEventHandlers.hpp

@@ -1,15 +1,15 @@
 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/flags/FlagsVanilla.hpp

@@ -33,6 +33,6 @@ class GVAR(Russia): Flag_White_F {
     displayName = "Flag (Russia)";
 
     class EventHandlers {
-        init = '(_this select 0) setFlagTexture "\A3\UI_F_Enoch\Data\CfgMarkers\Russia_CA.paa"';
+        init = "(_this select 0) setFlagTexture '\A3\UI_F_Enoch\Data\CfgMarkers\Russia_CA.paa'";
     };
 };

addons/friendly_fire/CfgEventHandlers.hpp

@@ -1,10 +1,10 @@
 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/fries/CfgEventHandlers.hpp

@@ -1,10 +1,10 @@
 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));
     };
 };