upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-25 15:43:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

wmlunits: Include nested dependencies in -L for -B to process (#7603)

Browse Source
This commit is contained in:
Slayer95 2023-05-07 16:57:10 -05:00 committed by GitHub
parent eded720ee2
commit 03ab458ce0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/tools/wmlunits
View File

@ -301,7 +301,8 @@ def list_contents():
pass pass
version = get_version(addon) version = get_version(addon)
move(options.addons, os.path.join(options.config_dir, "data", "add-ons"), addon) move(options.addons, os.path.join(options.config_dir, "data", "add-ons"), addon)
for d in get_dependencies(addon): all_dependencies = get_all_dependencies(addon)
for d in all_dependencies:
move(options.addons, os.path.join(options.config_dir, "data", "add-ons"), d) move(options.addons, os.path.join(options.config_dir, "data", "add-ons"), d)
try: try:
info = search(batchlist, addon) info = search(batchlist, addon)
@ -309,7 +310,7 @@ def list_contents():
sys.stdout.write("up to date\n") sys.stdout.write("up to date\n")
continue continue
info["parsed"] = False info["parsed"] = False
info["dependencies"] = get_dependencies(addon) info["dependencies"] = all_dependencies
parse("{core}{multiplayer}{multiplayer/eras.cfg}{~add-ons}", "__WMLUNITS__,MULTIPLAYER,SKIP_CORE") parse("{core}{multiplayer}{multiplayer/eras.cfg}{~add-ons}", "__WMLUNITS__,MULTIPLAYER,SKIP_CORE")
info["eras"] = list_eras(batchlist, addon) info["eras"] = list_eras(batchlist, addon)
info["campaigns"] = list_campaigns(batchlist, addon) info["campaigns"] = list_campaigns(batchlist, addon)
@ -335,7 +336,7 @@ def list_contents():
print("failed") print("failed")
finally: finally:
move(os.path.join(options.config_dir, "data", "add-ons"), options.addons, addon) move(os.path.join(options.config_dir, "data", "add-ons"), options.addons, addon)
for d in get_dependencies(addon): for d in all_dependencies:
move(os.path.join(options.config_dir, "data", "add-ons"), options.addons, d) move(os.path.join(options.config_dir, "data", "add-ons"), options.addons, d)
yaml.safe_dump(batchlist, open(filename, "w"), yaml.safe_dump(batchlist, open(filename, "w"),