aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac3
-rw-r--r--src/Makefile.am2
-rw-r--r--src/mitm/setup.py12
-rw-r--r--[-rwxr-xr-x]src/mitm/taler-merchant-mitm.in0
-rw-r--r--[-rwxr-xr-x]src/mitm/talermerchantmitm/mitm.py (renamed from src/mitm/mitm.py)0
5 files changed, 15 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 5f4f6780..4211651e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -283,5 +283,6 @@ src/backend/Makefile
src/samples/Makefile
src/lib/Makefile
src/mitm/taler-merchant-mitm
-src/mitm/merchant-mitm.wsgi])
+src/mitm/merchant-mitm.wsgi
+src/mitm/Makefile])
AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 16521e08..ea8281e5 100644
--- 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
+SUBDIRS = include backenddb backend lib merchant-tools samples mitm
diff --git a/src/mitm/setup.py b/src/mitm/setup.py
new file mode 100644
index 00000000..90255920
--- /dev/null
+++ b/src/mitm/setup.py
@@ -0,0 +1,12 @@
+from setuptools import setup, find_packages
+setup(name='talermerchantmitm',
+ version='0.0',
+ description='Layer generating errors for testing',
+ url='git://taler.net/merchant',
+ author='Marcello Stanisci',
+ author_email='marcello.stanisci@inria.fr',
+ license='GPL',
+ packages=find_packages(),
+ install_requires=["Flask>=0.10"],
+ scripts=['taler-merchant-mitm'],
+ zip_safe=False)
diff --git a/src/mitm/taler-merchant-mitm.in b/src/mitm/taler-merchant-mitm.in
index 9f601726..9f601726 100755..100644
--- a/src/mitm/taler-merchant-mitm.in
+++ b/src/mitm/taler-merchant-mitm.in
diff --git a/src/mitm/mitm.py b/src/mitm/talermerchantmitm/mitm.py
index 2c7aaaf1..2c7aaaf1 100755..100644
--- a/src/mitm/mitm.py
+++ b/src/mitm/talermerchantmitm/mitm.py