From 48f19e9e5ecc069f379ad433fdaf280ac9b54e16 Mon Sep 17 00:00:00 2001 From: Luca Falavigna Date: Sat, 23 Jan 2010 15:22:02 +0100 Subject: Imported Upstream version 1.2.0.d20100117 --- SConstruct | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index 1a7f0ea..37e8487 100644 --- a/SConstruct +++ b/SConstruct @@ -6,13 +6,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' +copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010' # This gets inserted into the man pages to reflect the month of release. -month_year = 'December 2009' +month_year = 'January 2010' # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The SCons Foundation +# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -152,7 +152,6 @@ if not revision and svn: result = result + '[MODIFIED]' return result - checkpoint = ARGUMENTS.get('CHECKPOINT', '') if checkpoint: if checkpoint == 'd': @@ -162,7 +161,6 @@ if checkpoint: checkpoint = 'r' + revision version = version + '.' + checkpoint - build_id = ARGUMENTS.get('BUILD_ID') if build_id is None: if revision: @@ -709,7 +707,6 @@ for p in [ scons ]: pkg = p['pkg'] pkg_version = "%s-%s" % (pkg, version) - src = 'src' if p.has_key('src_subdir'): src = os.path.join(src, p['src_subdir']) @@ -801,7 +798,7 @@ for p in [ scons ]: # # Now run everything in src_file through the sed command we - # concocted to expand SConstruct, 1.2.0.d20091224, etc. + # concocted to expand SConstruct, 1.2.0.d20100117, etc. # for b in src_files: s = p['filemap'].get(b, b) -- cgit v1.2.3