[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] 03/03: importing the backoffice SPA
From: |
gnunet |
Subject: |
[taler-merchant] 03/03: importing the backoffice SPA |
Date: |
Fri, 28 May 2021 22:50:39 +0200 |
This is an automated email from the git hooks/post-receive script.
ms pushed a commit to branch master
in repository merchant.
commit 968fa4607bdcf332df58ddadc51b0811b7d2d706
Author: MS <ms@taler.net>
AuthorDate: Fri May 28 22:50:32 2021 +0200
importing the backoffice SPA
---
bootstrap | 11 ++++-------
contrib/Makefile.am | 9 ++++-----
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/bootstrap b/bootstrap
index 6766d092..06262259 100755
--- a/bootstrap
+++ b/bootstrap
@@ -32,12 +32,9 @@ fi
echo "$0: Running autoreconf"
autoreconf -if
-#echo "Building single-page app (from external Git repository)"
-#cd contrib/merchant-backoffice
-#./bootstrap
-#./configure
-#make build-single
-#cp packages/frontend/single/index.html ../spa.html
-#cd ../..
+echo "Importing single-page app (from external Git repository)"
+cd contrib/merchant-backoffice
+cp spa.html ..
+cd ../..
exit 0
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index ffdcfd12..4344aac7 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -14,8 +14,7 @@ dist_staticpkgdata_DATA = \
pure-min.css
-# spa.html is the single-page-app generated from the merchant-backoffice.git,
-# 'make build-single', during 'bootstrap!'
-# FIXME: temporarily disabled.
-# dist_spapkgdata_DATA = \
-# spa.html
+# spa.html is the single-page-app imported from the merchant-backoffice.git
+# prebuilt branch.
+dist_spapkgdata_DATA = \
+ spa.html
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.