From 7e013b1fbdb10a27e65fc4cbc4f77d6d84413962 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 5 Mar 2023 15:41:41 -0300 Subject: wallet prebulit as git submodule --- .gitignore | 4 ++++ .gitmodules | 3 +++ Makefile | 2 +- bootstrap | 5 +++++ contrib/get_spa.sh | 2 +- contrib/wallet-core | 1 + 6 files changed, 15 insertions(+), 2 deletions(-) create mode 160000 contrib/wallet-core diff --git a/.gitignore b/.gitignore index 150fa91b..e37c79d0 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,7 @@ __pycache__ .DS_Store *.mk util/src/main/resources/version.txt +debian/usr/share/libeufin/demobank-ui/index.js +debian/usr/share/libeufin/demobank-ui/*.html +debian/usr/share/libeufin/demobank-ui/*.css +debian/usr/share/libeufin/demobank-ui/*.svg diff --git a/.gitmodules b/.gitmodules index c4ea6fcc..e951b3d7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "parsing-tests/samples"] path = parsing-tests/samples url = git://git.taler.net/libeufin-tests +[submodule "contrib/wallet-core"] + path = contrib/wallet-core + url = git://git.taler.net/wallet-core diff --git a/Makefile b/Makefile index d2615eef..f4bda77b 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ exec-arch: .PHONY: clean-spa clean-spa: - @rm -fr debian/usr/share/libeufin/demobank-ui/index.* + @rm -fr debian/usr/share/libeufin/demobank-ui/index.* debian/usr/share/libeufin/demobank-ui/*.svg .PHONY: get-spa get-spa: diff --git a/bootstrap b/bootstrap index 9ea2c217..eab822b4 100755 --- a/bootstrap +++ b/bootstrap @@ -14,3 +14,8 @@ git submodule sync git submodule update --init rm -f ./configure cp build-system/taler-build-scripts/configure ./configure + +echo "Importing single-page app (from external Git repository)" +cd contrib/wallet-core +git checkout -f origin/prebuilt + diff --git a/contrib/get_spa.sh b/contrib/get_spa.sh index 888590dc..b8aa9fbb 100755 --- a/contrib/get_spa.sh +++ b/contrib/get_spa.sh @@ -18,4 +18,4 @@ if ! wget --version &> /dev/null; then exit 1 fi -wget --content-disposition "https://git.taler.net/wallet-core.git/plain/demobank/index"{.css,.js,.html}"?h=prebuilt" -P debian/usr/share/libeufin/demobank-ui/ +cp contrib/wallet-core/demobank/* debian/usr/share/libeufin/demobank-ui/ diff --git a/contrib/wallet-core b/contrib/wallet-core new file mode 160000 index 00000000..529d588e --- /dev/null +++ b/contrib/wallet-core @@ -0,0 +1 @@ +Subproject commit 529d588e00c63b113633c70623d631d0be6c0470 -- cgit v1.2.3