commit b50bb3ad2bc31fceccaa686fa91ceace278c1897
parent 61e31b91451665d32be04fbfc2483420ed2aad9d
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Thu, 11 May 2017 14:03:34 +0200
moving all the tools in one place
Diffstat:
14 files changed, 75 insertions(+), 73 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -282,7 +282,7 @@ src/backenddb/Makefile
src/backend/Makefile
src/samples/Makefile
src/lib/Makefile
-src/mitm/taler-merchant-mitm
-src/mitm/merchant-mitm.wsgi
-src/mitm/Makefile])
+src/merchant-tools/mitm/taler-merchant-mitm
+src/merchant-tools/mitm/merchant-mitm.wsgi
+src/merchant-tools/mitm/Makefile])
AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,3 +1,3 @@
# This Makefile is in the public domain
AM_CPPFLAGS = -I$(top_srcdir)/src/include
-SUBDIRS = include backenddb backend lib merchant-tools samples mitm
+SUBDIRS = include backenddb backend lib merchant-tools
diff --git a/src/merchant-tools/Makefile.am b/src/merchant-tools/Makefile.am
@@ -1,10 +1,9 @@
-
-
# This Makefile.am is in the public domain
AM_CPPFLAGS = -I$(top_srcdir)/src/include
bin_PROGRAMS = \
- taler-merchant-dbinit
+ taler-merchant-dbinit \
+ taler-merchant-generate-payments
taler_merchant_dbinit_SOURCES = \
taler-merchant-dbinit.c
@@ -15,3 +14,21 @@ taler_merchant_dbinit_LDADD = \
-lgnunetutil \
-ltalerutil \
-ltalerpq
+
+taler_merchant_generate_payments_SOURCES = \
+ taler-merchant-generate-payments.c
+
+taler_merchant_generate_payments_LDADD = \
+ $(top_srcdir)/src/backenddb/libtalermerchantdb.la \
+ $(top_srcdir)/src/lib/libtalermerchant.la \
+ $(LIBGCRYPT_LIBS) \
+ -ltalerfakebank \
+ -ltalerexchange \
+ -ltalerjson \
+ -ltalerutil \
+ -lgnunetjson \
+ -lgnunetcurl \
+ -lgnunetutil \
+ -ljansson
+
+SUBDIRS = mitm
diff --git a/src/merchant-tools/README b/src/merchant-tools/README
@@ -0,0 +1,51 @@
+
+** Taler Merchant Payments Generator **
+
+=== INTRODUCTION ===
+
+The tool contained in this directory is used to populate the
+merchant's and exchange's database with fake payments.
+It is mainly used for debugging applications that need some
+payments to be in place.
+
+It is mandatory to give it a config file that contains information
+about the setup to target. Note that the merchant and the exchange
+tun by this command will use their own config files, so just few values
+are required for it to run.
+
+
+=== COFIGURATION ===
+
+Any config file must look like the following one.
+
+[payments-generator]
+
+# where on this machine the exchange listens; note that
+# this exchange must be among the ones accepted by the
+# merchant
+exchange = http://localexchange/
+
+# where on this machine the merchant listens
+merchant = http://localshop/
+
+# bank's URI of the customer who withdraws coins.
+# Must be known by the exchange.
+bank = http://localbank/
+
+# must match an instance known by the merchant
+instance = FSF
+
+# must match the currency used by merchant and exchange
+currency = EUR
+
+
+=== INVOCATION ===
+
+taler-merchant-generate-payments -c config/file.conf [-n ITERATIONS]
+
+The -n option instructs the tools about how many iteration of all
+the (internal) commands we want to execute.
+
+** Taler Merchant Dbinit **
+
+TBD
diff --git a/src/mitm/Makefile.in b/src/merchant-tools/mitm/Makefile.in
diff --git a/src/mitm/README b/src/merchant-tools/mitm/README
diff --git a/src/mitm/merchant-mitm.wsgi.in b/src/merchant-tools/mitm/merchant-mitm.wsgi.in
diff --git a/src/mitm/setup.py b/src/merchant-tools/mitm/setup.py
diff --git a/src/mitm/taler-merchant-mitm.in b/src/merchant-tools/mitm/taler-merchant-mitm.in
diff --git a/src/mitm/talermerchantmitm/__init__.py b/src/merchant-tools/mitm/talermerchantmitm/__init__.py
diff --git a/src/mitm/talermerchantmitm/mitm.py b/src/merchant-tools/mitm/talermerchantmitm/mitm.py
diff --git a/src/samples/generate_payments.c b/src/merchant-tools/taler-merchant-generate-payments.c
diff --git a/src/samples/Makefile.am b/src/samples/Makefile.am
@@ -1,21 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-bin_PROGRAMS = \
- taler-merchant-generate-payments
-
-taler_merchant_generate_payments_SOURCES = \
- generate_payments.c
-
-taler_merchant_generate_payments_LDADD = \
- $(top_srcdir)/src/backenddb/libtalermerchantdb.la \
- $(top_srcdir)/src/lib/libtalermerchant.la \
- $(LIBGCRYPT_LIBS) \
- -ltalerfakebank \
- -ltalerexchange \
- -ltalerjson \
- -ltalerutil \
- -lgnunetjson \
- -lgnunetcurl \
- -lgnunetutil \
- -ljansson
diff --git a/src/samples/README b/src/samples/README
@@ -1,45 +0,0 @@
-
-=== INTRODUCTION ===
-
-The tool contained in this directory is used to populate the
-merchant's and exchange's database with fake payments.
-It is mainly used for debugging applications that need some
-payments to be in place.
-
-It is mandatory to give it a config file that contains information
-about the setup to target. Note that the merchant and the exchange
-tun by this command will use their own config files, so just few values
-are required for it to run.
-
-
-=== COFIGURATION ===
-
-Any config file must look like the following one.
-
-[payments-generator]
-
-# where on this machine the exchange listens; note that
-# this exchange must be among the ones accepted by the
-# merchant
-exchange = http://localexchange/
-
-# where on this machine the merchant listens
-merchant = http://localshop/
-
-# bank's URI of the customer who withdraws coins.
-# Must be known by the exchange.
-bank = http://localbank/
-
-# must match an instance known by the merchant
-instance = FSF
-
-# must match the currency used by merchant and exchange
-currency = EUR
-
-
-=== INVOCATION ===
-
-taler-merchant-generate-payments -c config/file.conf [-n ITERATIONS]
-
-The -n option instructs the tools about how many iteration of all
-the (internal) commands we want to execute.
