diff options
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 22 |
1 files changed, 14 insertions, 8 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' +copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011' # This gets inserted into the man pages to reflect the month of release. -month_year = 'August 2010' +month_year = 'September 2011' # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation +# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.0.1' +default_version = '2.1.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.0.1, etc. + # concocted to expand SConstruct, 2.1.0, etc. # for b in src_files: s = p['filemap'].get(b, b) @@ -1093,7 +1093,9 @@ for p in [ scons ]: ] for script in scripts: - #commands.append("mv %s/%s %s/%s.py" % (local, script, local, script)) + # add .py extension for scons-local scripts on non-windows platforms + if platform == "win32": + break local_script = os.path.join(build_dir_local, script) commands.append(Move(local_script + '.py', local_script)) @@ -1116,9 +1118,14 @@ for p in [ scons ]: Local(l) if gzip: + if platform == "win32": + # avoid problem with tar interpreting c:/ as a remote machine + tar_cargs = '-cz --force-local -f' + else: + tar_cargs = '-czf' env.Command(dist_local_tar_gz, local_targets, - "cd %s && tar czf $( ${TARGET.abspath} $) *" % build_dir_local) + "cd %s && tar %s $( ${TARGET.abspath} $) *" % (build_dir_local, tar_cargs)) unpack_targets = [os.path.join(test_local_tar_gz_dir, x) for x in rf] commands = [Delete(test_local_tar_gz_dir), @@ -1198,7 +1205,6 @@ if sfiles: '.hgt/*', '.svnt/*', '*.aeignore', - '*.cvsignore', '*.hgignore', 'www/*', ] |