move clientbin one step upwards
Thierry Parmentelat [Thu, 7 Jun 2012 09:21:36 +0000 (11:21 +0200)]
to avoid suggesting it should show up in site-packages

19 files changed:
Makefile
clientbin/Makefile [moved from sfa/clientbin/Makefile with 100% similarity]
clientbin/getNodes.py [moved from sfa/clientbin/getNodes.py with 100% similarity]
clientbin/getRecord.py [moved from sfa/clientbin/getRecord.py with 100% similarity]
clientbin/setRecord.py [moved from sfa/clientbin/setRecord.py with 100% similarity]
clientbin/sfaadmin.py [moved from sfa/clientbin/sfaadmin.py with 100% similarity]
clientbin/sfadump.py [moved from sfa/clientbin/sfadump.py with 100% similarity]
clientbin/sfascan.py [moved from sfa/clientbin/sfascan.py with 100% similarity]
clientbin/sfi.py [moved from sfa/clientbin/sfi.py with 100% similarity]
clientbin/sfiAddAttribute.py [moved from sfa/clientbin/sfiAddAttribute.py with 100% similarity]
clientbin/sfiAddLinks.py [moved from sfa/clientbin/sfiAddLinks.py with 100% similarity]
clientbin/sfiAddSliver.py [moved from sfa/clientbin/sfiAddSliver.py with 100% similarity]
clientbin/sfiDeleteAttribute.py [moved from sfa/clientbin/sfiDeleteAttribute.py with 100% similarity]
clientbin/sfiDeleteSliver.py [moved from sfa/clientbin/sfiDeleteSliver.py with 100% similarity]
clientbin/sfiListLinks.py [moved from sfa/clientbin/sfiListLinks.py with 100% similarity]
clientbin/sfiListNodes.py [moved from sfa/clientbin/sfiListNodes.py with 100% similarity]
clientbin/sfiListSlivers.py [moved from sfa/clientbin/sfiListSlivers.py with 100% similarity]
setup.py
sfa/client/sfi.py

index 8446d4a..6989044 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -144,11 +144,11 @@ RSYNC_EXCLUDES            := --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $
 RSYNC_COND_DRY_RUN     := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC                  := rsync -a -v $(RSYNC_COND_DRY_RUN) --no-owner $(RSYNC_EXCLUDES)
 
-CLIENTS = $(shell ls sfa/clientbin/*.py)
+CLIENTS = $(shell ls clientbin/*.py)
 
 BINS = ./config/sfa-config-tty ./config/gen-sfa-cm-config.py \
        ./sfa/server/sfa-start.py \
-       ./sfa/clientbin/sfaadmin.py \
+       ./clientbin/sfaadmin.py \
        $(CLIENTS)
 
 synclib: synccheck
similarity index 100%
rename from sfa/clientbin/Makefile
rename to clientbin/Makefile
similarity index 100%
rename from sfa/clientbin/sfi.py
rename to clientbin/sfi.py
index 2affbc7..a0c222a 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ from glob import glob
 import shutil
 from distutils.core import setup
 
-scripts = glob("sfa/clientbin/*.py") + \
+scripts = glob("clientbin/*.py") + \
     [ 
     'config/sfa-config-tty',
     'config/gen-sfa-cm-config.py',
index 72f15b3..c8082dc 100644 (file)
@@ -1,7 +1,6 @@
 #
 # sfi.py - basic SFA command-line client
-# the actual binary in sfa/clientbin essentially runs main()
-# this module is used in sfascan
+# this module is also used in sfascan
 #
 
 import sys