[taler-www] branch stable updated (39143a9 -> 56a2b32)

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a change to branch stable
in repository www.

    from 39143a9  fix img
     new 494d7aa  web-common is unused
     new 8231924  remove unused wallet help directory
     new 56a2b32  pass base URL to site generator

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmodules                      |  8 --------
 Makefile                         | 10 ++++------
 README                           |  3 ---
 build-system/configure.py        | 35 ++++++++++++++++++++---------------
 build-system/taler-build-scripts |  2 +-
 help                             |  1 -
 web-common                       |  1 -
 7 files changed, 25 insertions(+), 35 deletions(-)
 delete mode 160000 help
 delete mode 160000 web-common

diff --git a/.gitmodules b/.gitmodules
index ce4a8e6..13cda25 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,11 +1,3 @@
-[submodule "web-common"]
-       path = web-common
-       url = git://taler.net/web-common
-       branch = master
-[submodule "help"]
-       path = help
-       url = git://taler.net/help
-       branch = master
 [submodule "build-system/taler-build-scripts"]
        path = build-system/taler-build-scripts
        url = git://git.taler.net/build-common
diff --git a/Makefile b/Makefile
index 36bb753..034d0db 100644
--- a/Makefile
+++ b/Makefile
@@ -6,10 +6,8 @@ include build-system/config.mk
 LANGUAGES="en ar zh_Hant fr de hi it ja ko pt pt_BR ru es sv tr"
 
 # All: build HTML pages in all languages and compile the
-# TypeScript logic in web-common.
 .PHONY: all
 all: locale template
-       (cd web-common && $(tsc))
        ($(cp) rendered/static/javascript.html rendered/javascript.html)
        ($(cp) rendered/static/robots.txt rendered/robots.txt)
        ($(cp) rendered/static/robots.txt rendered/dist/robots.txt)
@@ -26,9 +24,6 @@ all: locale template
        (for lang in `echo $(LANGUAGES)` ; \
                do $(cp) -R images rendered/$$lang ; \
        done)
-       (for lang in `echo $(LANGUAGES)` ; do \
-               $(cp) -R web-common rendered/$$lang ; \
-       done)
        (cd rendered; \
                for lang in `echo $(LANGUAGES)`; do \
                $(cp) $$lang/rss.xml $$lang/news/rss.xml; \
@@ -66,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/README b/README
index cf99de6..8483d24 100644
--- a/README
+++ b/README
@@ -39,6 +39,3 @@ inc/
   This directory contains various Python scripts that are included during
   the pre-processing with Jinja2.
 
-
-help/
-  ??
diff --git a/build-system/configure.py b/build-system/configure.py
index 6b13143..0f9274e 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
index e08ea37..5fb2f81 160000
--- a/build-system/taler-build-scripts
+++ b/build-system/taler-build-scripts
@@ -1 +1 @@
-Subproject commit e08ea37979dcc17ac8e0987251771d771503cb56
+Subproject commit 5fb2f811026bbe7152ed59b712248048853eb0f6
diff --git a/help b/help
deleted file mode 160000
index 3c75433..0000000
--- a/help
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3c75433969600126a3ba9070f40b45687535226c
diff --git a/web-common b/web-common
deleted file mode 160000
index 2457613..0000000
--- a/web-common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2457613ecc8b8971bd47119b1a02a2f290bb4830

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.