From 4b9056364d7d3b785c1b099a3985b915231903f9 Mon Sep 17 00:00:00 2001 From: mpeterv Date: Fri, 4 Dec 2015 15:17:31 +0300 Subject: [PATCH] Show non-default values for --target and --apicheck --- hererocks.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/hererocks.py b/hererocks.py index dd13ae2..e220e07 100755 --- a/hererocks.py +++ b/hererocks.py @@ -236,9 +236,7 @@ class Lua(Program): self.version_suffix = " " + self.major_version self.set_compat() - - if self.compat != "default": - self.version_suffix += " (compat: {})".format(self.compat) + self.add_options_to_version_suffix() self.defines = [] self.redefines = [] @@ -267,6 +265,21 @@ class Lua(Program): opts.target, self.compat, str(opts.apicheck), opts.location ])) + def add_options_to_version_suffix(self): + options = [] + + if opts.target != get_default_lua_target(): + options.append(("target", opts.target)) + + if self.compat != "default": + options.append(("compat", self.compat)) + + if opts.apicheck: + options.append(("apicheck", "true")) + + if options: + self.version_suffix += " (" + (", ".join(opt + ": " + value for opt, value in options)) + ")" + def set_package_paths(self): local_paths_first = self.major_version == "5.1"