[Pywps-commits] r544 - in trunk: . doc

[scm-commit@wald.intevation.org]

Author: jachym
Date: 2008-08-26 14:19:25 +0200 (Tue, 26 Aug 2008)
New Revision: 544

Added:
   trunk/doc/examples/
Modified:
   trunk/MANIFEST.in
   trunk/setup.py
Log:
updated setup.py

Modified: trunk/MANIFEST.in
===================================================================
--- trunk/MANIFEST.in	2008-07-25 06:34:24 UTC (rev 543)
+++ trunk/MANIFEST.in	2008-08-26 12:19:25 UTC (rev 544)
@@ -1,8 +1,11 @@
 include setup.py
 
-graft pywps/Wps
+graft pywps/WPS
 graft pywps/processes
 graft pywps/etc
+graft pywps/Parser
+graft pywps/Process
+graft pywps/Templates
 graft doc
 
 global-exclude *.pyc
@@ -13,18 +16,11 @@
 global-exclude *.dvi
 global-exclude *.log
 global-exclude *.aux
+global-exclude *.tmplc
 
-exclude pywps/processes/pf_*
-exclude pywps/processes/*.py
-exclude pywps/etc/*.py
-exclude pywps/doc/*.out
+exclude doc/*.out
 
-
-include pywps/etc/__init__.py
-
-include pywps/Wps/*.py
-
+global-include *.cfg
 global-include README
 global-include AUTHORS
 global-include INSTALL
-global-include *.py-dist

Modified: trunk/setup.py
===================================================================
--- trunk/setup.py	2008-07-25 06:34:24 UTC (rev 543)
+++ trunk/setup.py	2008-08-26 12:19:25 UTC (rev 544)
@@ -46,14 +46,30 @@
         classifiers= classifiers,
         long_description = "\n".join(doclines[1:]),
 
-        packages = ['pywps','pywps.WPS','pywps.etc','pywps.Parser','pywps.processes','pywps.Templates'],
-        package_dir={'pywps':"pywps",
-                     'pywps.WPS':'pywps/WPS',
-                     'pywps.etc':'pywps/etc',
-		     'pywps.Parser':'pywps/Parser',
-                     'pywps.processes':'pywps/processes',
-                     'pywps.Templates':'pywps/Templates'
-                     },
-        scripts=['wps.py'],
+        packages = [
+            'pywps',
+            'pywps.WPS',
+            'pywps.etc',
+            'pywps.Parser',
+            'pywps.Process',
+            'pywps.Templates',
+            'pywps.Templates.inc',
+        ],
+        package_dir={
+                    'pywps':"pywps",
+                    'pywps.WPS':'pywps/WPS',
+                    'pywps.Parser':'pywps/Parser',
+                    'pywps.Process':'pywps/Process',
+                    'pywps.Templates':'pywps/Templates',
+                    'pywps.Templates.inc':'pywps/Templates/inc',
+                },
+        package_data={
+                    'pywps': ['Templates/*.tmpl','processes/*.py','default.cfg'],
+                    'pywps.Templates': ['inc/*.tmpl']
+                },
+        data_files=[
+                    ('/etc/', ['pywps/etc/pywps.cfg'])
+                ],
+        scripts=['wps.py']
 )