review module layout and get the packaging we want

diff --git a/bwlimit b/bin/bwlimit
similarity index 100%
rename from bwlimit
rename to bin/bwlimit

diff --git a/plnode-utils-lxc.spec b/plnode-utils-lxc.spec
index aed7c12..e54bed8 100644 (file)
--- a/plnode-utils-lxc.spec
+++ b/plnode-utils-lxc.spec
@@ -29,7 +29,7 @@ This python package provides utilities like bwlimit, used in various places on a
 %build
 # xxx fixme
 # this is where we chose which flavour of bwlimit gets shipped
 %build
 # xxx fixme
 # this is where we chose which flavour of bwlimit gets shipped

-cp bwlimit_lxc.py bwlimit.py
+cp plnode/bwlimit_lxc.py plnode/bwlimit.py

 python setup.py build
 
 %install
 python setup.py build
 
 %install

diff --git a/plnode-utils-vs.spec b/plnode-utils-vs.spec
index 4f1af77..6317bb0 100644 (file)
--- a/plnode-utils-vs.spec
+++ b/plnode-utils-vs.spec
@@ -29,7 +29,7 @@ This python package provides utilities like bwlimit, used in various places on a
 %build
 # xxx fixme
 # this is where we chose which flavour of bwlimit gets shipped
 %build
 # xxx fixme
 # this is where we chose which flavour of bwlimit gets shipped

-cp bwlimit_vs.py bwlimit.py
+cp plnode/bwlimit_vs.py plnode/bwlimit.py

 python setup.py build
 
 %install
 python setup.py build
 
 %install

diff --git a/bwlimit_lxc.py b/plnode/bwlimit_lxc.py
similarity index 100%
rename from bwlimit_lxc.py
rename to plnode/bwlimit_lxc.py

diff --git a/bwlimit_vs.py b/plnode/bwlimit_vs.py
similarity index 100%
rename from bwlimit_vs.py
rename to plnode/bwlimit_vs.py

diff --git a/setup.py b/setup.py
index a4eb86d..60de75e 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -5,12 +5,11 @@ from glob import glob
 import shutil
 from distutils.core import setup
 
 import shutil
 from distutils.core import setup
 

-scripts = [ "bwlimit" ] 
+scripts = [ "bin/bwlimit" ] 

 
 # xxx fixme
 # for now we only have bwlimit.py and its flavour is selected in the main specfile
 # that copies the right bwlimit_xxx.py into bwlimit.py
 setup(name='plnode',
 
 # xxx fixme
 # for now we only have bwlimit.py and its flavour is selected in the main specfile
 # that copies the right bwlimit_xxx.py into bwlimit.py
 setup(name='plnode',

-      package_dir={'plnode':'.'},
-      py_modules = [ 'bwlimit' ] ,
+      py_modules = [ 'plnode.bwlimit' ] ,

       scripts = scripts)
       scripts = scripts)