[www] branch master updated: Satisfy the bikeshed.

[gnunet]

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

ng0 pushed a commit to branch master
in repository www.

The following commit(s) were added to refs/heads/master by this push:
     new 552f3c2  Satisfy the bikeshed.
552f3c2 is described below

commit 552f3c229008fceba9e6241b080af97d283915bd
Author: ng0 <address@hidden>
AuthorDate: Wed Dec 11 10:26:20 2019 +0000

    Satisfy the bikeshed.
---
 Makefile                         | 104 ---------------------------------------
 build-system/taler-build-scripts |   2 +-
 inc                              |   2 +-
 3 files changed, 2 insertions(+), 106 deletions(-)

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 4cb7a99..0000000
--- a/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-# Makefile for NetBSD make (portable version: "bmake"),
-# GNU make will find 'GNUmakefile' first and use that file instead.
-# This file is in the public domain.
-#
-# I keep and maintain this file for personal use, it is faster than
-# the gmake approach.
-
-.include "config.mk"
-
-DESTDIR=$(prefix)
-
-_LOCALELIST= en de fr it es
-_DIRLIST= dist static
-
-.PHONY:        all run locale-compile locale install clean
-
-.OBJDIR=rendered
-
-# Work this into an mk file
-
-# All: build HTML pages in all languages and compile the
-# TypeScript logic in web-common.
-all: locale template
-.for _lang in ${_LOCALELIST}
-       ($(cp) rendered/static/robots.txt rendered/${_lang})
-       ($(cp) rendered/static/stage.robots.txt rendered/${_lang})
-.endfor
-       ($(cp) rendered/static/robots.txt rendered/dist/robots.txt)
-       # ($(cp) favicon.ico rendered/)
-       # $(sh) make_sitemap.sh
-       ($(cp) sitemap.xml rendered/sitemap.xml)
-       ($(cp) rendered/sitemap.xml rendered/en/sitemap.xml)
-       ($(cp) static/moved.html rendered/frontpage.html)
-       (cd rendered; $(ln) -fs frontpage.html frontpage)
-       ($(cp) static/moved_gsoc.html rendered/gsoc.html)
-       (cd rendered; $(ln) -fs gsoc.html gsoc)
-       ($(cp) static/moved_gns.html rendered/gns.html)
-       (cd rendered; $(ln) -fs gns.html gns)
-       ($(mkdir) -p rendered/node; $(cp) static/moved_about.html 
rendered/node/about.html)
-       (cd rendered/node ; $(ln) -fs about.html 397)
-       ($(cp) static/moved_about.html rendered/about.html)
-       (cd rendered ; $(ln) -fs about.html philosophy)
-
-# Extract translateable strings from jinja2 templates.
-locale/messages.pot: template/*.j2 common/*.j2 common/*.j2.inc
-       $(env) PYTHONPATH="." $(pybabel) -q extract -F locale/babel.map -o 
locale/messages.pot .
-
-# Update translation (.po) files with new strings.
-locale-update: locale/messages.pot
-.for _lang in ${_LOCALELIST}
-       $(msgmerge) -q -U -m --previous locale/${_lang}/LC_MESSAGES/messages.po 
locale/messages.pot
-.endfor
-       if $(grep) -nA1 '#-#-#-#-#' locale/*/LC_MESSAGES/messages.po; then \
-               $(echo) -e "\nERROR: Conflicts encountered in PO files.\n"; \
-               exit 1; \
-       fi
-
-# Compile translation files for use.
-locale-compile:
-.for _lang in ${_LOCALELIST}
-       $(pybabel) -q compile -d locale -l ${_lang} --use-fuzzy
-.endfor
-
-# Process everything related to gettext translations.
-locale: locale-update locale-compile
-
-# Run the jinja2 templating engine to expand templates to HTML
-# incorporating translations.
-template: locale-compile
-       $(python) ./make_site.py -vvvv
-
-run:
-.if defined(browser) && !empty(DESTDIR) && !empty(python)
-       $(browser) http://0.0.0.0:8000/rendered/en/ &
-       $(python) -m http.server
-.endif
-
-install:
-       $(mkdir) -p $(prefix)/share/gnunet-www
-       $(cp) -R rendered/* $(prefix)/share/gnunet-www
-
-uninstall:
-       $(rm) -rf $(prefix)/share/gnunet-www
-
-submodules/init:
-       $(git) submodule update --init --recursive
-
-submodules/update:
-       $(git) submodule update --recursive --remote
-
-docker: docker-all
-
-docker-all:
-.if defined(docker)
-       $(docker) build -t gnunet-www-builder .
-       # Importing via the shell like this is hacky,
-       # but after trying lots of other ways, this works most reliably...
-       $(python) -c 'import i18nfix'
-       $(docker) run --rm -v $$(pwd):/tmp/ --user $$(id -u):$$(id -g) 
gnunet-www-builder
-.endif
-
-CLEANFILES+=    *.pyc *~ \.*~ *.core
-
-.include <bsd.prog.mk>
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
index 1915a74..d725a0c 160000
--- a/build-system/taler-build-scripts
+++ b/build-system/taler-build-scripts
@@ -1 +1 @@
-Subproject commit 1915a74bbb4cd2ae9bc541a382dfebc37064a2fd
+Subproject commit d725a0cd1b4aa3ff54452a702b8c19db3f3c3393
diff --git a/inc b/inc
index 46295bc..bdef602 160000
--- a/inc
+++ b/inc
@@ -1 +1 @@
-Subproject commit 46295bc38988c16a9a6c8c0cf8930abd20193a01
+Subproject commit bdef602fcbd13d59aef971307b3730247a8b9c56

-- 
To stop receiving notification emails like this one, please contact
address@hidden.