[llvm-commits] [zorg] r99168 - in /zorg/trunk/lnt: lnt/viewer/Config.py lnt/viewer/app.py setup.py

[Daniel Dunbar]

Author: ddunbar
Date: Mon Mar 22 02:18:48 2010
New Revision: 99168

URL: http://llvm.org/viewvc/llvm-project?rev=99168&view=rev
Log:
LNT: Kill off zorgDir config variable (the last of the sys.path hacks), and finish off setup.py for real installs (install resource files).

Modified:
    zorg/trunk/lnt/lnt/viewer/Config.py
    zorg/trunk/lnt/lnt/viewer/app.py
    zorg/trunk/lnt/setup.py

Modified: zorg/trunk/lnt/lnt/viewer/Config.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/viewer/Config.py?rev=99168&r1=99167&r2=99168&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/viewer/Config.py (original)
+++ zorg/trunk/lnt/lnt/viewer/Config.py Mon Mar 22 02:18:48 2010
@@ -44,24 +44,21 @@
             ntEmailEnabled = False
             ntEmailHost = ntEmailFrom = ntEmailTo = ""
 
-        zorgDir = os.path.join(baseDir, data['zorg'])
-
         dbDir = data.get('db_dir', '.')
         dbDirPath = os.path.join(baseDir, dbDir)
 
         # FIXME: Remove this default.
         tempDir = data.get('tmp_dir', 'viewer/resources/graphs')
 
-        return Config(data.get('name', 'LNT'), zorgDir, data['zorgURL'],
+        return Config(data.get('name', 'LNT'), data['zorgURL'],
                       dbDir, os.path.join(baseDir, tempDir),
                       dict([(k,DBInfo.fromData(dbDirPath, v))
                                      for k,v in data['databases'].items()]),
                       ntEmailEnabled, ntEmailHost, ntEmailFrom, ntEmailTo)
 
-    def __init__(self, name, zorgDir, zorgURL, dbDir, tempDir, databases,
+    def __init__(self, name, zorgURL, dbDir, tempDir, databases,
                  ntEmailEnabled, ntEmailHost, ntEmailFrom, ntEmailTo):
         self.name = name
-        self.zorgDir = zorgDir
         self.zorgURL = zorgURL
         self.dbDir = dbDir
         self.tempDir = tempDir

Modified: zorg/trunk/lnt/lnt/viewer/app.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/viewer/app.py?rev=99168&r1=99167&r2=99168&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/viewer/app.py (original)
+++ zorg/trunk/lnt/lnt/viewer/app.py Mon Mar 22 02:18:48 2010
@@ -8,12 +8,6 @@
     configData = {}
     exec open(configPath) in configData
 
-    # Find the zorg installation dir.
-    zorgDir = os.path.join(os.path.dirname(configPath),
-                           configData.get('zorg', ''))
-    if zorgDir and zorgDir not in sys.path:
-        sys.path.append(zorgDir)
-
     # Optionally enable auto-restart.
     if configData.get('wsgi_restart', False):
         from lnt.viewer import wsgi_restart

Modified: zorg/trunk/lnt/setup.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/setup.py?rev=99168&r1=99167&r2=99168&view=diff
==============================================================================
--- zorg/trunk/lnt/setup.py (original)
+++ zorg/trunk/lnt/setup.py Mon Mar 22 02:18:48 2010
@@ -26,7 +26,23 @@
         ],
 
     zip_safe = False,
+
+    # Additional resource extensions we use.
+    #
+    # FIXME: Remove the .ptl entry once we move to Jinja. Note that the files
+    # most likely won't get byte compiled because of how permissions will be
+    # set, unless WSGI app has permissions to write to the install directory. I
+    # can't find a way to force setuptools to treat these as Python modules.
+    package_data = {'lnt.viewer': ['*.ptl',
+                                   'zview/*.ptl',
+                                   'js/*.js',
+                                   'resources/*.css',
+                                   'resources/*.js'],
+                    'lnt.util': ['NTAuxSubmit'],
+                    },
+
     packages = find_packages(),
+
     entry_points = {
         'console_scripts': [
             'lnt = lnt.lnttool:main',