From 38ca78a3eb8e5b552e6d7560da751674246a8c68 Mon Sep 17 00:00:00 2001 From: Kevin Dinkel <1225857+dinkelk@users.noreply.github.com> Date: Tue, 23 Jan 2024 15:45:31 -0700 Subject: [PATCH 1/2] adding profiling capability for top level do files --- clean.do | 2 +- default.do | 2 +- default.elf.do | 2 +- default.eps.do | 2 +- default.gpr.do | 2 +- default.o.do | 2 +- default.pdf.do | 2 +- default.png.do | 2 +- default.svg.do | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/clean.do b/clean.do index 724a3b6..3175fcc 100644 --- a/clean.do +++ b/clean.do @@ -20,4 +20,4 @@ if __name__ == "__main__": rule.build(*sys.argv[1:]) # Exit fast: -performance.exit() +performance.exit(sys.argv[2]) diff --git a/default.do b/default.do index 32dc773..eeca638 100644 --- a/default.do +++ b/default.do @@ -87,4 +87,4 @@ if __name__ == "__main__": error.error_abort("default.do: No rule to build '" + sys.argv[1] + "'.") # Exit fast: -performance.exit() +performance.exit(sys.argv[2]) diff --git a/default.elf.do b/default.elf.do index ac2cf59..572eef1 100644 --- a/default.elf.do +++ b/default.elf.do @@ -16,4 +16,4 @@ if __name__ == "__main__": rule.build(*sys.argv[1:]) # Exit fast: -performance.exit() +performance.exit(sys.argv[2]) diff --git a/default.eps.do b/default.eps.do index 70296e4..13bffb0 100644 --- a/default.eps.do +++ b/default.eps.do @@ -16,4 +16,4 @@ if __name__ == "__main__": rule.build(*sys.argv[1:]) # Exit fast: -performance.exit() +performance.exit(sys.argv[2]) diff --git a/default.gpr.do b/default.gpr.do index 6fe0422..c1662b9 100644 --- a/default.gpr.do +++ b/default.gpr.do @@ -16,4 +16,4 @@ if __name__ == "__main__": rule.build(*sys.argv[1:]) # Exit fast: -performance.exit() +performance.exit(sys.argv[2]) diff --git a/default.o.do b/default.o.do index 53cec04..f26fa5e 100644 --- a/default.o.do +++ b/default.o.do @@ -16,4 +16,4 @@ if __name__ == "__main__": rule.build(*sys.argv[1:]) # Exit fast: -performance.exit() +performance.exit(sys.argv[2]) diff --git a/default.pdf.do b/default.pdf.do index 22ebae7..27f9f15 100644 --- a/default.pdf.do +++ b/default.pdf.do @@ -16,4 +16,4 @@ if __name__ == "__main__": rule.build(*sys.argv[1:]) # Exit fast: -performance.exit() +performance.exit(sys.argv[2]) diff --git a/default.png.do b/default.png.do index 7881d69..e0f09d6 100644 --- a/default.png.do +++ b/default.png.do @@ -16,4 +16,4 @@ if __name__ == "__main__": rule.build(*sys.argv[1:]) # Exit fast: -performance.exit() +performance.exit(sys.argv[2]) diff --git a/default.svg.do b/default.svg.do index 45782fb..8fa921f 100644 --- a/default.svg.do +++ b/default.svg.do @@ -16,4 +16,4 @@ if __name__ == "__main__": rule.build(*sys.argv[1:]) # Exit fast: -performance.exit() +performance.exit(sys.argv[2]) From f86ae4c4a06efdf21cc9f0efb102d1f57192948f Mon Sep 17 00:00:00 2001 From: Kevin Dinkel <1225857+dinkelk@users.noreply.github.com> Date: Tue, 23 Jan 2024 15:48:29 -0700 Subject: [PATCH 2/2] fixing spacing in top level dos --- clean.do | 12 ++--- default.do | 136 ++++++++++++++++++++++++------------------------- default.elf.do | 6 +-- default.eps.do | 6 +-- default.gpr.do | 6 +-- default.o.do | 6 +-- default.pdf.do | 6 +-- default.png.do | 6 +-- default.svg.do | 6 +-- 9 files changed, 95 insertions(+), 95 deletions(-) diff --git a/clean.do b/clean.do index 3175fcc..de72cab 100644 --- a/clean.do +++ b/clean.do @@ -12,12 +12,12 @@ import glob # Special clean that removes b~main files before # doing the normal clean. if __name__ == "__main__": - assert len(sys.argv) == 4 - for hgx in glob.glob("b~*"): - os.remove(hgx) - from rules.build_clean import build_clean - rule = build_clean() - rule.build(*sys.argv[1:]) + assert len(sys.argv) == 4 + for hgx in glob.glob("b~*"): + os.remove(hgx) + from rules.build_clean import build_clean + rule = build_clean() + rule.build(*sys.argv[1:]) # Exit fast: performance.exit(sys.argv[2]) diff --git a/default.do b/default.do index eeca638..ae5015a 100644 --- a/default.do +++ b/default.do @@ -16,75 +16,75 @@ from util import redo_arg # as those built by a generator. if __name__ == "__main__": - assert len(sys.argv) == 4 - directory, base = redo_arg.split_redo_arg(sys.argv[2]) - rule_cls = None - # Is the file a product of the metric generator: - if redo_arg.in_build_metric_dir(sys.argv[2]): - from rules.build_metric import build_metric as rule_cls - # Is the file a type range yaml file? - elif base.endswith(".type_ranges.yaml"): - from rules.build_type_ranges_yaml import build_type_ranges_yaml as rule_cls - elif base.endswith("_h.ads") or base.endswith("_hpp.ads"): - from rules.build_bindings import build_bindings as rule_cls - # Is the file a product of a generator? - elif redo_arg.in_build_dir(sys.argv[2]): - from rules.build_via_generator import build_via_generator as rule_cls - # Special redo directives: - elif base == "clean": - from rules.build_clean import build_clean as rule_cls - elif base == "clean_all": - from rules.build_clean_all import build_clean_all as rule_cls - elif base == "what": - from rules.build_what import build_what as rule_cls - elif base == "prove": - from rules.build_prove import build_prove as rule_cls - elif base == "analyze": - from rules.build_analyze import build_analyze as rule_cls - elif base == "style": - from rules.build_style import build_style as rule_cls - elif base == "style_all": - from rules.build_style_all import build_style_all as rule_cls - elif base == "pretty": - from rules.build_pretty import build_pretty as rule_cls - elif base == "targets": - from rules.build_targets import build_targets as rule_cls - elif base == "templates": - from rules.build_templates import build_templates as rule_cls - elif base == "all": - from rules.build_all import build_all as rule_cls - elif base == "recursive": - from rules.build_recursive import build_recursive as rule_cls - elif base == "path": - from rules.build_path import build_path as rule_cls - elif base == "print_path": - from rules.build_print_path import build_print_path as rule_cls - elif base == "test": - from rules.build_test import build_test as rule_cls - elif base == "coverage": - from rules.build_coverage import build_coverage as rule_cls - from util import target as tgt - tgt.set_default_coverage_target() - elif base == "run": - from rules.build_run import build_run as rule_cls - elif base == "test_all": - from rules.build_test_all import build_test_all as rule_cls - elif base == "coverage_all": - from rules.build_coverage_all import build_coverage_all as rule_cls - elif base == "publish": - from rules.build_publish import build_publish as rule_cls - elif base == "codepeer_server": - from rules.build_codepeer_server import build_codepeer_server as rule_cls - elif base == "yaml_sloc": - from rules.build_yaml_sloc import build_yaml_sloc as rule_cls + assert len(sys.argv) == 4 + directory, base = redo_arg.split_redo_arg(sys.argv[2]) + rule_cls = None + # Is the file a product of the metric generator: + if redo_arg.in_build_metric_dir(sys.argv[2]): + from rules.build_metric import build_metric as rule_cls + # Is the file a type range yaml file? + elif base.endswith(".type_ranges.yaml"): + from rules.build_type_ranges_yaml import build_type_ranges_yaml as rule_cls + elif base.endswith("_h.ads") or base.endswith("_hpp.ads"): + from rules.build_bindings import build_bindings as rule_cls + # Is the file a product of a generator? + elif redo_arg.in_build_dir(sys.argv[2]): + from rules.build_via_generator import build_via_generator as rule_cls + # Special redo directives: + elif base == "clean": + from rules.build_clean import build_clean as rule_cls + elif base == "clean_all": + from rules.build_clean_all import build_clean_all as rule_cls + elif base == "what": + from rules.build_what import build_what as rule_cls + elif base == "prove": + from rules.build_prove import build_prove as rule_cls + elif base == "analyze": + from rules.build_analyze import build_analyze as rule_cls + elif base == "style": + from rules.build_style import build_style as rule_cls + elif base == "style_all": + from rules.build_style_all import build_style_all as rule_cls + elif base == "pretty": + from rules.build_pretty import build_pretty as rule_cls + elif base == "targets": + from rules.build_targets import build_targets as rule_cls + elif base == "templates": + from rules.build_templates import build_templates as rule_cls + elif base == "all": + from rules.build_all import build_all as rule_cls + elif base == "recursive": + from rules.build_recursive import build_recursive as rule_cls + elif base == "path": + from rules.build_path import build_path as rule_cls + elif base == "print_path": + from rules.build_print_path import build_print_path as rule_cls + elif base == "test": + from rules.build_test import build_test as rule_cls + elif base == "coverage": + from rules.build_coverage import build_coverage as rule_cls + from util import target as tgt + tgt.set_default_coverage_target() + elif base == "run": + from rules.build_run import build_run as rule_cls + elif base == "test_all": + from rules.build_test_all import build_test_all as rule_cls + elif base == "coverage_all": + from rules.build_coverage_all import build_coverage_all as rule_cls + elif base == "publish": + from rules.build_publish import build_publish as rule_cls + elif base == "codepeer_server": + from rules.build_codepeer_server import build_codepeer_server as rule_cls + elif base == "yaml_sloc": + from rules.build_yaml_sloc import build_yaml_sloc as rule_cls - # Run the rule - if rule_cls: - rule = rule_cls() - rule.build(*sys.argv[1:]) - else: - from util import error - error.error_abort("default.do: No rule to build '" + sys.argv[1] + "'.") + # Run the rule + if rule_cls: + rule = rule_cls() + rule.build(*sys.argv[1:]) + else: + from util import error + error.error_abort("default.do: No rule to build '" + sys.argv[1] + "'.") # Exit fast: performance.exit(sys.argv[2]) diff --git a/default.elf.do b/default.elf.do index 572eef1..4215bbe 100644 --- a/default.elf.do +++ b/default.elf.do @@ -11,9 +11,9 @@ from rules.build_executable import build_executable # This .do file builds .elf (executable binary) files. if __name__ == "__main__": - assert len(sys.argv) == 4 - rule = build_executable() - rule.build(*sys.argv[1:]) + assert len(sys.argv) == 4 + rule = build_executable() + rule.build(*sys.argv[1:]) # Exit fast: performance.exit(sys.argv[2]) diff --git a/default.eps.do b/default.eps.do index 13bffb0..1c1001d 100644 --- a/default.eps.do +++ b/default.eps.do @@ -11,9 +11,9 @@ from rules.build_eps import build_eps # This .do file builds .eps (PostScript) files. if __name__ == "__main__": - assert len(sys.argv) == 4 - rule = build_eps() - rule.build(*sys.argv[1:]) + assert len(sys.argv) == 4 + rule = build_eps() + rule.build(*sys.argv[1:]) # Exit fast: performance.exit(sys.argv[2]) diff --git a/default.gpr.do b/default.gpr.do index c1662b9..6df1f28 100644 --- a/default.gpr.do +++ b/default.gpr.do @@ -11,9 +11,9 @@ from rules.build_gpr import build_gpr # This .do file builds .gpr files. if __name__ == "__main__": - assert len(sys.argv) == 4 - rule = build_gpr() - rule.build(*sys.argv[1:]) + assert len(sys.argv) == 4 + rule = build_gpr() + rule.build(*sys.argv[1:]) # Exit fast: performance.exit(sys.argv[2]) diff --git a/default.o.do b/default.o.do index f26fa5e..26f58ce 100644 --- a/default.o.do +++ b/default.o.do @@ -11,9 +11,9 @@ from rules.build_object import build_object # This .do file builds .o (object) files. if __name__ == "__main__": - assert len(sys.argv) == 4 - rule = build_object() - rule.build(*sys.argv[1:]) + assert len(sys.argv) == 4 + rule = build_object() + rule.build(*sys.argv[1:]) # Exit fast: performance.exit(sys.argv[2]) diff --git a/default.pdf.do b/default.pdf.do index 27f9f15..24cbf0d 100644 --- a/default.pdf.do +++ b/default.pdf.do @@ -11,9 +11,9 @@ from rules.build_pdf import build_pdf # This .do file builds .pdf files. if __name__ == "__main__": - assert len(sys.argv) == 4 - rule = build_pdf() - rule.build(*sys.argv[1:]) + assert len(sys.argv) == 4 + rule = build_pdf() + rule.build(*sys.argv[1:]) # Exit fast: performance.exit(sys.argv[2]) diff --git a/default.png.do b/default.png.do index e0f09d6..380132f 100644 --- a/default.png.do +++ b/default.png.do @@ -11,9 +11,9 @@ from rules.build_png import build_png # This .do file builds .png files. if __name__ == "__main__": - assert len(sys.argv) == 4 - rule = build_png() - rule.build(*sys.argv[1:]) + assert len(sys.argv) == 4 + rule = build_png() + rule.build(*sys.argv[1:]) # Exit fast: performance.exit(sys.argv[2]) diff --git a/default.svg.do b/default.svg.do index 8fa921f..d54aeaa 100644 --- a/default.svg.do +++ b/default.svg.do @@ -11,9 +11,9 @@ from rules.build_svg import build_svg # This .do file builds .svg (vector graphics) files. if __name__ == "__main__": - assert len(sys.argv) == 4 - rule = build_svg() - rule.build(*sys.argv[1:]) + assert len(sys.argv) == 4 + rule = build_svg() + rule.build(*sys.argv[1:]) # Exit fast: performance.exit(sys.argv[2])