Fixed ldtp binary name as suggested by Ara Pulido

4 files changed, 46 insertions, 6 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 10ee915..fd8cecb 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
 include examples/*.py
-include ldtpd.sh
+include scripts/ldtp
 include AUTHORS
 include COPYING
diff --git a/ldtpd.sh b/ldtpd.sh
deleted file mode 100755
index dd9f29f..0000000
--- a/ldtpd.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-python -c "import ldtpd; ldtpd.main()"
diff --git a/scripts/ldtp b/scripts/ldtp
new file mode 100755
index 0000000..e0b0b40
--- /dev/null
+++ b/scripts/ldtp
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+
+import sys
+import ldtpd
+from optparse import OptionParser
+
+def parse_cmd_line_option():
+   usage = "usage: %prog [options]"
+   parser = OptionParser(usage)
+   parser.add_option("-V", "--version", dest = "version",
+                     action = "store_true", help = "LDTP engine version",
+                     default = False)
+   parser.add_option("-v", "--verbose", dest = "verbose",
+                     action = "store_true", help = "Verbose mode (TODO)",
+                     default = False)
+
+   (options, args) = parser.parse_args()
+   if options.version:
+      # Print version info and exit
+      print 'ldtp-2.0.2'
+      sys.exit(0)
+
+parse_cmd_line_option()
+ldtpd.main()
diff --git a/setup.py b/setup.py
index 3ca388f..3653400 100644
--- a/setup.py
+++ b/setup.py
@@ -3,11 +3,30 @@
 from distutils.core import setup
 
 setup(name='ldtp',
-      version='2.0.1',
+      version='2.0.2',
       description='Linux Desktop Testing Project Version 2',
       maintainer='Nagappan Alagappan',
       maintainer_email='nagappan@gmail.com',
       url='http://ldtp.freesktop.org',
+      license="GNU Lesser General Public License (LGPL)",
       packages=['ldtp', 'ldtpd', 'ooldtp', 'ldtputils'],
-      scripts=['ldtpd.sh']
+      long_description='Linux Desktop Testing Project is aimed at producing ' \
+          'high quality test automation framework and cutting-edge tools that ' \
+          'can be used to test GNU/Linux Desktop and improve it. It uses the ' \
+          'Accessibility libraries to poke through the applications user ' \
+          'interface. LDTP is a Linux / Unix GUI application testing tool. ' \
+          'It runs on Linux / Solaris / FreeBSD / Embedded environment (Palm Source).',
+      scripts=['scripts/ldtp'],
+      classifiers=[
+        'Development Status :: 5 - Production',
+        'Environment :: X11 Applications :: GTK',
+        'Intended Audience :: End Users/Desktop',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: GNU Lesser General Public License (LGPL)',
+        'Operating System :: POSIX :: Linux',
+        'Operating System :: POSIX :: Solaris',
+        'Operating System :: POSIX :: FreeBSD',
+        'Programming Language :: Python',
+        'Topic :: Desktop Environment',
+        ]
       )