[taler-exchange] branch master updated: fix #6431

[gnunet]

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

grothoff pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new d72816cf fix #6431
d72816cf is described below

commit d72816cfde668130a6f3c25d8be35232a4e92859
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Jul 24 12:43:33 2020 +0200

    fix #6431
---
 Makefile.am                         |  7 ++++++-
 contrib/gana                        |  2 +-
 contrib/{gana.sh => gana-update.sh} |  8 +-------
 contrib/gana.sh                     | 14 +-------------
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3a422a9e..d2e8d8e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,8 +15,13 @@ else
 endif
 endif
 
+BUILT_SOURCES = src/include/taler_error_codes.h
+
+src/include/taler_error_codes.h: 
contrib/gana/gnu-taler-error-codes/registry.rec
+       contrib/gana-update.sh
+
 @DX_RULES@
 
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST =  \
-  AUTHORS 
+  AUTHORS
diff --git a/contrib/gana b/contrib/gana
index b740d002..82ff6a36 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit b740d0021e0ed6c0a7db00eac0e39d33cb263e5d
+Subproject commit 82ff6a36db88799cf6f658bd8855cefa5306c06d
diff --git a/contrib/gana.sh b/contrib/gana-update.sh
similarity index 83%
copy from contrib/gana.sh
copy to contrib/gana-update.sh
index e6fe32e0..a5da6f1b 100755
--- a/contrib/gana.sh
+++ b/contrib/gana-update.sh
@@ -1,14 +1,8 @@
 #!/bin/sh
-# Helper script to update to latest GANA
+# Helper script to recompute error codes based on submodule
 # Run from exchange/ main directory.
 set -eu
 
-git submodule update --init
-
-cd contrib/gana
-git pull origin master
-cd ../..
-
 # Generate taler-error-codes.h in gana and copy it to
 # src/include/taler_error_codes.h
 cd contrib/gana/gnu-taler-error-codes
diff --git a/contrib/gana.sh b/contrib/gana.sh
index e6fe32e0..1055d778 100755
--- a/contrib/gana.sh
+++ b/contrib/gana.sh
@@ -9,16 +9,4 @@ cd contrib/gana
 git pull origin master
 cd ../..
 
-# Generate taler-error-codes.h in gana and copy it to
-# src/include/taler_error_codes.h
-cd contrib/gana/gnu-taler-error-codes
-make
-cd ../../..
-if ! diff contrib/gana/gnu-taler-error-codes/taler_error_codes.h 
src/include/taler_error_codes.h > /dev/null
-then
-  echo "Deploying latest new GANA database..."
-  cp contrib/gana/gnu-taler-error-codes/taler_error_codes.h 
src/include/taler_error_codes.h
-  cp contrib/gana/gnu-taler-error-codes/taler_error_codes.c 
src/util/taler_error_codes.c
-else
-  echo "GANA database already up-to-date"
-fi
+./contrib/gana-update.sh

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