[pywin32-checkins] pywin32/Wise brandall.py,1.5,1.6

[<mha...@us...>]

Update of /cvsroot/pywin32/pywin32/Wise
In directory sc8-pr-cvs1:/tmp/cvs-serv29464

Modified Files:
	brandall.py 
Log Message:
Handle building CVS versions better.


Index: brandall.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Wise/brandall.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** brandall.py	7 Jul 2003 14:08:14 -0000	1.5
--- brandall.py	1 Sep 2003 08:19:06 -0000	1.6
***************
*** 22,28 ****
  			bRebrand = 1
  
- 	if len(args) != 2:
- 		print "You must enter the Python version and the build number"
- 		return
  	defines = []
  	if args[0] == "cvs":
--- 22,25 ----
***************
*** 32,37 ****
  		build_suffix = time.strftime("%Y%m%d", time.gmtime(time.time()))
  		defines.append("PY_DEV_BUILD=1")
! 		# xxx
  	else:
  		pyver = args[0]
  		build = args[1]
--- 29,39 ----
  		build_suffix = time.strftime("%Y%m%d", time.gmtime(time.time()))
  		defines.append("PY_DEV_BUILD=1")
! 		pyver = "%d.%d" % (sys.version_info[0], sys.version_info[1])
! 		defines.append("PYVER_DOTTED=%s" % (pyver,))
! 		defines.append("PYVER_NODOT=%d%d" % (sys.version_info[0], sys.version_info[1]))
  	else:
+ 		if len(args) != 2:
+ 			print "You must enter the Python version and the build number"
+ 			return
  		pyver = args[0]
  		build = args[1]
***************
*** 46,57 ****
  			print why
  			return
- 		if sys.executable.find("_d")<0:
- 			print "Oops - can't brand myself - spawing debug version."
- 			base, ext = os.path.splitext(sys.executable)
- 			exe = base + "_d" + ext
- 			os.execv(exe, [exe]+sys.argv)
- 			# Does not return
- 			assert(False)
  		build_suffix = build
  #	projectName = "$/Python/Wise/win32all"
  	
--- 48,60 ----
  			print why
  			return
  		build_suffix = build
+ 	if sys.executable.find("_d")<0:
+ 		print "Oops - can't brand myself - spawing debug version."
+ 		print "XXX - note that readline is gunna screw up"
+ 		base, ext = os.path.splitext(sys.executable)
+ 		exe = base + "_d" + ext
+ 		os.execv(exe, [exe]+sys.argv)
+ 		# Does not return
+ 		assert(False)
  #	projectName = "$/Python/Wise/win32all"