Compats - Use 2.14 skipWhenMissingDependencies (#9363)

This commit is contained in:
PabstMirror 2023-09-05 19:32:44 -05:00 committed by GitHub
parent aa107ed517
commit 9d745da465
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 17 additions and 450 deletions

View File

@ -1,2 +0,0 @@
[preprocess]
enabled = false

View File

@ -1,14 +1,15 @@
class CfgMagazines {
class US85_Magazine;
class US85_ATMine_mag: US85_Magazine {
EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_US85_ATMine_mag";
EGVAR(explosives,SetupObject) = "ACE_Explosives_Place_US85_ATMine_mag";
useAction = 0;
};
class US85_M14Mine_mag: US85_Magazine {
EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_US85_M14Mine";
EGVAR(explosives,SetupObject) = "ACE_Explosives_Place_US85_M14Mine";
useAction = 0;
};
class US85_SatchelCharge_Mag: US85_Magazine {
EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_US85_SatchelCharge_Mag";
EGVAR(explosives,SetupObject) = "ACE_Explosives_Place_US85_SatchelCharge_Mag";
useAction = 0;
};
};

View File

@ -1,21 +1,5 @@
#include "script_component.hpp"
#if __has_include("\csla_cfg\config.bin")
#else
#define PATCH_SKIP "CSLA - Iron Curtain"
#endif
#if __has_include("\z\ace\addons\explosives\script_component.hpp")
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "ACE Explosives"
#endif
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
@ -23,7 +7,7 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_explosives", "CSLA", "US85"};
skipWhenMissingDependencies = 1; // drop __has_include and addon.toml after 2.14
skipWhenMissingDependencies = 1;
author = ECSTRING(common,ACETeam);
authors[] = {"Dahlgren"};
url = ECSTRING(main,URL);
@ -33,5 +17,3 @@ class CfgPatches {
#include "CfgMagazines.hpp"
#include "CfgVehicles.hpp"
#endif

View File

@ -1,22 +1,13 @@
#include "script_component.hpp"
#if __has_include("\csla_cfg\config.bin")
#else
#define PATCH_SKIP "CSLA - Iron Curtain"
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"CSLA", "US85"};
skipWhenMissingDependencies = 1; // drop __has_include and addon.toml after 2.14
requiredAddons[] = {"ace_common", "CSLA", "US85"};
skipWhenMissingDependencies = 1;
author = ECSTRING(common,ACETeam);
authors[] = {"Dahlgren"};
url = ECSTRING(main,URL);
@ -26,5 +17,3 @@ class CfgPatches {
#include "CfgMagazines.hpp"
#include "CfgWeapons.hpp"
#endif

View File

@ -1,2 +0,0 @@
[preprocess]
enabled = false

View File

@ -1,21 +1,7 @@
#include "script_component.hpp"
#if __has_include("\rhsafrf\addons\rhs_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS AFRF"
#endif
#if __has_include("\z\ace\addons\csw\script_component.hpp")
#include "\z\ace\addons\csw\script_config_macros_csw.hpp"
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "ACE Crew Served Weapons"
#endif
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
// Config will be binerized, so this include is only required at build-time
#include "\z\ace\addons\csw\script_config_macros_csw.hpp"
class CfgPatches {
class ADDON {
@ -39,5 +25,3 @@ class CfgPatches {
#include "CfgMagazineGroups.hpp"
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
#endif

View File

@ -1,21 +1,5 @@
#include "script_component.hpp"
#if __has_include("\rhsafrf\addons\rhs_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS AFRF"
#endif
#if __has_include("\z\ace\addons\explosives\script_component.hpp")
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "ACE Explosives"
#endif
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = QUOTE(COMPONENT);
@ -37,4 +21,3 @@ class CfgPatches {
#include "CfgAmmo.hpp"
#include "CfgMagazines.hpp"
#include "CfgVehicles.hpp"
#endif

View File

@ -1,21 +1,7 @@
#include "script_component.hpp"
#if __has_include("\rhsafrf\addons\rhs_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS AFRF"
#endif
#if __has_include("\z\ace\addons\fastroping\script_component.hpp")
// Config will be binerized, so this include is only required at build-time
#include "\z\ace\addons\fastroping\script_macros.hpp"
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "ACE Fastroping"
#endif
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
@ -35,5 +21,3 @@ class CfgPatches {
};
#include "CfgVehicles.hpp"
#endif

View File

@ -1,21 +1,5 @@
#include "script_component.hpp"
#if __has_include("\rhsafrf\addons\rhs_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS AFRF"
#endif
#if __has_include("\z\ace\addons\nightvision\script_component.hpp")
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "ACE Night Vision"
#endif
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = QUOTE(COMPONENT);
@ -35,5 +19,3 @@ class CfgPatches {
};
#include "CfgWeapons.hpp"
#endif

View File

@ -1,21 +1,5 @@
#include "script_component.hpp"
#if __has_include("\rhsafrf\addons\rhs_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS AFRF"
#endif
#if __has_include("\z\ace\addons\refuel\script_component.hpp")
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "ACE Refuel"
#endif
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = QUOTE(COMPONENT);
@ -35,5 +19,3 @@ class CfgPatches {
};
#include "CfgVehicles.hpp"
#endif

View File

@ -1,21 +1,5 @@
#include "script_component.hpp"
#if __has_include("\rhsafrf\addons\rhs_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS AFRF"
#endif
#if __has_include("\z\ace\addons\scopes\script_component.hpp")
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "ACE Scopes"
#endif
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = QUOTE(COMPONENT);
@ -35,5 +19,3 @@ class CfgPatches {
};
#include "CfgWeapons.hpp"
#endif

View File

@ -1,14 +1,5 @@
#include "script_component.hpp"
#if __has_include("\rhsafrf\addons\rhs_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS AFRF"
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
@ -29,5 +20,3 @@ class CfgPatches {
#include "CfgMagazines.hpp"
#include "CfgWeapons.hpp"
#include "CfgVehicles.hpp"
#endif

View File

@ -1,2 +0,0 @@
[preprocess]
enabled = false

View File

@ -1,21 +1,7 @@
#include "script_component.hpp"
#if __has_include("\rhsgref\addons\rhsgref_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS GREF"
#endif
#if __has_include("\z\ace\addons\csw\script_component.hpp")
#include "\z\ace\addons\csw\script_config_macros_csw.hpp"
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "ACE Crew Served Weapons"
#endif
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
// Config will be binerized, so this include is only required at build-time
#include "\z\ace\addons\csw\script_config_macros_csw.hpp"
class CfgPatches {
class ADDON {
@ -36,5 +22,3 @@ class CfgPatches {
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
#endif

View File

@ -1,21 +1,5 @@
#include "script_component.hpp"
#if __has_include("\rhsgref\addons\rhsgref_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS GREF"
#endif
#if __has_include("\z\ace\addons\explosives\script_component.hpp")
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "ACE Explosives"
#endif
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = QUOTE(COMPONENT);
@ -36,5 +20,3 @@ class CfgPatches {
#include "CfgAmmo.hpp"
#include "CfgMagazines.hpp"
#include "CfgVehicles.hpp"
#endif

View File

@ -1,21 +1,7 @@
#include "script_component.hpp"
#if __has_include("\rhsgref\addons\rhsgref_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS GREF"
#endif
#if __has_include("\z\ace\addons\fastroping\script_component.hpp")
// Config will be binerized, so this include is only required at build-time
#include "\z\ace\addons\fastroping\script_macros.hpp"
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "ACE Fastroping"
#endif
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
@ -35,5 +21,3 @@ class CfgPatches {
};
#include "CfgVehicles.hpp"
#endif

View File

@ -1,14 +1,5 @@
#include "script_component.hpp"
#if __has_include("\rhsgref\addons\rhsgref_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS GREF"
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
@ -29,5 +20,3 @@ class CfgPatches {
#include "CfgMagazines.hpp"
#include "CfgWeapons.hpp"
#include "CfgVehicles.hpp"
#endif

View File

@ -1,2 +0,0 @@
[preprocess]
enabled = false

View File

@ -1,21 +1,5 @@
#include "script_component.hpp"
#if __has_include("\rhssaf\addons\rhssaf_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS SAF"
#endif
#if __has_include("\z\ace\addons\explosives\script_component.hpp")
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "ACE Explosives"
#endif
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = QUOTE(COMPONENT);
@ -36,5 +20,3 @@ class CfgPatches {
#include "CfgAmmo.hpp"
#include "CfgMagazines.hpp"
#endif

View File

@ -1,14 +1,5 @@
#include "script_component.hpp"
#if __has_include("\rhssaf\addons\rhssaf_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS SAF"
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
@ -26,5 +17,3 @@ class CfgPatches {
#include "CfgAmmo.hpp"
#include "CfgWeapons.hpp"
#endif

View File

@ -1,2 +0,0 @@
[preprocess]
enabled = false

View File

@ -1,21 +1,7 @@
#include "script_component.hpp"
#if __has_include("\rhsusf\addons\rhsusf_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS USAF"
#endif
#if __has_include("\z\ace\addons\csw\script_component.hpp")
#include "\z\ace\addons\csw\script_config_macros_csw.hpp"
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "ACE Crew Served Weapons"
#endif
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
// Config will be binerized, so this include is only required at build-time
#include "\z\ace\addons\csw\script_config_macros_csw.hpp"
class CfgPatches {
class ADDON {
@ -36,5 +22,3 @@ class CfgPatches {
#include "CfgMagazineGroups.hpp"
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
#endif

View File

@ -1,21 +1,5 @@
#include "script_component.hpp"
#if __has_include("\rhsusf\addons\rhsusf_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS USAF"
#endif
#if __has_include("\z\ace\addons\explosives\script_component.hpp")
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "ACE Explosives"
#endif
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
addonRootClass = QUOTE(COMPONENT);
@ -34,5 +18,3 @@ class CfgPatches {
#include "CfgAmmo.hpp"
#include "CfgMagazines.hpp"
#include "CfgVehicles.hpp"
#endif

View File

@ -1,21 +1,7 @@
#include "script_component.hpp"
#if __has_include("\rhsusf\addons\rhsusf_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS USAF"
#endif
#if __has_include("\z\ace\addons\fastroping\script_component.hpp")
// Config will be binerized, so this include is only required at build-time
#include "\z\ace\addons\fastroping\script_macros.hpp"
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "ACE Fastroping"
#endif
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
@ -35,5 +21,3 @@ class CfgPatches {
};
#include "CfgVehicles.hpp"
#endif

View File

@ -1,21 +1,5 @@
#include "script_component.hpp"
#if __has_include("\rhsusf\addons\rhsusf_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS USAF"
#endif
#if __has_include("\z\ace\addons\javelin\script_component.hpp")
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "ACE Javelin"
#endif
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
addonRootClass = QUOTE(COMPONENT);
@ -33,5 +17,3 @@ class CfgPatches {
#include "CfgAmmo.hpp"
#include "CfgWeapons.hpp"
#endif

View File

@ -1,21 +1,5 @@
#include "script_component.hpp"
#if __has_include("\rhsusf\addons\rhsusf_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS USAF"
#endif
#if __has_include("\z\ace\addons\nightvision\script_component.hpp")
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "ACE Night Vision"
#endif
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
addonRootClass = QUOTE(COMPONENT);
@ -32,5 +16,3 @@ class CfgPatches {
};
#include "CfgWeapons.hpp"
#endif

View File

@ -1,21 +1,5 @@
#include "script_component.hpp"
#if __has_include("\rhsusf\addons\rhsusf_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS USAF"
#endif
#if __has_include("\z\ace\addons\refuel\script_component.hpp")
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "ACE Refuel"
#endif
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
addonRootClass = QUOTE(COMPONENT);
@ -33,5 +17,3 @@ class CfgPatches {
#include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp"
#endif

View File

@ -1,21 +1,5 @@
#include "script_component.hpp"
#if __has_include("\rhsusf\addons\rhsusf_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS USAF"
#endif
#if __has_include("\z\ace\addons\scopes\script_component.hpp")
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "ACE Scopes"
#endif
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
addonRootClass = QUOTE(COMPONENT);
@ -32,5 +16,3 @@ class CfgPatches {
};
#include "CfgWeapons.hpp"
#endif

View File

@ -1,14 +1,5 @@
#include "script_component.hpp"
#if __has_include("\rhsusf\addons\rhsusf_main\loadorder\config.bin")
#else
#define PATCH_SKIP "RHS USAF"
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
@ -31,5 +22,3 @@ class CfgPatches {
#include "CfgWeapons.hpp"
#include "CfgVehicles.hpp"
#include "CfgGlasses.hpp"
#endif

View File

@ -1,2 +0,0 @@
[preprocess]
enabled = false

View File

@ -1,21 +1,5 @@
#include "script_component.hpp"
#if __has_include("\vn\weapons_f_vietnam\config.bin")
#else
#define PATCH_SKIP "SOG-Vietnam"
#endif
#if __has_include("\z\ace\addons\csw\script_component.hpp")
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "ACE Trenches"
#endif
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
@ -34,5 +18,3 @@ class CfgPatches {
};
#include "CfgVehicles.hpp"
#endif

View File

@ -1,28 +1,5 @@
#include "script_component.hpp"
#if __has_include("\vn\weapons_f_vietnam\config.bin")
#else
#define PATCH_SKIP "SOG-Vietnam"
#endif
#if __has_include("\z\ace\addons\csw\script_component.hpp")
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "ACE Trenches"
#endif
#endif
#if __has_include("\x\grad_trenches\addons\main\script_component.hpp")
#else
#ifndef PATCH_SKIP
#define PATCH_SKIP "Grad Trenches"
#endif
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
@ -41,5 +18,3 @@ class CfgPatches {
};
#include "CfgVehicles.hpp"
#endif

View File

@ -1,14 +1,5 @@
#include "script_component.hpp"
#if __has_include("\vn\weapons_f_vietnam\config.bin")
#else
#define PATCH_SKIP "SOG-Vietnam"
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
@ -44,9 +35,7 @@ class CfgPatches {
QGVAR(mortar_type53_carry)
};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {
"loadorder_f_vietnam"
};
requiredAddons[] = {"ace_common", "loadorder_f_vietnam"};
skipWhenMissingDependencies = 1;
author = ECSTRING(common,ACETeam);
authors[] = {"BaerMitUmlaut", "veteran29"};
@ -65,5 +54,3 @@ class CfgPatches {
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
#include "EMM_mainMenu_CfgMenus.hpp"
#endif