Skip to content

Commit 58d069b

Browse files
author
GBDixonAlex
committed
- update jsn to support env vars, add more / better verbosity output and task print output
1 parent 56da609 commit 58d069b

File tree

2 files changed

+29
-4
lines changed

2 files changed

+29
-4
lines changed

scripts/pmbuild.py

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616
import zipfile
1717
import getpass
1818

19+
import jsn.jsn as jsn
20+
1921
import util
2022
import dependencies
21-
import jsn.jsn as jsn
2223
import cgu.cgu as cgu
2324

25+
2426
from http.server import HTTPServer, CGIHTTPRequestHandler, executable
2527

2628

@@ -1286,6 +1288,19 @@ def pmbuild_profile_help(config, build_order):
12861288
print("\navailable tasks for profile " + config["user_vars"]["profile"] + ":")
12871289
print(" config.jsn (edit task settings or add new ones in here)")
12881290
print(" build order:")
1291+
1292+
non_profiles = [
1293+
"tools",
1294+
"tools_help",
1295+
"extensions",
1296+
"user_vars",
1297+
"special_args",
1298+
"post_build_order",
1299+
"pre_build_order",
1300+
"build_order",
1301+
"user_args"
1302+
]
1303+
12891304
for task_name in build_order:
12901305
task = config[task_name]
12911306

@@ -1298,9 +1313,15 @@ def pmbuild_profile_help(config, build_order):
12981313
msg = " " * 8 + task_name + " (disabled)"
12991314
util.log_lvl(msg, config, "-verbose")
13001315
continue
1301-
1316+
13021317
print(" " * 8 + task_name)
13031318

1319+
print("")
1320+
print(" explicit tasks:")
1321+
for key in config:
1322+
if key not in build_order and key not in non_profiles:
1323+
print(" " * 8 + key)
1324+
13041325

13051326
# build help for core tasks
13061327
def core_help(config, taskname, task_type):
@@ -1598,7 +1619,7 @@ def main():
15981619
files = jsn.loads("{files:" + user_files + "}")
15991620
config["tool"]["files"] = files["files"]
16001621

1601-
# verbosity indicator
1622+
# display user vars
16021623
util.log_lvl("user_vars:", config, "-verbose")
16031624
util.log_lvl(json.dumps(config["user_vars"], indent=4), config, "-verbose")
16041625

@@ -1614,6 +1635,10 @@ def main():
16141635
print(special_args, flush=True)
16151636
print(json.dumps(config, indent=4), flush=True)
16161637

1638+
# display tools
1639+
util.log_lvl("tools:", config, "-verbose")
1640+
util.log_lvl(json.dumps(config["tools"], indent=4), config, "-verbose")
1641+
16171642
# core scripts
16181643
scripts = {
16191644
"copy": copy,

0 commit comments

Comments
 (0)