diff options
| author | Steven Knight <knight@baldmt.com> | 2004-10-13 13:18:24 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-10-13 13:18:24 (GMT) |
| commit | 93161131cefbc9ef3a681522ba4b7be285432ef1 (patch) | |
| tree | f5487315b6b0edcd872c7a2a9acb210ff04b8f91 | |
| parent | a91921dc92ba759f707e820c3c1a1b1a808877a8 (diff) | |
| download | SCons-93161131cefbc9ef3a681522ba4b7be285432ef1.zip SCons-93161131cefbc9ef3a681522ba4b7be285432ef1.tar.gz SCons-93161131cefbc9ef3a681522ba4b7be285432ef1.tar.bz2 | |
Update the version numbers that --version prints every development build.
| -rw-r--r-- | SConstruct | 23 | ||||
| -rw-r--r-- | src/CHANGES.txt | 3 |
2 files changed, 21 insertions, 5 deletions
@@ -286,6 +286,8 @@ env = Environment( PYTHON = sys.executable ) +Version_values = [Value(version), Value(build_id)] + # # Define SCons packages. # @@ -328,6 +330,10 @@ python_scons = { 'filemap' : { 'LICENSE.txt' : '../LICENSE.txt' }, + + 'explicit_deps' : { + 'SCons/Script/__init__.py' : Version_values, + }, } # @@ -394,7 +400,12 @@ scons_script = { 'LICENSE.txt' : '../LICENSE.txt', 'scons' : 'scons.py', 'sconsign' : 'sconsign.py', - } + }, + + 'explicit_deps' : { + 'scons' : Version_values, + 'sconsign' : Version_values, + }, } scons = { @@ -516,11 +527,13 @@ for p in [ scons ]: rpm_files.append(r + 'c') files = map(lambda x, i=isubdir: os.path.join(i, x), files) dst_files.extend(files) - for k in sp['filemap'].keys(): - f = sp['filemap'][k] + for k, f in sp['filemap'].items(): if f: - k = os.path.join(sp['src_subdir'], k) - p['filemap'][k] = os.path.join(sp['src_subdir'], f) + k = os.path.join(ssubdir, k) + p['filemap'][k] = os.path.join(ssubdir, f) + for f, deps in sp['explicit_deps'].items(): + f = os.path.join(build, ssubdir, f) + env.Depends(f, deps) # # Now that we have the "normal" source files, add those files diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 93fe5a7..8e0a1ce 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -94,6 +94,9 @@ RELEASE 0.97 - XXX - Enhance ParseConfig() to work properly for spaces in between the -I, -L and -l options and their arguments. + - Packaging build fix: Rebuild the files that are use to report the + --version of SCons whenever the development version number changes. + From Clive Levinson: - Make ParseConfig() recognize and add -mno-cygwin to $LINKFLAGS and |