add some simple create-client/start-client targets, document htem briefly

diff --git a/GNUmakefile b/GNUmakefile
index 43cd0cfd1ab33754652094eb3a7c2b3914cc0fd7..8553935feb9f5a5bb2f265b09bc513cf5f43b11a 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -66,18 +66,33 @@ clean-Crypto:
        cd src/Crypto && python ./setup.py clean --all
 
 
-.PHONY: run-queen run-client test
+# RUNNING
+#
+# these targets let you create a client node in the current directory and
+# start/stop it.
 
-run-queen:
-       cd queen-basedir && PYTHONPATH=.. twistd -noy ../queen.tac
+.PHONY: create-client start-client stop-client run-client
+.PHONY: create-introducer start-introducer stop-introducer
 
-run-client: build
-       cd client-basedir && $(PP) twistd -noy ../client.tac
+create-client: build
+       $(PP) $(PYTHON) bin/allmydata-tahoe create-client -C CLIENTDIR
+start-client: build
+       $(PP) $(PYTHON) bin/allmydata-tahoe start -C CLIENTDIR
+stop-client: build
+       $(PP) $(PYTHON) bin/allmydata-tahoe stop -C CLIENTDIR
 
-run-client2:
-       cd client-basedir2 && PYTHONPATH=.. twistd -noy ../client.tac
-run-client3:
-       cd client-basedir3 && PYTHONPATH=.. twistd -noy ../client.tac
+create-introducer: build
+       $(PP) $(PYTHON) bin/allmydata-tahoe create-introducer -C INTRODUCERDIR
+start-introducer: build
+       $(PP) $(PYTHON) bin/allmydata-tahoe start -C INTRODUCERDIR
+stop-introducer: build
+       $(PP) $(PYTHON) bin/allmydata-tahoe stop -C INTRODUCERDIR
+
+
+
+# TESTING
+
+.PHONY: test
 
 ifeq ($(TEST),)
 TEST=allmydata zfec

diff --git a/README b/README
index 313e30639f4a72b0ee8a613452d30a98f836d346..8c828697f7c384d101ca6c5a149ad46664d28942 100644 (file)
--- a/README
+++ b/README
@@ -143,3 +143,12 @@ RUNNING:
  client node to run a webserver on the desired port, through which you can
  view, upload, download, and delete files.
 
+ A client node directory can also be created without installing the code
+ first. Just use 'make create-client', and a new directory named 'CLIENTDIR'
+ will be created inside the top of the source tree. Copy the relevant .furl
+ files in, set the webport, then start the node by using 'make start-client'.
+ To stop it again, use 'make stop-client'. Similar makefile targets exist for
+ making and running an introducer node.
+
+ There is a public mesh available for testing. Look at the wiki page
+ (http://allmydata.org) for the necessary .furl data.