osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-dev/+/39403?usp=email )
Change subject: gen_makefile: modernize gen_make
......................................................................
gen_makefile: modernize gen_make
Use an f-string instead of .format() to make it more maintainable.
Change-Id: I03350986c07226889b618869ec74a95be8712e3e
---
M gen_makefile.py
1 file changed, 44 insertions(+), 41 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/03/39403/1
diff --git a/gen_makefile.py b/gen_makefile.py
index 4a4748c..e1baa5b 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -424,62 +424,65 @@
sudo_ldconfig = '' if ldconfig_without_sudo else 'sudo '
sudo_make_install = 'sudo ' if sudo_make_install else ''
- return r'''
+ return f'''
### {proj} ###
-{proj}_configure_files := $(shell find -L {src_proj} \
- -name "Makefile.am" \
- -or -name "*.in" \
- -and -not -name "Makefile.in" \
+{proj}_configure_files := $(shell find -L {src_proj} \\
+ -name "Makefile.am" \\
+ -or -name "*.in" \\
+ -and -not -name "Makefile.in" \\
-and -not -name "config.h.in" 2>/dev/null)
-{proj}_files := $(shell find -L {src_proj} \
- \( \
- -name "*.[hc]" \
- -or -name "*.py" \
- -or -name "*.cpp" \
- -or -name "*.tpl" \
- -or -name "*.map" \
- -or -name "*.erl" \
- \) \
+{proj}_files := $(shell find -L {src_proj} \\
+ \\( \\
+ -name "*.[hc]" \\
+ -or -name "*.py" \\
+ -or -name "*.cpp" \\
+ -or -name "*.tpl" \\
+ -or -name "*.map" \\
+ -or -name "*.erl" \\
+ \\) \\
-and -not -name "config.h" 2>/dev/null)
-{clone_rule}
+{gen_makefile_clone(proj, src, src_proj, url, push_url)}
-{autoconf_rule}
+{gen_makefile_autoconf(proj, src_proj, distclean_cond)}
-{configure_rule}
+{gen_makefile_configure(proj,
+ deps_installed,
+ distclean_cond,
+ build_proj,
+ cflags,
+ docker_cmd,
+ build_to_src,
+ configure_opts_str)}
-{build_rule}
+{gen_makefile_build(proj,
+ distclean_cond,
+ build_proj,
+ docker_cmd,
+ jobs,
+ check,
+ src_proj)}
-{install_rule}
+{gen_makefile_install(proj,
+ docker_cmd,
+ sudo_make_install,
+ build_proj,
+ no_ldconfig,
+ sudo_ldconfig)}
-{reinstall_rule}
+{gen_makefile_reinstall(proj,
+ deps_reinstall,
+ sudo_make_install,
+ build_proj)}
-{clean_rule}
+{gen_makefile_clean(proj, build_proj)}
-{distclean_rule}
+{gen_makefile_distclean(proj, src_proj)}
.PHONY: {proj}
{proj}: .make.{proj}.install
-
-'''.format(
- proj=proj,
- src_proj=src_proj,
- clone_rule=gen_makefile_clone(proj, src, src_proj, url, push_url),
- autoconf_rule=gen_makefile_autoconf(proj, src_proj, distclean_cond),
- configure_rule=gen_makefile_configure(proj, deps_installed, distclean_cond,
- build_proj, cflags, docker_cmd,
- build_to_src, configure_opts_str),
- build_rule=gen_makefile_build(proj, distclean_cond, build_proj, docker_cmd,
- jobs, check, src_proj),
- install_rule=gen_makefile_install(proj, docker_cmd, sudo_make_install,
- build_proj, no_ldconfig, sudo_ldconfig),
- reinstall_rule=gen_makefile_reinstall(proj, deps_reinstall,
- sudo_make_install, build_proj),
- clean_rule=gen_makefile_clean(proj, build_proj),
- distclean_rule=gen_makefile_distclean(proj, src_proj),
- )
-
+'''
projects_deps = read_projects_deps(all_deps_file)
projects_urls = read_projects_dict(all_urls_file)
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/39403?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I03350986c07226889b618869ec74a95be8712e3e
Gerrit-Change-Number: 39403
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
