src are now in the funkload folder

bdelbosc · bdelbosc · commit 8ed7641a4471 · 2005-10-18T09:30:31.000Z
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@
 .PHONY: build pkg sdist egg install clean rpm doc
 
 HTML_DOCS := README.html INSTALL.html CHANGES.html
-CSS_FILE := src/data/funkload.css
+CSS_FILE := funkload/data/funkload.css
 RST2HTML := rst2html.py -t --stylesheet-path=$(CSS_FILE) --embed-stylesheet
 TARGET := cvs.in.nuxeo.com:~/public_public_html/funkload
 
diff --git a/README.txt b/README.txt
@@ -148,7 +148,7 @@ See the demo_ folder contents and a report_ example.
 For package installed with easy_install you need to run ``fl-install-demo``
 to extract the demo examples.
 
-.. _demo: http://svn.nuxeo.org/trac/pub/browser/funkload/trunk/src/demo/
+.. _demo: http://svn.nuxeo.org/trac/pub/browser/funkload/trunk/funkload/demo/
 .. _report: http://funkload.nuxeo.org/report-example.pdf
 
 Credits
diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@
 ez_setup.use_setuptools()
 from setuptools import setup, find_packages
 #from distutils.core import setup
-from src.version import __version__
+from funkload.version import __version__
 
 setup(
     name="funkload",
@@ -105,7 +105,7 @@
     license='GPL',
     keywords='testing benching load performance functional monitoring',
     packages= ['funkload'],
-    package_dir={'funkload': 'src'},
+    package_dir=find_packages(),
     scripts=['scripts/fl-monitor-ctl', 'scripts/fl-credential-ctl',
              'scripts/fl-run-bench', 'scripts/fl-run-test',
              'scripts/fl-build-report',
@@ -135,5 +135,5 @@
                                'demo/cmf/*', 'demo/xmlrpc/*',
                                'demo/*.txt',
                                'tests/*',]},
-    test_suite = "src.tests.test_Install.test_suite",
+    test_suite = "funkload.tests.test_Install.test_suite",
     )
