Skip to content

Commit

Permalink
Merge pull request #81 from formtapez/timemarkers_and_hemtt
Browse files Browse the repository at this point in the history
Removed Timemarkers and preparation for HEMTT
  • Loading branch information
formtapez authored Apr 2, 2021
2 parents 73aebbe + 83128b0 commit 264facc
Show file tree
Hide file tree
Showing 5 changed files with 91 additions and 98 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
*.pbo
@*
setMetaData.bat
*.lnk
releases/*
*.biprivatekey
keys/*
.hemtt/local
2 changes: 1 addition & 1 deletion addons/opt_hud/dialogs/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class opt_DefaultMenu
y = safezoneY + safezoneH - 0.025 * safezoneH;
w = safezoneW;
h = 0.025 * safezoneH;
}
};

// 1. Feld
class PlayersDisplay : RSCText
Expand Down
30 changes: 0 additions & 30 deletions addons/opt_timemarkers/config.cpp

This file was deleted.

66 changes: 0 additions & 66 deletions addons/opt_timemarkers/init.sqf

This file was deleted.

86 changes: 86 additions & 0 deletions hemtt.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
name = "OPT-ClientMod"
mainprefix = ""
modname = "opt-client"
prefix = ""
author = "Operation Pandora Trigger"
sig_version = 3
version = "2.9.6.1"
reuse_private_key = false
files = [
"mod.cpp",
"README.md",
"opt4_icon.paa"
]

check = [
"!version_set",
"!comment_isdev"
]

postbuild = [
"!version_unset",
"!uncomment_isdev"
]

releasebuild = [
"@zip opt-clientmod_v{{semver.major}}.{{semver.minor}}.{{semver.patch}}.{{semver.build}}"
]

key_name = "v{{semver.major}}.{{semver.minor}}.{{semver.patch}}.{{semver.build}}"
authority = "v{{semver.major}}.{{semver.minor}}.{{semver.patch}}.{{semver.build}}"

[scripts.version_set]
steps_linux = [
"sed -i -r -s 's/#define MAJOR 0/#define MAJOR {{semver.major}}/g' addons/opt_core/macros.hpp",
"sed -i -r -s 's/#define MINOR 0/#define MINOR {{semver.minor}}/g' addons/opt_core/macros.hpp",
"sed -i -r -s 's/#define PATCHLVL 0/#define PATCHLVL {{semver.patch}}/g' addons/opt_core/macros.hpp",
"sed -i -r -s 's/#define BUILD 0/#define BUILD {{semver.build}}/g' addons/opt_core/macros.hpp",
]
steps_windows = [
"powershell -Command foreach ($f in 'addons/opt_core/macros.hpp') {(Get-Content $f) -replace '#define MAJOR 0', '#define MAJOR {{semver.major}}' -join \"`n\" ^| Set-Content -NoNewline $f; Add-Content -NoNewline \"`n\" $f}",
"powershell -Command foreach ($f in 'addons/opt_core/macros.hpp') {(Get-Content $f) -replace '#define MINOR 0', '#define MINOR {{semver.minor}}' -join \"`n\" ^| Set-Content -NoNewline $f; Add-Content -NoNewline \"`n\" $f}",
"powershell -Command foreach ($f in 'addons/opt_core/macros.hpp') {(Get-Content $f) -replace '#define PATCHLVL 0', '#define PATCHLVL {{semver.patch}}' -join \"`n\" ^| Set-Content -NoNewline $f; Add-Content -NoNewline \"`n\" $f}",
"powershell -Command foreach ($f in 'addons/opt_core/macros.hpp') {(Get-Content $f) -replace '#define BUILD 0', '#define BUILD {{semver.build}}' -join \"`n\" ^| Set-Content -NoNewline $f; Add-Content -NoNewline \"`n\" $f}",
]

only_release = false
show_output = true

[scripts.version_unset]
steps_linux = [
"sed -i -r -s 's/#define MAJOR {{semver.major}}/#define MAJOR 0/g' addons/opt_core/macros.hpp",
"sed -i -r -s 's/#define MINOR {{semver.minor}}/#define MINOR 0/g' addons/opt_core/macros.hpp",
"sed -i -r -s 's/#define PATCHLVL {{semver.patch}}/#define PATCHLVL 0/g' addons/opt_core/macros.hpp",
"sed -i -r -s 's/#define BUILD {{semver.build}}/#define BUILD 0/g' addons/opt_core/macros.hpp",
]
steps_windows = [
"powershell -Command foreach ($f in 'addons/opt_core/macros.hpp') {(Get-Content $f) -replace '#define MAJOR {{semver.major}}', '#define MAJOR 0' -join \"`n\" ^| Set-Content -NoNewline $f; Add-Content -NoNewline \"`n\" $f}",
"powershell -Command foreach ($f in 'addons/opt_core/macros.hpp') {(Get-Content $f) -replace '#define MINOR {{semver.minor}}', '#define MINOR 0' -join \"`n\" ^| Set-Content -NoNewline $f; Add-Content -NoNewline \"`n\" $f}",
"powershell -Command foreach ($f in 'addons/opt_core/macros.hpp') {(Get-Content $f) -replace '#define PATCHLVL {{semver.patch}}', '#define PATCHLVL 0' -join \"`n\" ^| Set-Content -NoNewline $f; Add-Content -NoNewline \"`n\" $f}",
"powershell -Command foreach ($f in 'addons/opt_core/macros.hpp') {(Get-Content $f) -replace '#define BUILD {{semver.build}}', '#define BUILD 0' -join \"`n\" ^| Set-Content -NoNewline $f; Add-Content -NoNewline \"`n\" $f}",
]

only_release = false
show_output = true

[scripts.comment_isdev]
steps_linux = [
"sed -i -r -s 's:#define ISDEV:// #define ISDEV:g' addons/opt_core/macros.hpp",
]
steps_windows = [
"powershell -Command foreach ($f in 'addons/opt_core/macros.hpp') {(Get-Content $f) -replace '#define ISDEV', '// #define ISDEV' -join \"`n\" ^| Set-Content -NoNewline $f; Add-Content -NoNewline \"`n\" $f}",
]

only_release = false
show_output = true

[scripts.uncomment_isdev]
steps_linux = [
"sed -i -r -s 's:// #define ISDEV:#define ISDEV:g' addons/opt_core/macros.hpp",
]
steps_windows = [
"powershell -Command foreach ($f in 'addons/opt_core/macros.hpp') {(Get-Content $f) -replace '// #define ISDEV', '#define ISDEV' -join \"`n\" ^| Set-Content -NoNewline $f; Add-Content -NoNewline \"`n\" $f}",
]

only_release = false
show_output = true

0 comments on commit 264facc

Please sign in to comment.