Change in osmo-dev[master]: gen_makefile.py: regen: put args in own lines

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

osmith gerrit-no-reply at lists.osmocom.org
Mon Feb 1 13:45:27 UTC 2021


osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/22596 )


Change subject: gen_makefile.py: regen: put args in own lines
......................................................................

gen_makefile.py: regen: put args in own lines

Make it easier to adjust opts before running 'make regen'.

Change-Id: I3c537ca9cd876e62547efca1ea40f31e90d8761e
---
M gen_makefile.py
1 file changed, 14 insertions(+), 7 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/96/22596/1

diff --git a/gen_makefile.py b/gen_makefile.py
index f76ebb0..ad42978 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -276,22 +276,29 @@
 # regenerate this Makefile, in case the deps or opts changed
 .PHONY: regen
 regen:
-	{script} {projects_and_deps} {configure_opts} -m {make_dir} -o {makefile} -s {src_dir} -b {build_dir} -u "{url}"{push_url}{sudo_make_install}{no_ldconfig}{ldconfig_without_sudo}{make_check}
+	{script} \
+		{projects_and_deps} \
+		{configure_opts} \
+		-m {make_dir} \
+		-o {makefile} \
+		-s {src_dir} \
+		-b {build_dir} \
+		-u "{url}"{push_url}{sudo_make_install}{no_ldconfig}{ldconfig_without_sudo}{make_check}
 
 '''.format(
     script=os.path.relpath(sys.argv[0], make_dir),
     projects_and_deps=os.path.relpath(args.projects_and_deps_file, make_dir),
-    configure_opts=' '.join([os.path.relpath(f, make_dir) for f in configure_opts_files]),
+    configure_opts=' \\\n\t\t'.join([os.path.relpath(f, make_dir) for f in configure_opts_files]),
     make_dir='.',
     makefile=args.output,
     src_dir=os.path.relpath(args.src_dir, make_dir),
     build_dir=os.path.relpath(build_dir, make_dir),
     url=args.url,
-    push_url=(" -p '%s'"%args.push_url) if args.push_url else '',
-    sudo_make_install=' -I' if args.sudo_make_install else '',
-    no_ldconfig=' -L' if args.no_ldconfig else '',
-    ldconfig_without_sudo=' --ldconfig-without-sudo' if args.ldconfig_without_sudo else '',
-    make_check='' if args.make_check else " --no-make-check",
+    push_url=(" \\\n\t\t-p '%s'"%args.push_url) if args.push_url else '',
+    sudo_make_install=' \\\n\t\t-I' if args.sudo_make_install else '',
+    no_ldconfig=' \\\n\t\t-L' if args.no_ldconfig else '',
+    ldconfig_without_sudo=' \\\n\t\t--ldconfig-without-sudo' if args.ldconfig_without_sudo else '',
+    make_check='' if args.make_check else " \\\n\t\t--no-make-check",
     ))
 
   # convenience target: clone all repositories first

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/22596
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I3c537ca9cd876e62547efca1ea40f31e90d8761e
Gerrit-Change-Number: 22596
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210201/42a4e11b/attachment.htm>


More information about the gerrit-log mailing list