From c8a370d9111cee69b6d9b6edc177dcc58eec976a Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 22 Jul 2020 21:27:16 +0200
Subject: make GANA update more compatible with incremental compilation (fixes
 #6431)

---
 contrib/gana    |  2 +-
 contrib/gana.sh | 25 ++++++++++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

(limited to 'contrib')

diff --git a/contrib/gana b/contrib/gana
index 22192612a..0a9293b4c 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 22192612aab2bf0a5e1e5d452b31fb47594698ee
+Subproject commit 0a9293b4cf1df97c395dc96d7a8ba96cc1fb4664
diff --git a/contrib/gana.sh b/contrib/gana.sh
index d430dec33..e6fe32e0a 100755
--- a/contrib/gana.sh
+++ b/contrib/gana.sh
@@ -1,13 +1,24 @@
 #!/bin/sh
 # Helper script to update to latest GANA
-# Run from exchange/ main directory; make sure you have
-# no uncommitted changes at the time of running the script.
+# Run from exchange/ main directory.
 set -eu
+
+git submodule update --init
+
 cd contrib/gana
 git pull origin master
 cd ../..
-git commit -a -S -m "synchronize with latest GANA"
-./bootstrap
-cd src/include
-make install
-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
-- 
cgit v1.2.3