diff options
author | Jack Jansen <jack.jansen@cwi.nl> | 2001-01-23 22:35:22 (GMT) |
---|---|---|
committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-01-23 22:35:22 (GMT) |
commit | 6abe676538d2e6a6fc9c6650047886180b3c2a18 (patch) | |
tree | 898da4a848091672dc72d5356326afc91131dcfe | |
parent | 50f6f6f621268c4fd0cb86c1e3df0b8c190fde9e (diff) | |
download | cpython-6abe676538d2e6a6fc9c6650047886180b3c2a18.zip cpython-6abe676538d2e6a6fc9c6650047886180b3c2a18.tar.gz cpython-6abe676538d2e6a6fc9c6650047886180b3c2a18.tar.bz2 |
Various settings were unconditionally set. Allow them to be overridden in the settings dict.
-rw-r--r-- | Mac/Lib/mkcwproject/__init__.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Mac/Lib/mkcwproject/__init__.py b/Mac/Lib/mkcwproject/__init__.py index c4064d7..c5efb7e 100644 --- a/Mac/Lib/mkcwproject/__init__.py +++ b/Mac/Lib/mkcwproject/__init__.py @@ -4,7 +4,7 @@ import os import AppleEvents import macfs -def mkproject(outputfile, modulename, settings, force=0): +def mkproject(outputfile, modulename, settings, force=0, templatename=None): # # Copy the dictionary # @@ -18,8 +18,10 @@ def mkproject(outputfile, modulename, settings, force=0): dictcopy['mac_exportname'] = os.path.split(outputfile)[1] + '.exp' if not dictcopy.has_key('mac_outputdir'): dictcopy['mac_outputdir'] = ':lib:' - dictcopy['mac_dllname'] = modulename + '.ppc.slb' - dictcopy['mac_targetname'] = modulename + '.ppc' + 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: @@ -27,7 +29,7 @@ def mkproject(outputfile, modulename, settings, force=0): # # Generate the XML for the project # - xmlbuilder = cwxmlgen.ProjectBuilder(dictcopy) + xmlbuilder = cwxmlgen.ProjectBuilder(dictcopy, templatename=templatename) xmlbuilder.generate() if not force: # We do a number of checks and all must succeed before we decide to |