mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Tools - HEMTT preprocess is now an object (#9275)
* hemtt: preprocess is now an object * error on deprecated usage
This commit is contained in:
parent
efe1ecd4cd
commit
12bb5aced4
@ -1 +1,2 @@
|
||||
preprocess = false
|
||||
[preprocess]
|
||||
enabled = false
|
||||
|
@ -1 +1,2 @@
|
||||
preprocess = false
|
||||
[preprocess]
|
||||
enabled = false
|
||||
|
@ -877,7 +877,7 @@ Examples:
|
||||
|
||||
|
||||
If a file called $NOBIN$ is found in the module directory, that module will not be binarized.
|
||||
If preprocess = false is set in the addon.toml, that module's config will not be binarized.
|
||||
If preprocess.enabled = false is set in the addon.toml, that module's config will not be binarized.
|
||||
|
||||
See the make.cfg file for additional build options.
|
||||
""")
|
||||
@ -1302,13 +1302,16 @@ See the make.cfg file for additional build options.
|
||||
addonTomlPath = os.path.join(work_drive, prefix, module, "addon.toml")
|
||||
if os.path.isfile(addonTomlPath):
|
||||
with open(addonTomlPath, "r") as f:
|
||||
skipPreprocessing = "preprocess = false" in f.read() #python 3.11 has real toml but this is fine for now
|
||||
if "preprocess = false" in f.read():
|
||||
print_error("'preprocess = false' not supported")
|
||||
raise
|
||||
skipPreprocessing = "[preprocess]\nenabled = false" in f.read()
|
||||
|
||||
if os.path.isfile(os.path.join(work_drive, prefix, module, "$NOBIN$")):
|
||||
print_green("$NOBIN$ Found. Proceeding with non-binarizing!")
|
||||
cmd = [makepboTool, "-P","-A","-X=*.backup", os.path.join(work_drive, prefix, module),os.path.join(module_root, release_dir, project,"addons")]
|
||||
elif skipPreprocessing:
|
||||
print_green("addon.toml set [preprocess = false]. Proceeding with non-binerized config build!")
|
||||
print_green("addon.toml set [preprocess.enabled = false]. Proceeding with non-binerized config build!")
|
||||
cmd = [pboproject, "-B", "-P", os.path.join(work_drive, prefix, module), "+Engine=Arma3", "-S", "+Noisy", "+Clean", "-Warnings", "+Mod="+os.path.join(module_root, release_dir, project), "-Key"]
|
||||
else:
|
||||
cmd = [pboproject, "+B", "-P", os.path.join(work_drive, prefix, module), "+Engine=Arma3", "-S", "+Noisy", "+Clean", "-Warnings", "+Mod="+os.path.join(module_root, release_dir, project), "-Key"]
|
||||
|
@ -29,11 +29,17 @@ def get_files_to_process(basePath):
|
||||
addonTomlPath = os.path.join(root, "addon.toml")
|
||||
if os.path.isfile(addonTomlPath):
|
||||
with open(addonTomlPath, "r") as f:
|
||||
skipPreprocessing = "preprocess = false" in f.read()
|
||||
if "preprocess = false" in f.read():
|
||||
print("'preprocess = false' not supported")
|
||||
raise
|
||||
skipPreprocessing = "[preprocess]\nenabled = false" in f.read()
|
||||
addonTomlPath = os.path.join(os.path.dirname(root), "addon.toml")
|
||||
if os.path.isfile(addonTomlPath):
|
||||
with open(addonTomlPath, "r") as f:
|
||||
skipPreprocessing = "preprocess = false" in f.read()
|
||||
if "preprocess = false" in f.read():
|
||||
print("'preprocess = false' not supported")
|
||||
raise
|
||||
skipPreprocessing = "[preprocess]\nenabled = false" in f.read()
|
||||
if file == "config.cpp" and skipPreprocessing:
|
||||
continue # ignore configs with __has_include
|
||||
filePath = os.path.join(root, file)
|
||||
|
Loading…
Reference in New Issue
Block a user