refactor dir structure for new setupall script

README.md

@@ -39,13 +39,13 @@ Next, you can install in 3 different modes:
 
 1. For the "backend", a daemon, install:
 
-    `python setup.py --backend install`
+    `python setupall.py --daemon`
 
  Then, you can run the daemon with `cd scripts; python joinmarketd.py <port number>`
  
 2. For the client code, using joinmarket's own bitcoin library on the command line:
  
-    `python setup.py --client-bitcoin install`
+    `python setupall.py --client-bitcoin`
 
 If you have installed this "full" version of the client, you can use it with the
 command line scripts as explained in the [scripts README](https://github.com/AdamISZ/joinmarket-clientserver/tree/master/scripts).
@@ -53,7 +53,7 @@ command line scripts as explained in the [scripts README](https://github.com/Ada
 3. For the client code, using another bitcoin backend library (currently only Electrum
 supported, see https://github.com/AdamISZ/electrum-joinmarket-plugin for details):
 
-    `python setup.py --client-only install`
+    `python setupall.py --client-only`
 
  You can then access the library via `import jmclient`. In particular the
  jmclient.Taker class must be instantiated.

jmbase/setup.py

@@ -0,0 +1,13 @@
+from setuptools import setup
+
+
+setup(name='joinmarketbase',
+      version='0.1',
+      description='Joinmarket client library for Bitcoin coinjoins',
+      url='http://github.com/AdamISZ/joinmarket-clientserver/jmbase',
+      author='Adam Gibson',
+      author_email='ekaggata@gmail.com',
+      license='GPL',
+      packages=['jmbase'],
+      install_requires=['twisted',],
+      zip_safe=False)

jmbitcoin/setup.py

@@ -0,0 +1,13 @@
+from setuptools import setup
+
+
+setup(name='joinmarketbitcoin',
+      version='0.1',
+      description='Joinmarket client library for Bitcoin coinjoins',
+      url='http://github.com/AdamISZ/joinmarket-clientserver/jmbitcoin',
+      author='Adam Gibson',
+      author_email='ekaggata@gmail.com',
+      license='GPL',
+      packages=['jmbitcoin'],
+      install_requires=['secp256k1',],
+      zip_safe=False)

jmclient/setup.py

@@ -0,0 +1,13 @@
+from setuptools import setup
+
+
+setup(name='joinmarketclient',
+      version='0.1',
+      description='Joinmarket client library for Bitcoin coinjoins',
+      url='http://github.com/AdamISZ/joinmarket-clientserver/jmclient',
+      author='Adam Gibson',
+      author_email='ekaggata@gmail.com',
+      license='GPL',
+      packages=['jmclient'],
+      install_requires=['joinmarketbase'],
+      zip_safe=False)

jmdaemon/setup.py

@@ -0,0 +1,13 @@
+from setuptools import setup
+
+
+setup(name='joinmarketdaemon',
+      version='0.1',
+      description='Joinmarket client library for Bitcoin coinjoins',
+      url='http://github.com/AdamISZ/joinmarket-clientserver/jmdaemon',
+      author='Adam Gibson',
+      author_email='ekaggata@gmail.com',
+      license='GPL',
+      packages=['jmdaemon'],
+      install_requires=['libnacl', 'joinmarketbase'],
+      zip_safe=False)

setup.py

@@ -1,40 +0,0 @@
-from setuptools import setup
-import sys
-if '--client-only' in sys.argv:
-    sys.argv.remove('--client-only')
-    setup(name='joinmarketclient',
-          version='0.1',
-          description='Joinmarket client library for Bitcoin coinjoins',
-          url='http://github.com/Joinmarket-Org/joinmarket-client',
-          author='Adam Gibson',
-          author_email='ekaggata@gmail.com',
-          license='GPL',
-          packages=['jmbase', 'jmclient'],
-          install_requires=['twisted',],
-          zip_safe=False)
-elif '--client-bitcoin' in sys.argv:
-    sys.argv.remove('--client-bitcoin')
-    setup(name='joinmarketclient',
-              version='0.1',
-              description='Joinmarket client library for Bitcoin coinjoins',
-              url='http://github.com/Joinmarket-Org/joinmarket-client',
-              author='Adam Gibson',
-              author_email='ekaggata@gmail.com',
-              license='GPL',
-              packages=['jmbase', 'jmbitcoin', 'jmclient'],
-              install_requires=['twisted', 'secp256k1'],
-              zip_safe=False)
-
-elif '--backend' in sys.argv:
-    sys.argv.remove('--backend')
-    setup(name='joinmarketdaemon',
-          version='0.1',
-          description='Joinmarket daemon for Bitcoin coinjoins',
-          author='Adam Gibson',
-          author_email='ekaggata@gmail.com',
-          license='GPL',
-          packages=['jmbase','jmdaemon'],
-          install_requires=['libnacl', 'twisted'],
-          zip_safe=False)
-else:
-    raise Exception("Invalid arguments")

setupall.py

@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+from __future__ import print_function
+import sys, os, subprocess
+
+"""A script to install in one of 3 modes:
+(a) daemon - installs jmbase, jmdaemon
+(b) client-only - installs jmbase, jmclient
+(c) client-bitcoin - installs jmbase, jmclient, jmbitcoin
+
+Note that b and c are distinct mainly due to the fact that
+the latter requires the secp256k1 (libsecp256k1 via the secp256k1-py binding),
+which is something that would be an annoyance if you don't need it (wallets).
+While only (a) has a similarly annoying dependency on libnacl as the binding
+to libsodium.
+All modes require and install twisted.
+"""
+
+def help():
+    print("Usage: python setupall.py <mode>\n"
+          "Mode is one of:\n"
+          "`--daemon` - for joinmarketd\n"
+          "`--client-only` - for client not using joinmarket's own bitcoin code\n"
+          "`--client-bitcoin` - using joinmarket bitcoin code, installs secp256k1.")
+    sys.exit(0)
+
+if len(sys.argv) != 2:
+    help()
+
+curdir = os.getcwd()
+
+mode = sys.argv[1]
+
+packages = {"--daemon": ["jmbase", "jmdaemon"],
+            "--client-only": ["jmbase", "jmclient"],
+            "--client-bitcoin": ["jmbase", "jmbitcoin", "jmclient"]}
+if mode not in packages:
+    help()
+
+for x in packages[mode]:
+    dirtorun = os.path.join(curdir, x)
+    p = subprocess.Popen(['python', 'setup.py', 'install'], cwd=dirtorun)
+    p.wait()