[Pymerase-cvs-commit] pymerase/bin pymerase,1.3,1.4

[<ki...@us...>]

Update of /cvsroot/pymerase/pymerase/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv3765

Modified Files:
	pymerase 
Log Message:
added --version/-v options, invalid option formatting update, continue working if Tkinter doesn't load (for jython)


Index: pymerase
===================================================================
RCS file: /cvsroot/pymerase/pymerase/bin/pymerase,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pymerase	30 Oct 2002 00:05:44 -0000	1.3
--- pymerase	19 Feb 2003 00:37:23 -0000	1.4
***************
*** 32,41 ****
  # Last Modified: $Date$
  #
! VERSION = 'v0.1.3'
! PymVERSION = 'v0.1'
  
! from Tkinter import *
  import pymerase
  
  import sys
  import os
--- 32,49 ----
  # Last Modified: $Date$
  #
! rev = "$Revision$"
! rev = rev.replace('$Revision: ', '')
! rev = rev.replace(' $', '')
  
! VERSION = 'v0.%s' % (rev)
! 
! try:
!   from Tkinter import *
! except:
!   pass
  import pymerase
  
+ PymVERSION = pymerase.VERSION
+ 
  import sys
  import os
***************
*** 54,58 ****
    """
    try:
!     opts, args = getopt.getopt(sys.argv[1:], "s:i:d:o:htg",
                                 ["source=",
                                  "inputModule=",
--- 62,66 ----
    """
    try:
!     opts, args = getopt.getopt(sys.argv[1:], "s:i:d:o:htgv",
                                 ["source=",
                                  "inputModule=",
***************
*** 61,71 ****
                                  "help",
                                  "translators",
                                  "gui"])
    except getopt.GetoptError:
-     printUseage()
      print "-------------------------------"
      print "- Invalid Command Line Option -"
      print "-------------------------------"
      sys.exit(2)
    if len(sys.argv) <= 1:
      printUseage()
--- 69,81 ----
                                  "help",
                                  "translators",
+                                 "version",
                                  "gui"])
    except getopt.GetoptError:
      print "-------------------------------"
      print "- Invalid Command Line Option -"
      print "-------------------------------"
+     printUseage()
      sys.exit(2)
+     
    if len(sys.argv) <= 1:
      printUseage()
***************
*** 77,80 ****
--- 87,95 ----
        sys.exit()
  
+     if arg in ('-v', '--version'):
+       print "Pymerase %s" % (PymVERSION)
+       print "Pymerase Command Line %s" % (VERSION)
+       sys.exit()
+ 
      if arg in ('-g', '--gui'):
        loadGUI()
***************
*** 172,176 ****
  def printUseage():
    useage = """
!   Welcome to PyMerase %s!
    
    Useage:
--- 187,191 ----
  def printUseage():
    useage = """
!   Welcome to Pymerase %s!
    
    Useage:
***************
*** 190,193 ****
--- 205,209 ----
  
      -t, --translators          Displays more info about translators
+     -v, --version              Displays version numbers
      -h, --help                 Displays this help page