Use setuptools rather than distutils

[hiprofile] / scripts / hiprofile

diff --git a/scripts/hiprofile b/scripts/hiprofile
index 2ec3cb9b53b494118ab7d0f72044b41b24672ab2..f663cce8a11626750c075afe6400c4e927fbe819 100755 (executable)
--- a/scripts/hiprofile
+++ b/scripts/hiprofile
@@ -2,8 +2,6 @@
 
 import sys, os
 from optparse import OptionParser
-from django.conf import settings
-
 from hiprofile import Report, Connection, write_report
 
 resourcedir = os.path.join(os.path.dirname(__file__),
@@ -23,21 +21,21 @@ def main(args):
     parser.add_option('-o', '--output-dir', dest = 'outdir',
             help = 'create output in directory DIR', metavar = 'DIR',
             default = default_outdir)
+    parser.add_option('--opreport', dest = 'opreport', default = 'opreport',
+            help = 'use opreport binary at PATH', metavar = 'PATH')
+    parser.add_option('--opannotate', dest = 'opannotate',
+            default = 'opannotate',
+            help = 'use opannotate binary at PATH', metavar = 'PATH')
 
     (options, args) = parser.parse_args()
 
-    # set up django template engine
-    settings.configure(TEMPLATE_LOADERS =
-                ('django.template.loaders.filesystem.load_template_source',),
-            TEMPLATE_DIRS = (resourcedir,))
-
     conn = Connection(options.host)
 
-    report = Report.extract(conn)
+    report = Report.extract(conn, options)
 
     report.threshold(default_thresholds)
 
-    report.annotate(conn)
+    report.annotate(conn, options)
 
     write_report(report, resourcedir, options.outdir)