Merged in changes from revisions 345:352 from 0.2 branch

git-svn-id: https://exe.svn.sourceforge.net/svnroot/exe/trunk@354 38b22f21-9aea-0310-abfc-843a9883df58

1 files changed, 38 insertions, 16 deletions

diff --git a/setup.py b/setup.py
index 0430d5a..32d823f 100755
--- a/setup.py
+++ b/setup.py
@@ -2,21 +2,43 @@
 
 # setup.py
 import glob
-from distutils.core import setup
-import py2app
-import bdist_mpkg
+import os.path
+from distutils.command.install import install
+from distutils.core            import setup
 
-setup(app=["exe/webui/server.py"],
-      name="eXe",
-      version="0.1.203",
-      packages=["exe", "exe.engine", "exe.webui", "exe.export"],
-      data_files=[(".", ["exe/exe.conf",]),
-                  (".", ["README",]),
-                  ("",  ["exe/webui/css",]),
-                  ("",  ["exe/webui/images",]),
-                  ("",  ["exe/webui/scripts",]),
-                  ("",  ["exe/webui/style",]),
-                  ],
-      
-     )
 
+g_files = { '/usr/share/exe': ["exe/exe.conf", "README",]}
+g_oldBase = "exe/webui"
+g_newBase = "/usr/share/exe"
+
+def dataFiles(dirs):
+    """Recursively get all the files in these directories"""
+    for file in dirs:
+        if not os.path.basename(file[0]).startswith("."):
+            if os.path.isfile(file):
+                path = file[len(g_oldBase)+1:]
+                dir  = g_newBase + "/" + os.path.dirname(path)
+                if dir in g_files:
+                    g_files[dir].append(file)
+                else:
+                    g_files[dir] = [file]
+
+            elif os.path.isdir(file):
+                dataFiles(glob.glob(file+"/*"))
+
+dataFiles(["exe/webui/style",
+           "exe/webui/css",
+           "exe/webui/images",
+           "exe/webui/scripts"])
+
+setup(name         = "eXe",
+      version      = "0.2",
+      description  = "eLearning XHTML editor",
+      url          = "http://exe.cfdl.auckland.ac.nz",
+      author       = "University of Auckland",
+      author_email = "exe@auckland.ac.nz",
+      license      = "GPL",
+      scripts      = ["exe/eXe",],
+      packages     = ["exe", "exe.webui", "exe.engine", "exe.export"],
+      data_files   = g_files.items()
+     )