diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-05-16 19:03:01 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2021-05-16 19:03:01 +0200 |
commit | 38c168b11eeeab93562ffa74b3e2aff4b596c77a (patch) | |
tree | 83e997d0e7af3b46d4820dbabe507e97f04f4a90 /talerbuildconfig.py | |
parent | 050fa1ce60279638d7a68517f4cc64a70de185e3 (diff) | |
parent | 5fb2f811026bbe7152ed59b712248048853eb0f6 (diff) | |
download | build-common-38c168b11eeeab93562ffa74b3e2aff4b596c77a.tar.gz build-common-38c168b11eeeab93562ffa74b3e2aff4b596c77a.tar.bz2 build-common-38c168b11eeeab93562ffa74b3e2aff4b596c77a.zip |
Merge branch 'master' of git+ssh://git.taler.net/build-common
Diffstat (limited to 'talerbuildconfig.py')
-rw-r--r-- | talerbuildconfig.py | 69 |
1 files changed, 53 insertions, 16 deletions
diff --git a/talerbuildconfig.py b/talerbuildconfig.py index 878beb3..266e8db 100644 --- a/talerbuildconfig.py +++ b/talerbuildconfig.py @@ -59,12 +59,15 @@ serialversion = 2 # TODO: We need a smallest version argument. class Tool(ABC): - def args(self): + def args(self, parser): ... def check(self, buildconfig): ... +class Plugin(ABC): + def args(self, parser): + ... class BuildConfig: def __init__(self): @@ -72,16 +75,25 @@ class BuildConfig: self.make_variables = [] self.tools = [] self.tool_results = {} + self.plugins = [] self.args = None self.prefix_enabled = False - self.variant_enabled = False self.configmk_enabled = False def add_tool(self, tool): + """Deprecated. Prefer the 'use' method.""" if isinstance(tool, Tool): self.tools.append(tool) else: - raise Exception("Not a tool instance: " + repr(tool)) + raise Exception("Not a 'Tool' instance: " + repr(tool)) + + def use(self, plugin): + if isinstance(plugin, Plugin): + self.plugins.append(plugin) + elif isinstance(plugin, Tool): + self.tools.append(plugin) + else: + raise Exception("Not a 'Plugin' or 'Tool' instance: " + repr(plugin)) def _set_tool(self, name, value, version=None): self.tool_results[name] = (value, version) @@ -90,10 +102,6 @@ class BuildConfig: """If enabled, process the --prefix argument.""" self.prefix_enabled = True - def enable_variant(self): - """If enable, process the --variant argument.""" - self.variant_enabled = True - def _warn(self, msg): print("Warning", msg) @@ -113,17 +121,17 @@ class BuildConfig: default="/usr/local", help="Directory prefix for installation", ) - if self.variant_enabled: - parser.add_argument( - "--variant", - type=str, - default="", - help="Directory for installation", - ) for tool in self.tools: tool.args(parser) + + for plugin in self.plugins: + plugin.args(parser) + args = self.args = parser.parse_args() + for plugin in self.plugins: + res = plugin.run(self) + for tool in self.tools: res = tool.check(self) if not res: @@ -154,17 +162,46 @@ class BuildConfig: f.write("# this makefile fragment is autogenerated by configure.py\n") if self.prefix_enabled: f.write(f"prefix = {args.prefix}\n") - if self.variant_enabled: - f.write(f"variant = {args.variant}\n") for tool in self.tools: path, version = self.tool_results[tool.name] f.write(f"{tool.name} = {path}\n") + for plugin in self.plugins: + d = plugin.get_configmk(self) + for k, v in d.items(): + f.write(f"{k} = {v}\n") def existence(name): return find_executable(name) is not None +class Option(Plugin): + + def __init__(self, optname, help, required=True, default=None): + self.optname = optname + self.help = help + self.default = default + self.required = required + self._arg = None + + def args(self, parser): + parser.add_argument("--" + self.optname, action="store") + + def run(self, buildconfig): + arg = getattr(buildconfig.args, self.optname) + if arg is None: + if self.required: + print(f"required option '--{self.optname}' missing") + sys.exit(1) + else: + arg = self.default + self._arg = arg + + def get_configmk(self, buildconfig): + key = "opt_" + self.optname + return {"opt_" + self.optname: self._arg} + + class YarnTool(Tool): name = "yarn" description = "The yarn package manager for node" |