[Happydoc-checkins] CVS: HappyDoc setup.py,1.10,1.11

[Doug H. <dou...@us...>]

Update of /cvsroot/happydoc/HappyDoc
In directory usw-pr-cvs1:/tmp/cvs-serv23206

Modified Files:
	setup.py 
Log Message:
Windows does not seem to find the happydoclib package during
installation, so it cannot find the cvsProductVersion() function.
Copied that code to the local module to eliminate the problem.


Index: setup.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc/setup.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** setup.py	2001/11/12 21:48:11	1.10
--- setup.py	2002/02/05 19:59:36	1.11
***************
*** 3,7 ****
  # $Id$
  #
! # Time-stamp: <01/11/12 16:37:27 dhellmann>
  #
  # Copyright 2001 Doug Hellmann.
--- 3,7 ----
  # $Id$
  #
! # Time-stamp: <02/02/05 10:00:12 dhellmann>
  #
  # Copyright 2001 Doug Hellmann.
***************
*** 57,60 ****
--- 57,61 ----
  #
  from distutils.core import setup
+ import string
  import sys
  
***************
*** 62,66 ****
  # Import Local modules
  #
- from happydoclib.cvsversion import cvsProductVersion
  
  #
--- 63,66 ----
***************
*** 70,74 ****
  BSD_LICENSE="""
  
!                     Copyright 2001 Doug Hellmann.
  
                           All Rights Reserved
--- 70,74 ----
  BSD_LICENSE="""
  
!                     Copyright 2001, 2002 Doug Hellmann.
  
                           All Rights Reserved
***************
*** 100,103 ****
--- 100,124 ----
    context to be imported.
  """
+ 
+ 
+ def cvsProductVersion(cvsVersionString='$Name$'):
+     """Function to return the version number of the program.
+ 
+     The value is taken from the CVS tag, assuming the tag has the form:
+ 
+         rX_Y_Z
+ 
+     Where X is the major version number, Y is the minor version
+     number, and Z is the optional sub-minor version number.
+     """
+     cvs_version_parts=string.split(cvsVersionString)
+     if len(cvs_version_parts) >= 3:
+         app_version = string.strip(cvs_version_parts[1]).replace('_', '.')
+         if app_version and app_version[0] == 'r':
+             app_version = app_version[1:]
+     else:
+         app_version = 'WORKING'
+     return app_version
+