diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | build-system/configure.py | 35 | ||||
| m--------- | build-system/taler-build-scripts | 0 |
3 files changed, 24 insertions, 16 deletions
@@ -61,13 +61,16 @@ locale: locale-update locale-compile # Run the jinja2 templating engine to expand templates to HTML # incorporating translations. template: locale-compile - $(python) ./make_site.py + + env BASEURL=$(opt_baseurl) ./make_site.py .PHONY: run run: all $(browser) http://0.0.0.0:8000/rendered/en & $(python) -m http.server +variant = $(opt_variant) + ifndef variant $(error variant is not set) endif diff --git a/build-system/configure.py b/build-system/configure.py index 6b13143a..0f9274e4 100644 --- a/build-system/configure.py +++ b/build-system/configure.py @@ -4,20 +4,25 @@ from talerbuildconfig import * b = BuildConfig() b.enable_prefix() -b.enable_variant() b.enable_configmk() -b.add_tool(PythonTool()) -b.add_tool(PyBabelTool()) -b.add_tool(PosixTool("cp")) -b.add_tool(PosixTool("echo")) -b.add_tool(PosixTool("env")) -b.add_tool(PosixTool("printf")) -b.add_tool(PosixTool("grep")) -b.add_tool(PosixTool("mkdir")) -b.add_tool(PosixTool("rm")) -b.add_tool(PosixTool("sh")) -b.add_tool(PosixTool("msgmerge")) -b.add_tool(PosixTool("tsc")) -b.add_tool(PosixTool("git")) -b.add_tool(BrowserTool()) +b.use(Option("variant", "Variant (used as output directory)")) + +# Base URL for the site. Per default, the URL is the protocol-relative +# root path. +b.use(Option("baseurl", "Base URL that the site will run on", default="//", required=False)) + +b.use(PythonTool()) +b.use(PyBabelTool()) +b.use(PosixTool("cp")) +b.use(PosixTool("echo")) +b.use(PosixTool("env")) +b.use(PosixTool("printf")) +b.use(PosixTool("grep")) +b.use(PosixTool("mkdir")) +b.use(PosixTool("rm")) +b.use(PosixTool("sh")) +b.use(PosixTool("msgmerge")) +b.use(PosixTool("tsc")) +b.use(PosixTool("git")) +b.use(BrowserTool()) b.run() diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts -Subproject e08ea37979dcc17ac8e0987251771d771503cb5 +Subproject 5fb2f811026bbe7152ed59b712248048853eb0f |