osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/40838?usp=email ) Change subject: gen_makefile: generate convenience targets ...................................................................... gen_makefile: generate convenience targets Instead of directly hardcoding the convenience targets as Makefile code, generate them from a dictionary. This allows reusing the information from the dictionary in the next patch for the --targets option. Change-Id: I64cd267cb1accda308585144b154f5f3837bf3e7 --- M gen_makefile.py 1 file changed, 45 insertions(+), 48 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve jolly: Looks good to me, but someone else must approve diff --git a/gen_makefile.py b/gen_makefile.py index c49a27a..5eb28ef 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -58,6 +58,40 @@ all_buildsystems_file = os.path.join(topdir, "all.buildsystems") parser = argparse.ArgumentParser(epilog=__doc__, formatter_class=argparse.RawTextHelpFormatter) +convenience_targets = { + # Whole networks + "cn": [ + "osmo-ggsn", + "osmo-hlr", + "osmo-iuh", + "osmo-mgw", + "osmo-sgsn", + "osmo-sip-connector", + "osmo-smlc", + ], + "cn-bsc": [ + "cn", + "osmo-bsc", + ], + "cn-bsc-nat": [ + "cn", + "mobile", + "osmo-bsc", + "osmo-bsc-nat", + "osmo-bts", + "virtphy", + ], + "usrp": [ + "cn-bsc", + "osmo-bts", + "osmo-trx", + ], + # Components in subdirs of repositories + "mobile": ["osmocom-bb_layer23"], + "trxcon": ["osmocom-bb_trxcon"], + "virtphy": ["osmocom-bb_virtphy"], +} + parser.add_argument('configure_opts_files', help='''Config file containing project name and ./configure options''', @@ -172,6 +206,15 @@ return {} return read_projects_deps(path) +def gen_convenience_targets(): + ret = "" + for short, full in convenience_targets.items(): + if ret: + ret += "\n" + ret += f".PHONY: {short}\n" + ret += f"{short}: {' '.join(full)}\n" + return ret + def gen_makefile_clone(proj, src, src_proj, update_src_copy_cmd): if proj == "osmocom-bb_layer23": return f''' @@ -550,55 +593,9 @@ default: usrp # -# Convenience targets for whole networks +# Convenience targets (whole networks, components in subdirs) # -.PHONY: cn -cn: \\ - osmo-ggsn \\ - osmo-hlr \\ - osmo-iuh \\ - osmo-mgw \\ - osmo-msc \\ - osmo-sgsn \\ - osmo-sip-connector \\ - osmo-smlc \\ - $(NULL) - -.PHONY: cn-bsc -cn-bsc: \\ - cn \\ - osmo-bsc \\ - $(NULL) - -.PHONY: cn-bsc-nat -cn-bsc-nat: \\ - cn \\ - mobile \\ - osmo-bsc \\ - osmo-bsc-nat \\ - osmo-bts \\ - virtphy \\ - $(NULL) - -.PHONY: usrp -usrp: \\ - cn-bsc \\ - osmo-bts \\ - osmo-trx \\ - $(NULL) - -# -# Convenience targets for components in subdirs of repositories -# -.PHONY: mobile -mobile: osmocom-bb_layer23 - -.PHONY: virtphy -virtphy: osmocom-bb_virtphy - -.PHONY: trxcon -trxcon: osmocom-bb_trxcon - +{gen_convenience_targets()} # # Other convenience targets # -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40838?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I64cd267cb1accda308585144b154f5f3837bf3e7 Gerrit-Change-Number: 40838 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>