Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to HEMTT v1 #196

Merged
merged 25 commits into from
Oct 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
4de1cea
Remove old hemtt binary from project files
veteran29 Mar 12, 2023
d6e30eb
Remove two leftover files from removed debug component
veteran29 Mar 12, 2023
2a57dfc
Update script_debug.hpp
veteran29 Mar 12, 2023
09e2177
Fix config issues
veteran29 Mar 12, 2023
f823bf6
Update .gitignore
veteran29 Mar 12, 2023
6298691
Add HEMTT 1.0 configuration files
veteran29 Mar 12, 2023
d4030f6
Add hemtt.launch config
veteran29 Mar 12, 2023
f6c2f50
Remove unused Publish.ps1
veteran29 Mar 13, 2023
e2743be
Replace Set-Version.ps1 with RHAI hook
veteran29 Mar 13, 2023
6871517
Use version without build hash in mod.cpp
veteran29 Mar 13, 2023
4029ce3
Switch to HEMTT v1 in Windows 2022
veteran29 Mar 19, 2023
52d3c21
Re-enable binarization for nightvision p3d
veteran29 Mar 19, 2023
d5ce9ee
Add ace launch profile
veteran29 Jun 19, 2023
2d82e52
Merge branch 'master' into hemtt-1.0.0
veteran29 Jun 19, 2023
e2d2f77
Apply cargo clippy suggestions
veteran29 Jun 19, 2023
d922065
Fix arma.build workflow
veteran29 Jun 19, 2023
3071855
Add SOGPF launch profile
veteran29 Jun 22, 2023
03b0ff9
Do not generate SQFC for settings files
veteran29 Jun 22, 2023
eeea2b8
Do not generate SQFC for settings and keybind files
veteran29 Jun 22, 2023
7a2e178
Update CBA script_macros_common.hpp
veteran29 Jun 22, 2023
a68eb20
Add WW2 launch config
veteran29 Jul 26, 2023
7aef0ab
Merge branch 'master' into hemtt-1.0.0
veteran29 Sep 26, 2023
4161e0d
Fix duplicated macros
veteran29 Sep 28, 2023
d27cf12
Fix duplicate macros in BI defines
veteran29 Sep 28, 2023
de4b10e
Add SQFC support
veteran29 Sep 28, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/arma.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Build output
addons/*.pbo
keys/*
.hemttout/*

# Releases
releases/*
Expand Down
14 changes: 14 additions & 0 deletions .hemtt/hooks/post_release/set_version.rhai
Original file line number Diff line number Diff line change
@@ -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)
;
74 changes: 74 additions & 0 deletions .hemtt/project.toml
Original file line number Diff line number Diff line change
@@ -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",
]
6 changes: 3 additions & 3 deletions addons/acre/CfgEventHandlers.hpp
Original file line number Diff line number Diff line change
@@ -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));
};
};
4 changes: 2 additions & 2 deletions addons/ai_disembark/CfgEventHandlers.hpp
Original file line number Diff line number Diff line change
@@ -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));
};
};
6 changes: 3 additions & 3 deletions addons/back_to_game/CfgEventHandlers.hpp
Original file line number Diff line number Diff line change
@@ -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));
};
};
6 changes: 3 additions & 3 deletions addons/common/CfgEventHandlers.hpp
Original file line number Diff line number Diff line change
@@ -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));
};
};
2 changes: 0 additions & 2 deletions addons/common/ui/RscModal.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#include "script_component.hpp"

class RscText;
class RscTitle;
class RscButtonMenuOK;
Expand Down
1 change: 0 additions & 1 deletion addons/common/ui/script_component.hpp

This file was deleted.

6 changes: 3 additions & 3 deletions addons/curator/CfgEventHandlers.hpp
Original file line number Diff line number Diff line change
@@ -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));
};
};
Empty file removed addons/debug/XEH_PREP.hpp
Empty file.
2 changes: 0 additions & 2 deletions addons/debug/XEH_preStart.sqf

This file was deleted.

6 changes: 3 additions & 3 deletions addons/debug_console/CfgEventHandlers.hpp
Original file line number Diff line number Diff line change
@@ -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));
};
};

Expand Down
6 changes: 3 additions & 3 deletions addons/extension/CfgEventHandlers.hpp
Original file line number Diff line number Diff line change
@@ -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));
};
};
6 changes: 3 additions & 3 deletions addons/extension_attendance/CfgEventHandlers.hpp
Original file line number Diff line number Diff line change
@@ -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));
};
};
8 changes: 4 additions & 4 deletions addons/extension_main_menu/CfgEventHandlers.hpp
Original file line number Diff line number Diff line change
@@ -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);\
});
};
};
6 changes: 3 additions & 3 deletions addons/fatigue/CfgEventHandlers.hpp
Original file line number Diff line number Diff line change
@@ -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));
};
};
6 changes: 3 additions & 3 deletions addons/flags/CfgEventHandlers.hpp
Original file line number Diff line number Diff line change
@@ -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));
};
};
2 changes: 1 addition & 1 deletion addons/flags/FlagsVanilla.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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'";
};
};
4 changes: 2 additions & 2 deletions addons/friendly_fire/CfgEventHandlers.hpp
Original file line number Diff line number Diff line change
@@ -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));
};
};
4 changes: 2 additions & 2 deletions addons/fries/CfgEventHandlers.hpp
Original file line number Diff line number Diff line change
@@ -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));
};
};
Loading
Loading