Update the version numbers that --version prints every development build.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@1128 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/SConstruct b/SConstruct
index 559f49eddf7e66edd7abe1701515b9fb1eb1894b..f009c7b52c3132b2737324da7acf4b430f49db0e 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -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 93fe5a7c7b3a9d3a0662aeb0ade5ae71e4208718..8e0a1ceefb6033bd55c7090ece12f8971728fbe6 100644 (file)
--- 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