diff options
author | Luca Falavigna <dktrkranz@debian.org> | 2012-08-20 23:30:35 +0200 |
---|---|---|
committer | Luca Falavigna <dktrkranz@debian.org> | 2012-08-20 23:30:35 +0200 |
commit | 82c4addb364fffb1c647ff7e5fab201000719305 (patch) | |
tree | cc244c59579c58d9e8df6e157d8fc49510e0f494 /SConstruct | |
parent | fa0c16e75fd6770db0a9eb67a37a9b420ba3fa4f (diff) | |
parent | 3d529f4ea2b0de42aa2144dbe904e564b7b0b813 (diff) |
Merge tag 'upstream/2.2.0'
Upstream version 2.2.0
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -5,13 +5,13 @@ # When this gets changed, you must also change the copyright_years string # in QMTest/TestSCons.py so the test scripts look for the right string. -copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011' +copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012' # This gets inserted into the man pages to reflect the month of release. -month_year = 'September 2011' +month_year = 'August 2012' # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation +# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -43,7 +43,7 @@ import sys import tempfile project = 'scons' -default_version = '2.1.0' +default_version = '2.2.0' copyright = "Copyright (c) %s The SCons Foundation" % copyright_years platform = distutils.util.get_platform() @@ -794,7 +794,7 @@ for p in [ scons ]: # # Now run everything in src_file through the sed command we - # concocted to expand SConstruct, 2.1.0, etc. + # concocted to expand SConstruct, 2.2.0, etc. # for b in src_files: s = p['filemap'].get(b, b) @@ -1066,7 +1066,7 @@ for p in [ scons ]: commands.append("$PYTHON $PYTHONFLAGS $SETUP_PY sdist --formats=%s" % \ ','.join(distutils_formats)) - commands.append("$PYTHON $PYTHONFLAGS $SETUP_PY bdist_wininst") + commands.append("$PYTHON $PYTHONFLAGS $SETUP_PY bdist_wininst --plat-name win32 --user-access-control auto") env.Command(distutils_targets, build_src_files, commands) |