[Python-checkins] CVS: python/dist/src/Mac/Lib/mkcwproject __init__.py,1.11,1.11.2.1 cwxmlgen.py,1.6,1.6.12.1

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Lib/mkcwproject
In directory usw-pr-cvs1:/tmp/cvs-serv12554/Lib/mkcwproject

Modified Files:
      Tag: r22rc1-branch
	__init__.py cwxmlgen.py 
Log Message:
Merged Mac subtree into the 22c1 branch.


Index: __init__.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/mkcwproject/__init__.py,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** __init__.py	2001/11/30 14:16:30	1.11
--- __init__.py	2001/12/19 15:10:13	1.11.2.1
***************
*** 13,37 ****
  		dictcopy[k] = v
  	#
! 	# Fill in mac-specific values
  	#
  	dictcopy['mac_projectxmlname'] = outputfile + '.xml'
  	dictcopy['mac_exportname'] = os.path.split(outputfile)[1] + '.exp'
- 	if not dictcopy.has_key('mac_outputdir'):
- 		dictcopy['mac_outputdir'] = ':lib:'
- 	if not dictcopy.has_key('stdlibraryflags'):
- 		dictcopy['stdlibraryflags'] = 'Debug'
- 	if not dictcopy.has_key('libraryflags'):
- 		dictcopy['libraryflags'] = 'Debug'
  	if not dictcopy.has_key('mac_dllname'):
  		dictcopy['mac_dllname'] = modulename + '.ppc.slb'
  	if not dictcopy.has_key('mac_targetname'):
  		dictcopy['mac_targetname'] = modulename + '.ppc'
! 	if os.path.isabs(dictcopy['sysprefix']):
! 		dictcopy['mac_sysprefixtype'] = 'Absolute'
! 	else:
! 		dictcopy['mac_sysprefixtype'] = 'Project' # XXX not sure this is right...
! 	#
! 	# Generate the XML for the project
! 	#
  	xmlbuilder = cwxmlgen.ProjectBuilder(dictcopy, templatename=templatename)
  	xmlbuilder.generate()
--- 13,25 ----
  		dictcopy[k] = v
  	#
! 	# Generate the XML for the project
  	#
  	dictcopy['mac_projectxmlname'] = outputfile + '.xml'
  	dictcopy['mac_exportname'] = os.path.split(outputfile)[1] + '.exp'
  	if not dictcopy.has_key('mac_dllname'):
  		dictcopy['mac_dllname'] = modulename + '.ppc.slb'
  	if not dictcopy.has_key('mac_targetname'):
  		dictcopy['mac_targetname'] = modulename + '.ppc'
! 	
  	xmlbuilder = cwxmlgen.ProjectBuilder(dictcopy, templatename=templatename)
  	xmlbuilder.generate()

Index: cwxmlgen.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/mkcwproject/cwxmlgen.py,v
retrieving revision 1.6
retrieving revision 1.6.12.1
diff -C2 -d -r1.6 -r1.6.12.1
*** cwxmlgen.py	2001/08/11 10:07:23	1.6
--- cwxmlgen.py	2001/12/19 15:10:13	1.6.12.1
***************
*** 21,24 ****
--- 21,25 ----
  class ProjectBuilder:
  	def __init__(self, dict, templatelist=TEMPLATELIST, templatename=None):
+ 		self._adddefaults(dict)
  		if templatename == None:
  			if hasattr(MacOS, 'runtimemodel'):
***************
*** 44,47 ****
--- 45,62 ----
  		self.templatelist = templatelist
  		self.templatedir = templatedir
+ 	
+ 	def _adddefaults(self, dict):
+ 		# Set all suitable defaults set for values which were omitted.
+ 		if not dict.has_key('mac_outputdir'):
+ 			dict['mac_outputdir'] = ':lib:'
+ 		if not dict.has_key('stdlibraryflags'):
+ 			dict['stdlibraryflags'] = 'Debug'
+ 		if not dict.has_key('libraryflags'):
+ 			dict['libraryflags'] = 'Debug'
+ 		if not dict.has_key('mac_sysprefixtype'):
+ 			if os.path.isabs(dict['sysprefix']):
+ 				dict['mac_sysprefixtype'] = 'Absolute'
+ 			else:
+ 				dict['mac_sysprefixtype'] = 'Project' # XXX not sure this is right...
  		
  	def generate(self):