[Pymerase-cvs-commit] pymerase setup.py,1.5,1.6

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

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

Modified Files:
	setup.py 
Log Message:
seperated prefix into binPath, docPath.
added command line options --binPath= and --docPath=


Index: setup.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/setup.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** setup.py	16 Apr 2003 03:11:59 -0000	1.5
--- setup.py	16 Apr 2003 20:21:23 -0000	1.6
***************
*** 67,79 ****
  
  #set prefix to None for later error checking
! prefix = None
  
  #look for custom command line args
  for item in sys.argv:
- 
    #If prefix command line arg exists, set new prefix and mark
    # item to be removed from sys.argv
!   if item[:9] == '--prefix=':
!     prefix = item[9:]
      rmList.append(item)
  
--- 67,83 ----
  
  #set prefix to None for later error checking
! binPath = None
! docPath = None
  
  #look for custom command line args
  for item in sys.argv:
    #If prefix command line arg exists, set new prefix and mark
    # item to be removed from sys.argv
!   if item[:10] == '--binPath=':
!     binPath = item[10:]
!     rmList.append(item)
! 
!   if item[:10] == '--docPath=':
!     docPath = item[10:]
      rmList.append(item)
  
***************
*** 82,107 ****
    sys.argv.remove(item)
  
  #If user overrides command line args, then don't need to
  # use logic to figure them out.
! if prefix is None:
    #Set default for linux 2.x systems
    if sys.platform == 'linux2':
!     prefix = '/usr'
!     docs = os.path.join(prefix, 'share/doc/pymerase')
    #set default for all others
    #FIXME: should add more defaults
    #NOTE: can override with command line
    else:
!     prefix = 'pymerase'
!     docs = 'pymerase'
! else:
!   docs = os.path.join(prefix, 'share/doc/pymerase')
  
  #################################
  # Setup Data Files
! BIN_TUPLE=(os.path.join(prefix, 'bin'),
         ['bin/pymerase', 'bin/pymerasegui.py'])
  
! README_TUPLE=(docs, ['README', 'INSTALL'])
  
  # ignore this until someone fixes it.
--- 86,120 ----
    sys.argv.remove(item)
  
+ print sys.argv
  #If user overrides command line args, then don't need to
  # use logic to figure them out.
! ##BIN PATH##
! if binPath is None:
    #Set default for linux 2.x systems
    if sys.platform == 'linux2':
!     binPath = '/usr/bin'
    #set default for all others
    #FIXME: should add more defaults
    #NOTE: can override with command line
    else:
!     binPath = 'pymerase'
! 
! ##DOC PATH##
! if docPath is None:
!   #Set default for linux 2.x systems
!   if sys.platform == 'linux2':
!     docPath = '/usr/share/doc/pymerase'
!   #set default for all others
!   #FIXME: should add more defaults
!   #NOTE: can override with command line
!   else:
!     docPath = 'pymerase'
  
  #################################
  # Setup Data Files
! BIN_TUPLE=(binPath,
         ['bin/pymerase', 'bin/pymerasegui.py'])
  
! README_TUPLE=(docPath, ['README', 'INSTALL'])
  
  # ignore this until someone fixes it.
***************
*** 116,120 ****
  #util (CvsTreeUtil) will setup all files checked into cvs
  #  for the examples directory...
! DATA_FILES.extend(util.getSetupDataFiles(docs, 'examples'))
  #FIXME: Grabs .cvsignore files, need to add filter
  
--- 129,133 ----
  #util (CvsTreeUtil) will setup all files checked into cvs
  #  for the examples directory...
! DATA_FILES.extend(util.getSetupDataFiles(docPath, 'examples'))
  #FIXME: Grabs .cvsignore files, need to add filter