[taler-challenger] branch master updated: install resource files

[gnunet]

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

grothoff pushed a commit to branch master
in repository challenger.

The following commit(s) were added to refs/heads/master by this push:
     new bf0e4b4  install resource files
bf0e4b4 is described below

commit bf0e4b4a35a49996a40360f45508fe1cb05b8333
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Nov 14 17:12:46 2023 +0100

    install resource files
---
 bootstrap              | 11 +++++++++++
 contrib/.gitignore     |  2 ++
 contrib/Makefile.am    | 33 ---------------------------------
 contrib/Makefile.am.in | 18 ++++++++++++++++++
 contrib/wallet-core    |  2 +-
 5 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/bootstrap b/bootstrap
index c812498..6abf3b9 100755
--- a/bootstrap
+++ b/bootstrap
@@ -26,6 +26,17 @@ else
     echo "Uncrustify not detected, hook not installed. Please install 
uncrustify if you plan on doing development"
 fi
 
+# Generate Makefile.am in contrib/
+cd contrib
+rm -f Makefile.am
+find wallet-core/challenger/ -type f -printf '  %p \\\n' | sort > 
Makefile.am.ext
+# Remove extra '\' at the end of the file
+truncate -s -2 Makefile.am.ext
+cat Makefile.am.in Makefile.am.ext >> Makefile.am
+# Prevent accidental editing of the generated Makefile.am
+chmod -w Makefile.am
+cd ..
+
 
 echo "$0: Running autoreconf"
 autoreconf -if
diff --git a/contrib/.gitignore b/contrib/.gitignore
index 2a542e8..3df6a31 100644
--- a/contrib/.gitignore
+++ b/contrib/.gitignore
@@ -1 +1,3 @@
 challenger.tag
+Makefile.am
+Makefile.am.ext
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
deleted file mode 100644
index 007d514..0000000
--- a/contrib/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file is in the public domain.
-
-SUBDIRS = .
-
-bin_SCRIPTS = \
-  challenger-dbconfig
-
-tmplpkgdatadir = $(prefix)/share/challenger/templates/
-
-
-%.must: wallet-core/challenger/%.must
-       cp $< $@
-
-dist_tmplpkgdata_DATA = \
- attempts-exhausted.en.must \
- attempts-exhausted.must \
- enter-address-form.en.must \
- enter-address-form.must \
- enter-tan-form.en.must \
- enter-tan-form.must \
- internal-error.en.must \
- internal-error.must \
- invalid-pin.en.must \
- invalid-pin.must \
- invalid-request.en.must \
- invalid-request.must \
- validation-unknown.en.must \
- validation-unknown.must
-
-EXTRA_DIST = \
-  gnunet.tag \
-  uncrustify.cfg \
-  uncrustify_precommit
diff --git a/contrib/Makefile.am.in b/contrib/Makefile.am.in
new file mode 100644
index 0000000..2edbd2c
--- /dev/null
+++ b/contrib/Makefile.am.in
@@ -0,0 +1,18 @@
+# This file is in the public domain.
+
+SUBDIRS = .
+
+bin_SCRIPTS = \
+  challenger-dbconfig
+
+tmplpkgdatadir = $(prefix)/share/challenger/templates/
+
+
+%.must: wallet-core/challenger/%.must
+       cp $< $@
+
+# This is for the templates imported from the wallet-core.git
+# prebuilt branch. This MUST be the last line in the
+# Makefile.am.in, as it will be combined with the
+# actual file list by 'bootstrap'!
+dist_tmplpkgdata_DATA = \
diff --git a/contrib/wallet-core b/contrib/wallet-core
index 22c460a..b8e4aef 160000
--- a/contrib/wallet-core
+++ b/contrib/wallet-core
@@ -1 +1 @@
-Subproject commit 22c460aecf5b001a8e9122e1b55f4a96a1edc6d8
+Subproject commit b8e4aefe86202a8c30737a26eb11f0ade4c616a6

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