Merged revisions 2136-2200,2202-2290,2292-2301 via svnmerge from

http://scons.tigris.org/svn/scons/branches/core

........
  r2145 | stevenknight | 2007-07-17 09:15:12 -0500 (Tue, 17 Jul 2007) | 3 lines

  Don't put null strings (from variable expansion) in a path list.
  (They get turned into the current directory on later expansion.)
........
  r2146 | stevenknight | 2007-07-17 10:47:39 -0500 (Tue, 17 Jul 2007) | 3 lines

  Add support for optional arguments on command-line long options
  by specifying nargs='?'.
........
  r2149 | stevenknight | 2007-07-17 15:22:24 -0500 (Tue, 17 Jul 2007) | 2 lines

  Remove left-over Optik mentions.
........
  r2150 | stevenknight | 2007-07-17 15:39:34 -0500 (Tue, 17 Jul 2007) | 4 lines

  Add a $SWIGPATH variable for finding SWIG dependencies, with
  $SWIGINC{PREFIX,SUFFIX} for adding them to the command line.
........
  r2154 | stevenknight | 2007-07-18 20:05:31 -0500 (Wed, 18 Jul 2007) | 2 lines

  Fix variable misspellings in the doc added for $SWIGOUTPUT.
........
  r2155 | stevenknight | 2007-07-18 20:07:28 -0500 (Wed, 18 Jul 2007) | 2 lines

  Add the Python eggs info file to the RPM packaging build.
........
  r2156 | stevenknight | 2007-07-18 20:15:08 -0500 (Wed, 18 Jul 2007) | 2 lines

  Convert documentation from DocBook SGML to XML.
........
  r2158 | stevenknight | 2007-07-19 17:16:19 -0500 (Thu, 19 Jul 2007) | 3 lines

  Conditionally add the .egg-info the RPM file list only if the distutils
  in the version of Python that rpmbuild will execute knows about them.
........
  r2161 | stevenknight | 2007-07-19 19:12:29 -0500 (Thu, 19 Jul 2007) | 5 lines

  Capture a test case (contributed by Tilo Prutz) where instantiation of
  a private class causes javac to generate an additional anonymous inner
  class file.  (No solution yet, but there's no sense throwing away the
  preparatory work.)
........
  r2162 | stevenknight | 2007-07-20 11:29:56 -0500 (Fri, 20 Jul 2007) | 3 lines

  Support passing a list of .java files as source to the Java() builder.
  (Leanid Nazdrynau)
........
  r2163 | garyo | 2007-07-20 12:00:35 -0500 (Fri, 20 Jul 2007) | 1 line

  Fixed cut-n-paste error in Touch factory method doc in users guide.
........
  r2167 | stevenknight | 2007-07-21 22:59:40 -0500 (Sat, 21 Jul 2007) | 2 lines

  Don't execute the SWIGOUTDIR test if swig isn't installed.
........
  r2168 | stevenknight | 2007-07-21 23:14:17 -0500 (Sat, 21 Jul 2007) | 2 lines

  Fix the test's ability to run under a path name containing spaces.
........
  r2171 | stevenknight | 2007-07-24 15:54:41 -0500 (Tue, 24 Jul 2007) | 2 lines

  Handle white space in key file names in the packaging build.
........
  r2172 | stevenknight | 2007-07-24 21:41:15 -0500 (Tue, 24 Jul 2007) | 2 lines

  More efficient copying of construction environments.
........
  r2173 | stevenknight | 2007-07-25 10:56:02 -0500 (Wed, 25 Jul 2007) | 2 lines

  Update the SCons build for Subversion and general clean-up.
........
  r2174 | stevenknight | 2007-07-25 11:35:16 -0500 (Wed, 25 Jul 2007) | 3 lines

  Suppress the [brackets] around a node in the --tree=prune output if
  the node is a source.
........
  r2175 | stevenknight | 2007-07-25 12:52:18 -0500 (Wed, 25 Jul 2007) | 3 lines

  Commonize the skip_test() method and make its behavior configurable
  via a TESTCOMMON_PASS_SKIPS environment variable.
........
  r2178 | stevenknight | 2007-07-25 21:43:47 -0500 (Wed, 25 Jul 2007) | 3 lines

  Add $JAVACLASSPATH and $JAVASOURCEPATH construction variables.  (Leanid
  Nazdrynau)
........
  r2182 | stevenknight | 2007-07-30 12:10:20 -0500 (Mon, 30 Jul 2007) | 3 lines

  Refactor Builder suffix-adjusting into its own method, so we can
  (potentially) re-use it for Builders with attached source Builders.
........
  r2183 | stevenknight | 2007-07-30 14:51:53 -0500 (Mon, 30 Jul 2007) | 2 lines

  More efficient source-builder suffix matching.
........
  r2184 | stevenknight | 2007-07-30 16:01:42 -0500 (Mon, 30 Jul 2007) | 4 lines

  Encapsulate initialization of the default FS object by an accessor
  function in SCons.Node.FS.  (This also gets rid of an unnecessary
  reference to SCons.Node.FS.default_fs in the LaTeX scanner.)
........
  r2193 | stevenknight | 2007-07-30 18:24:07 -0500 (Mon, 30 Jul 2007) | 3 lines

  Fix interpretation of source arguments that have no suffix when the
  called Builder has both a src_suffix and a src_builder.
........
  r2194 | stevenknight | 2007-07-31 10:25:31 -0500 (Tue, 31 Jul 2007) | 2 lines

  Increase the number of tries for random output from three to ten.
........
  r2195 | stevenknight | 2007-07-31 10:52:28 -0500 (Tue, 31 Jul 2007) | 3 lines

  Skip the test gracefully if the zipfile module can't read the file it
  just wrote (which is the case for Python 2.1 on 64-bit systems).
........
  r2196 | stevenknight | 2007-07-31 13:06:21 -0500 (Tue, 31 Jul 2007) | 2 lines

  Move the "import zipfile" so it doesn't fail on Python <= 2.0.
........
  r2197 | stevenknight | 2007-07-31 14:51:50 -0500 (Tue, 31 Jul 2007) | 3 lines

  Commonize initialization of the various Java builders so they can be
  hooked up into a multi-stage Builder chain.  (Leanid Nazdrynau)
........
  r2198 | stevenknight | 2007-07-31 16:15:18 -0500 (Tue, 31 Jul 2007) | 3 lines

  Fix use of ${TARGET.dir} and ${SOURCE.dir} expansions in $FORTRANMODDIR
  $JARCHDIR, $JARFLAGS, $LEXFLAGS, $SWIGFLAGS, $SWIGOUTDIR and $YACCFLAGS.
........
  r2199 | stevenknight | 2007-07-31 16:25:48 -0500 (Tue, 31 Jul 2007) | 2 lines

  Remove left-over Trace() call.
........
  r2202 | stevenknight | 2007-08-01 12:31:48 -0500 (Wed, 01 Aug 2007) | 3 lines

  Bail out via test.skip_test() if wix ("candle") isn't found.
  Put the main body of code flush left instead of under an if: block.
........
  r2203 | stevenknight | 2007-08-01 15:35:55 -0500 (Wed, 01 Aug 2007) | 5 lines

  Fix Tool.packaging.rpm.package() so it doesn't always overwrite
  $RPMFLAGS with -ta.
  Set --buildroot in RPM packaging tests so they don't overwrite
  each other when run simultaneously.
........
  r2204 | stevenknight | 2007-08-01 15:37:36 -0500 (Wed, 01 Aug 2007) | 2 lines

  Fix a nested scope issue with the internal build_sources() function.
........
  r2205 | stevenknight | 2007-08-01 15:46:08 -0500 (Wed, 01 Aug 2007) | 5 lines

  Normalize (X out) the CreationDate field inside embedded, compressed
  PostScript streams within the generated PDF files.  Also normalize
  preceding Length field, since compression length is affected by different
  patterns of input, including the variable CreationDate value.
........
  r2211 | stevenknight | 2007-08-02 08:52:06 -0500 (Thu, 02 Aug 2007) | 2 lines

  Add the new modules from branches/packaging to the SCons packaging build.
........
  r2212 | stevenknight | 2007-08-02 19:59:01 -0500 (Thu, 02 Aug 2007) | 2 lines

  Fix the JAVACLASSPATH test when javah isn't on the default $PATH.
........
  r2214 | stevenknight | 2007-08-03 15:05:21 -0500 (Fri, 03 Aug 2007) | 4 lines

  Hook up the Java builders into a multi-step chain underneath a Java()
  pseudo-builder (wrapper) that examines its arguments and calls the
  appropriate underlying file-or-dir builder.
........
  r2215 | stevenknight | 2007-08-03 15:49:58 -0500 (Fri, 03 Aug 2007) | 2 lines

  Fix for old Python versions:  use apply() instead of *args, **kw.
........
  r2216 | stevenknight | 2007-08-03 16:49:31 -0500 (Fri, 03 Aug 2007) | 2 lines

  Hook up the SWIG builder as a source builder for .java files.
........
  r2217 | stevenknight | 2007-08-03 17:28:19 -0500 (Fri, 03 Aug 2007) | 2 lines

  Don't use .endswith(), which didn't appear until later Python versions.
........
  r2218 | stevenknight | 2007-08-03 17:29:38 -0500 (Fri, 03 Aug 2007) | 2 lines

  Replace tabs with spaces.
........
  r2219 | stevenknight | 2007-08-04 08:06:23 -0500 (Sat, 04 Aug 2007) | 3 lines

  Initialize a loop-invariant lambda for matching .java suffixes outside
  the loop.
........
  r2220 | stevenknight | 2007-08-07 15:06:13 -0500 (Tue, 07 Aug 2007) | 2 lines

  Refactor parallel class-generation loops into one.
........
  r2221 | stevenknight | 2007-08-07 16:04:06 -0500 (Tue, 07 Aug 2007) | 5 lines

  Have the Java multi-step builder test actually check for generated files,
  and fix the generation of .java and .class file names, and interaction
  with the SWIG builder, so that the files are generated in the correct
  place.
........
  r2222 | stevenknight | 2007-08-07 16:45:05 -0500 (Tue, 07 Aug 2007) | 3 lines

  Fix dependencies on SWIG-generated .java files so they don't have to
  be built in multiple passes.
........
  r2226 | stevenknight | 2007-08-07 18:00:22 -0500 (Tue, 07 Aug 2007) | 2 lines

  Fix SWIG when used with BuildDir().
........
  r2227 | stevenknight | 2007-08-07 22:15:55 -0500 (Tue, 07 Aug 2007) | 5 lines

  User's guide updates:
  - Make the multiple files example match its text.
  - Expand a truncated sentence about being able to use Python function actions
    in the Command() Builder.
........
  r2228 | stevenknight | 2007-08-07 23:25:18 -0500 (Tue, 07 Aug 2007) | 3 lines

  Don't generate an error if a #include file matches a same-named
  directory in $CPPPATH (or $FORTRANPATH, etc.).
........
  r2229 | stevenknight | 2007-08-07 23:40:00 -0500 (Tue, 07 Aug 2007) | 2 lines

  Fix a code example.  (Gary Oberbrunner)
........
  r2230 | stevenknight | 2007-08-08 00:05:43 -0500 (Wed, 08 Aug 2007) | 3 lines

  Capture a test case to make sure AddPostAction() doesn't interfere
  with normal linking.  (Matt Doar, Gary Oberbrunner)
........
  r2233 | stevenknight | 2007-08-08 14:15:44 -0500 (Wed, 08 Aug 2007) | 2 lines

  Fix documentation typo in a construction variable cross-reference.
........
  r2234 | stevenknight | 2007-08-08 17:03:25 -0500 (Wed, 08 Aug 2007) | 2 lines

  Changes to SCons packaging to support checkpoint releases.
........
  r2235 | stevenknight | 2007-08-09 10:10:01 -0500 (Thu, 09 Aug 2007) | 2 lines

  Sidestep false negatives on heavily loaded systems.
........
  r2236 | garyo | 2007-08-09 11:16:26 -0500 (Thu, 09 Aug 2007) | 1 line

  Allow unpackaged files (e.g. *.pyo) to exist in the build dir without being packaged in the RPM.  Without this, on some systems the rpmbuild may error out.
........
  r2237 | stevenknight | 2007-08-09 11:27:56 -0500 (Thu, 09 Aug 2007) | 5 lines

  Fix test/SWIG/build-dir.py so it works on old Python versions without
  distutils.sysconfig.
  Instead of just cutting-and-pasting initialization code from other
  SWIG tests, centralize it in some new TestSCons methods.
........
  r2238 | garyo | 2007-08-09 11:30:58 -0500 (Thu, 09 Aug 2007) | 1 line

  Use docbook 4.3 instead of 4.4 for the XML doctype since some older(?) jade parsers can't handle new 4-byte Unicode chars in the 4.4 version of isogrk4.ent.
........
  r2240 | stevenknight | 2007-08-09 16:35:06 -0500 (Thu, 09 Aug 2007) | 2 lines

  User's Guide updates (post packaging changes).
........
  r2243 | stevenknight | 2007-08-10 10:31:51 -0500 (Fri, 10 Aug 2007) | 3 lines

  Fix the User's Guide build to use openjade, and to accomodate a change
  in the name of the main generated file (book1.html => index.html).
........
  r2245 | stevenknight | 2007-08-10 11:09:16 -0500 (Fri, 10 Aug 2007) | 2 lines

  Update the {CHANGES,RELEASE}.txt datestamp lines.
........
  r2253 | stevenknight | 2007-08-10 16:21:54 -0500 (Fri, 10 Aug 2007) | 2 lines

  Fix the wix Tool module's ability to handle null entries in $PATH.
........
  r2261 | stevenknight | 2007-08-11 23:08:12 -0500 (Sat, 11 Aug 2007) | 3 lines

  Remove unnecessary files (.svnt/*, .{ae,cvs}ignore, www/*) from the
  scons-src packages.
........
  r2262 | stevenknight | 2007-08-11 23:24:49 -0500 (Sat, 11 Aug 2007) | 2 lines

  Add missing __revision__ lines.
........
  r2263 | stevenknight | 2007-08-11 23:33:42 -0500 (Sat, 11 Aug 2007) | 2 lines

  Skip the test if the MANIFEST file hasn't been built.
........
  r2264 | stevenknight | 2007-08-11 23:36:30 -0500 (Sat, 11 Aug 2007) | 2 lines

  Add recent compatibility modules to the relevant exceptions lists.
........
  r2265 | stevenknight | 2007-08-11 23:39:00 -0500 (Sat, 11 Aug 2007) | 3 lines

  Update __VERSION__ strings in the QMTest/*.py modules, so that packaging
  tests (src/test_*.py) will pass after builds of checkpoint releases.
........
  r2266 | stevenknight | 2007-08-12 07:36:19 -0500 (Sun, 12 Aug 2007) | 2 lines

  Add a comment about why we construct the __VERSION__ string at run time.
........
  r2267 | stevenknight | 2007-08-12 07:42:30 -0500 (Sun, 12 Aug 2007) | 2 lines

  Avoid reading the MANIFEST file twice.  (Courtesy review by Greg Noel.)
........
  r2268 | stevenknight | 2007-08-12 08:14:53 -0500 (Sun, 12 Aug 2007) | 3 lines

  Shift Install() and InstallAs() from being documented as functions
  to being documented as Builders.
........
  r2269 | garyo | 2007-08-13 08:49:52 -0500 (Mon, 13 Aug 2007) | 1 line

  Tests: Skip some more Java tests if javac is not installed on the test machine so they don't get marked as failing.
........
  r2270 | garyo | 2007-08-13 11:09:39 -0500 (Mon, 13 Aug 2007) | 1 line

  Fixed typo in test (shows up on non-Linux platforms).
........
  r2271 | garyo | 2007-08-13 14:09:05 -0500 (Mon, 13 Aug 2007) | 4 lines

  Test portability fixes for Darwin/OSX and IRIX.
  This does not make all the tests pass on those OSes,
  but it takes care of some of the more obvious errors that
  I have time for right now.  More to come.
........
  r2272 | stevenknight | 2007-08-13 15:33:29 -0500 (Mon, 13 Aug 2007) | 2 lines

  Tab => space fix.
........
  r2273 | stevenknight | 2007-08-13 15:33:52 -0500 (Mon, 13 Aug 2007) | 2 lines

  Test for swig, too, which is used to build from the .i file.
........
  r2277 | garyo | 2007-08-14 10:40:00 -0500 (Tue, 14 Aug 2007) | 8 lines

  Test portability on IRIX: test/Actions/pre-post creates target file
  before building target, then IRIX CC does not chmod +x afterwards.
  I think this change is safe on all OSes.

  test/AS/ml.py: I think this is only supposed to be run on win32
  (not skipped only on win32); the sense of the skip test was backwards.
........
  r2278 | stevenknight | 2007-08-14 11:04:40 -0500 (Tue, 14 Aug 2007) | 2 lines

  Add -tt when running tests, to catch inconsistent tab usage.
........
  r2279 | stevenknight | 2007-08-14 14:00:43 -0500 (Tue, 14 Aug 2007) | 2 lines

  Minor refactor of logic in File.retrieve_from_cache().
........
  r2280 | stevenknight | 2007-08-15 01:11:40 -0500 (Wed, 15 Aug 2007) | 2 lines

  Refactor CacheDir support into its own module.
........
  r2281 | stevenknight | 2007-08-15 07:24:51 -0500 (Wed, 15 Aug 2007) | 2 lines

  Move the cachepath() method from FS.File to the CacheDir class.
........
  r2282 | stevenknight | 2007-08-15 08:31:34 -0500 (Wed, 15 Aug 2007) | 2 lines

  Python 1.5.2 fix in the new Null class.
........
  r2283 | stevenknight | 2007-08-15 10:45:53 -0500 (Wed, 15 Aug 2007) | 5 lines

  Refactor CacheDir unit tests to:
  - restore functionality that was dropped in the transition;
  - commonize creation of test Nodes and other (mock) objects
  - separate CacheDir tests from tests of CacheDir through Node.FS.File.
........
  r2284 | stevenknight | 2007-08-15 11:46:38 -0500 (Wed, 15 Aug 2007) | 3 lines

  Replace the Executor.Null.NullEnvironment object with a real Null object,
  so it will absorb the CacheDir method calls as well.
........
  r2285 | stevenknight | 2007-08-15 11:52:57 -0500 (Wed, 15 Aug 2007) | 5 lines

  Add a get_CacheDir() method to a construction environment, which will
  be used to fetch per-environment CacheDir specifications.  (Right now
  all calls to it still just return the one attached to underlying default
  FS object.)
........
  r2286 | stevenknight | 2007-08-15 15:15:46 -0500 (Wed, 15 Aug 2007) | 2 lines

  Support per-construction-environment configuration of CacheDir().
........
  r2287 | stevenknight | 2007-08-15 15:33:04 -0500 (Wed, 15 Aug 2007) | 2 lines

  Move the tests of CacheDir()-related command-line options into test/CacheDir.
........
  r2293 | stevenknight | 2007-08-16 11:14:49 -0500 (Thu, 16 Aug 2007) | 3 lines

  Add the Package() builder description to the documentation build,
  fixing the XML so that it will build.
........
  r2294 | stevenknight | 2007-08-16 12:51:19 -0500 (Thu, 16 Aug 2007) | 3 lines

  Reorganize packaging documentation:  alphabetize the variable definitions
  (and function names), document Tag() as a function, not a builder.
........
  r2296 | stevenknight | 2007-08-16 12:55:01 -0500 (Thu, 16 Aug 2007) | 2 lines

  Add a build command.
........
  r2300 | stevenknight | 2007-08-16 16:49:13 -0500 (Thu, 16 Aug 2007) | 2 lines

  First cut at documenting packaging variables.
........
  r2301 | stevenknight | 2007-08-16 16:51:21 -0500 (Thu, 16 Aug 2007) | 3 lines

  Construct the .src.rpm and .arch.rpm file names independnetly, not
  by trying to massage one into the other.
........

3 files changed, 326 insertions, 191 deletions

diff --git a/src/engine/SCons/Tool/packaging/__init__.py b/src/engine/SCons/Tool/packaging/__init__.py
index c5f40b7..e8f6a09 100644
--- a/src/engine/SCons/Tool/packaging/__init__.py
+++ b/src/engine/SCons/Tool/packaging/__init__.py
@@ -175,6 +175,15 @@ def Package(env, target=None, source=None, **kw):
     targets.extend(env.Alias( 'package', targets ))
     return targets
 
+def build_source(ss, sources):
+    for s in ss:
+        if s.__class__==SCons.Node.FS.Dir:
+            build_source(s.all_children())
+        elif not s.has_builder() and s.__class__==SCons.Node.FS.File:
+            sources.append(s)
+        else:
+            build_source(s.sources)
+
 def FindSourceFiles(env, target=None, source=None ):
     """ returns a list of all children of the target nodes, which have no
     children. This selects all leaves of the DAG that gets build by SCons for
@@ -185,17 +194,8 @@ def FindSourceFiles(env, target=None, source=None ):
     nodes = env.arg2nodes(target, env.fs.Entry)
 
     sources = []
-    def build_source(ss):
-        for s in ss:
-            if s.__class__==SCons.Node.FS.Dir:
-                build_source(s.all_children())
-            elif not s.has_builder() and s.__class__==SCons.Node.FS.File:
-                sources.append(s)
-            else:
-                build_source(s.sources)
-
     for node in nodes:
-        build_source(node.all_children())
+        build_source(node.all_children(), sources)
 
     # now strip the build_node from the sources by calling the srcnode
     # function
diff --git a/src/engine/SCons/Tool/packaging/__init__.xml b/src/engine/SCons/Tool/packaging/__init__.xml
index 8e7f652..bf4e96e 100644
--- a/src/engine/SCons/Tool/packaging/__init__.xml
+++ b/src/engine/SCons/Tool/packaging/__init__.xml
@@ -6,36 +6,46 @@ See its __doc__ string for a discussion of the format.
 -->
 <tool name="Packaging">
 <summary>
-TODO
+Sets construction variables for the &b-Package; Builder.
 </summary>
+<sets>
+</sets>
+<uses>
+</uses>
 </tool>
 
 <builder name="Package">
-Builds software distribution packages. Packages consist of files to install
-and packaging information. The former may be specified with the source
-parameter and may be left out, in which case the &-bFindInstalledFiles;
-function will collect all files that have an &-bInstall; or
-&-bInstallAs; Builder attached. The target, if not specified will be deduced
-from additional information given to this Builder.
-
-The packaging information is specified with the help of construction Variables
-documented below. This information is called a tag to stress that some of them
-can also be attached to files with the &-bTag; Builder.The mandatory ones will
-complain if they were not specified. They vary depending on chosen target
-packager.
-
-The target packager may be selected with the "PACKAGETYPE" command line option
-or with the &-tPACKAGETYPE; construction variable. Currently there are six
-packagers available:
+<summary>
+Builds software distribution packages.  Packages consist of files
+to install and packaging information.  The former may be specified
+with the &source; parameter and may be left out, in which case the
+&FindInstalledFiles; function will collect all files that have an
+&b-Install; or &b-InstallAs; Builder attached.  If the &target;, is
+not specified it will be deduced from additional information given to
+this Builder.
+
+The packaging information is specified with the help of construction
+variables documented below.  This information is called a tag to stress
+that some of them can also be attached to files with the &Tag; function.
+The mandatory ones will complain if they were not specified.  They vary
+depending on chosen target packager.
+
+The target packager may be selected with the "PACKAGETYPE" command line
+option or with the &cv-PACKAGETYPE; construction variable. Currently
+the following packagers available:
 
  * msi - Microsoft Installer
  * rpm - Redhat Package Manger
  * ipkg - Itsy Package Management System
- * tarbz, tarbz and zip
+ * tarbz2 - compressed tar
+ * targz - compressed tar
+ * zip - zip file
+ * src_tarbz2 - compressed tar source
+ * src_targz - compressed tar source
+ * src_zip - zip file source
 
 An updated list is always available under the "package_type" option when
 running "scons --help" on a project that has packaging activated.
-
 <example>
 env = Environment(tools=['default', 'packaging'])
 env.Install('/bin/', 'my_program')
@@ -50,148 +60,229 @@ env.Package( NAME           = 'foo',
              SOURCE_URL     = 'http://foo.org/foo-1.2.3.tar.gz'
         )
 </example>
+</summary>
+</builder>
 
-<cvar name="DESCRIPTION">
+<cvar name="ARCHITECTURE">
 <summary>
-A long description of what the project is about.
+Specifies the system architecture for which
+the package is being built.
+The default is the system architecture
+of the machine on which SCons is running.
+This is used to fill in the
+<literal>Architecture:</literal>
+field in an Ipkg
+<filename>control</filename> file,
+and as part of the name of a generated RPM file.
 </summary>
 </cvar>
 
-<cvar name="DESCRIPTION_<lang>">
+<cvar name="CHANGE_SPECFILE">
 <summary>
-TODO
+A hook for modifying the file that controls the packaging build
+(the <filename>.spec</filename> for RPM,
+the <filename>control</filename> for Ipkg,
+the <filename>.wxs</filename> for MSI).
+If set, the function will be called
+after the SCons template for the file has been written.
+XXX
 </summary>
 </cvar>
 
+<cvar name="CHANGELOG">
+<summary>
+The name of a file containing the change log text
+to be included in the package.
+This is included as the
+<literal>%changelog</literal>
+section of the RPM
+<filename>.spec</filename> file.
+</summary>
+</cvar>
 
-<cvar name="SUMMARY">
+<cvar name="DESCRIPTION">
 <summary>
-A short summary of what the project is about.
+A long description of the project being packaged.
+This is included in the relevant section
+of the file that controls the packaging build.
 </summary>
 </cvar>
 
-<cvar name="LICENSE">
+<cvar name="DESCRIPTION_lang">
 <summary>
-The shorthand of the license this project is under (gpl, lpgl, bsd etc.).
+A language-specific long description for
+the specified <varname>lang</varname>.
+This is used to populate a
+<literal>%description -l</literal>
+section of an RPM
+<filename>.spec</filename> file.
 </summary>
 </cvar>
 
-<cvar name="NAME">
+<cvar name="LICENSE">
 <summary>
-Specfies the name of the project to package.
+The abbreviated name of the license under which
+this project is released (gpl, lpgl, bsd etc.).
+See http://www.opensource.org/licenses/alphabetical
+for a list of license names.
 </summary>
 </cvar>
 
-<cvar name="VERSION">
+<cvar name="NAME">
 <summary>
-The version of the project, given as a string.
+Specfies the name of the project to package.
 </summary>
 </cvar>
 
-<cvar name="PACKAGEVERSION">
+<cvar name="PACKAGEROOT">
 <summary>
-The version of the package, if only changes in the package were done. Currently
-only used by the rpm packager.
+Specifies the directory where all files in resulting archive will be
+placed if applicable.  The default value is "$NAME-$VERSION".
 </summary>
 </cvar>
 
 <cvar name="PACKAGETYPE">
 <summary>
-Selects the package type to build. Currently those are available:
+Selects the package type to build.  Currently these are available:
 
  * msi - Microsoft Installer
  * rpm - Redhat Package Manger
  * ipkg - Itsy Package Management System
- * tarbz2, targz and zip - tarball and zip packager
- * src_tarbz2, src_targz and src_zip - source tarbarll and zip packager
+ * tarbz2 - compressed tar
+ * targz - compressed tar
+ * zip - zip file
+ * src_tarbz2 - compressed tar source
+ * src_targz - compressed tar source
+ * src_zip - zip file source
 
 This may be overridden with the "package_type" command line option.
 </summary>
 </cvar>
 
-<cvar name="VENDOR">
+<cvar name="PACKAGEVERSION">
 <summary>
-TODO
+The version of the package (not the underlying project).
+This is currently only used by the rpm packager
+and should reflect changes in the packaging,
+not the underlying project code itself.
 </summary>
 </cvar>
 
 <cvar name="SOURCE_URL">
 <summary>
-TODO
+The URL
+(web address)
+of the location from which the project was retrieved.
+This is used to fill in the
+<literal>Source:</literal>
+field in the controlling information for Ipkg and RPM packages.
 </summary>
 </cvar>
 
-<cvar name="ARCHITECURE">
+<cvar name="SUMMARY">
 <summary>
-TODO
+A short summary of what the project is about.
+This is used to fill in the
+<literal>Summary:</literal>
+field in the controlling information for Ipkg and RPM packages,
+and as the
+<literal>Description:</literal>
+field in MSI packages.
 </summary>
 </cvar>
 
-<cvar name="PACKAGEROOT">
+<cvar name="VENDOR">
 <summary>
-defines the directory where all files in resulting archive will be placed if
-applicable. The default value is "$NAME-$VERSION".
+The person or organization who supply the packaged software.
+This is used to fill in the
+<literal>Vendor:</literal>
+field in the controlling information for RPM packages,
+and the
+<literal>Manufacturer:</literal>
+field in the controlling information for MSI packages.
 </summary>
 </cvar>
 
-<cvar name="LICENSE">
+<cvar name="VERSION">
 <summary>
-Short name of the license your package is under. Example: gpl, lgpl, bsd ...
-See http://www.opensource.org/licenses/alphabetical
+The version of the project, specified as a string.
 </summary>
 </cvar>
 
-<cvar name="CHANGE_SPECFILE">
+
+<cvar name="X_IPK_DEPENDS">
 <summary>
-TODO
+This is used to fill in the
+<literal>Depends:</literal>
+field in the controlling information for Ipkg packages.
 </summary>
 </cvar>
 
-<cvar name="CHANGELOG">
+<cvar name="X_IPK_DESCRIPTION">
 <summary>
-TODO
+This is used to fill in the
+<literal>Description:</literal>
+field in the controlling information for Ipkg packages.
+The default value is
+<literal>$SUMMARY\n$DESCRIPTION</literal>
 </summary>
 </cvar>
 
-<cvar name="X_RPM_PREINSTALL">
+<cvar name="X_IPK_MAINTAINER">
 <summary>
-TODO
+This is used to fill in the
+<literal>Maintainer:</literal>
+field in the controlling information for Ipkg packages.
 </summary>
 </cvar>
 
-<cvar name="X_RPM_DEFATTR">
+<cvar name="X_IPK_PRIORITY">
 <summary>
-TODO
+This is used to fill in the
+<literal>Priority:</literal>
+field in the controlling information for Ipkg packages.
 </summary>
 </cvar>
 
-<cvar name="X_RPM_POSTINSTALL">
+<cvar name="X_IPK_SECTION">
 <summary>
-TODO
+This is used to fill in the
+<literal>Section:</literal>
+field in the controlling information for Ipkg packages.
 </summary>
 </cvar>
 
-<cvar name="X_RPM_PREUNINSTALL">
+
+
+<cvar name="X_MSI_LANGUAGE">
 <summary>
-TODO
+This is used to fill in the
+<literal>Language:</literal>
+attribute in the controlling information for MSI packages.
 </summary>
 </cvar>
 
-<cvar name="X_RPM_POSTUNINSTALL">
+<cvar name="X_MSI_LICENSE_TEXT">
 <summary>
-TODO
+The text of the software license in RTF format.
+Carriage return characters will be
+replaced with the RTF equivalent \\par.
 </summary>
 </cvar>
 
-<cvar name="X_RPM_VERIFY">
+<cvar name="X_MSI_UPGRADE_CODE">
 <summary>
 TODO
 </summary>
 </cvar>
 
-<cvar name="X_RPM_PREP">
+
+<cvar name="X_RPM_AUTOREQPROV">
 <summary>
-internal, but overridable
+This is used to fill in the
+<literal>AutoReqProv:</literal>
+field in the RPM
+<filename>.spec</filename> file.
 </summary>
 </cvar>
 
@@ -201,188 +292,254 @@ internal, but overridable
 </summary>
 </cvar>
 
-<cvar name="X_RPM_INSTALL">
+<cvar name="X_RPM_BUILDREQUIRES">
 <summary>
-internal, but overridable
+This is used to fill in the
+<literal>BuildRequires:</literal>
+field in the RPM
+<filename>.spec</filename> file.
 </summary>
 </cvar>
 
-<cvar name="X_RPM_CLEAN">
+<cvar name="X_RPM_BUILDROOT">
 <summary>
 internal, but overridable
 </summary>
 </cvar>
 
-<cvar name="X_RPM_URL">
+<cvar name="X_RPM_CLEAN">
 <summary>
-TODO
+internal, but overridable
 </summary>
 </cvar>
 
-<cvar name="X_RPM_GROUP">
+<cvar name="X_RPM_CONFLICTS">
 <summary>
-TODO
+This is used to fill in the
+<literal>Conflicts:</literal>
+field in the RPM
+<filename>.spec</filename> file.
 </summary>
 </cvar>
 
-<cvar name="X_RPM_GROUP_<lang>">
+<cvar name="X_RPM_DEFATTR">
 <summary>
-TODO
+This value is used as the default attributes
+for the files in the RPM package.
+The default value is
+<literal>(-,root,root)</literal>.
 </summary>
 </cvar>
 
 <cvar name="X_RPM_DISTRIBUTION">
 <summary>
-TODO
+This is used to fill in the
+<literal>Distribution:</literal>
+field in the RPM
+<filename>.spec</filename> file.
 </summary>
 </cvar>
 
-<cvar name="X_RPM_ICON">
+<cvar name="X_RPM_EPOCH">
 <summary>
-TODO
+This is used to fill in the
+<literal>Epoch:</literal>
+field in the controlling information for RPM packages.
 </summary>
 </cvar>
 
-<cvar name="X_RPM_PACKAGER">
+<cvar name="X_RPM_EXCLUDEARCH">
 <summary>
-TODO
+This is used to fill in the
+<literal>ExcludeArch:</literal>
+field in the RPM
+<filename>.spec</filename> file.
 </summary>
 </cvar>
 
-<cvar name="X_RPM_REQUIRES">
+<cvar name="X_RPM_EXLUSIVEARCH">
 <summary>
-TODO
+This is used to fill in the
+<literal>ExclusiveArch:</literal>
+field in the RPM
+<filename>.spec</filename> file.
 </summary>
 </cvar>
 
-<cvar name="X_RPM_PROVIDES">
+<cvar name="X_RPM_GROUP">
 <summary>
-TODO
+This is used to fill in the
+<literal>Group:</literal>
+field in the RPM
+<filename>.spec</filename> file.
 </summary>
 </cvar>
 
-<cvar name="X_RPM_CONFLICTS">
+<cvar name="X_RPM_GROUP_lang">
 <summary>
-TODO
+This is used to fill in the
+<literal>Group(lang):</literal>
+field in the RPM
+<filename>.spec</filename> file.
+Note that
+<varname>lang</varname>
+is not literal
+and should be replaced by
+the appropriate language code.
 </summary>
 </cvar>
 
-<cvar name="X_RPM_BUILDREQUIRES">
+<cvar name="X_RPM_ICON">
 <summary>
-TODO
+This is used to fill in the
+<literal>Icon:</literal>
+field in the RPM
+<filename>.spec</filename> file.
 </summary>
 </cvar>
 
-<cvar name="X_RPM_SERIAL">
+<cvar name="X_RPM_INSTALL">
 <summary>
-TODO
+internal, but overridable
 </summary>
 </cvar>
 
-<cvar name="X_RPM_EPOCH">
+<cvar name="X_RPM_PACKAGER">
 <summary>
-TODO
+This is used to fill in the
+<literal>Packager:</literal>
+field in the RPM
+<filename>.spec</filename> file.
 </summary>
 </cvar>
 
-<cvar name="X_RPM_AUTOREQPROV">
+<cvar name="X_RPM_PROVIDES">
 <summary>
-TODO
+This is used to fill in the
+<literal>Provides:</literal>
+field in the RPM
+<filename>.spec</filename> file.
 </summary>
 </cvar>
 
-<cvar name="X_RPM_EXCLUDEARCH">
+<cvar name="X_RPM_POSTINSTALL">
 <summary>
-TODO
+This is used to fill in the
+<literal>%post:</literal>
+section in the RPM
+<filename>.spec</filename> file.
 </summary>
 </cvar>
 
-<cvar name="X_RPM_EXLUSIVEARCH">
+<cvar name="X_RPM_PREINSTALL">
 <summary>
-TODO
+This is used to fill in the
+<literal>%pre:</literal>
+section in the RPM
+<filename>.spec</filename> file.
 </summary>
 </cvar>
 
 <cvar name="X_RPM_PREFIX">
 <summary>
-TODO
+This is used to fill in the
+<literal>Prefix:</literal>
+field in the RPM
+<filename>.spec</filename> file.
 </summary>
 </cvar>
 
-<cvar name="X_RPM_CONFLICTS">
-<summary>
-TODO
-</summary>
-</cvar>
-
-<cvar name="X_RPM_BUILDROOT">
+<cvar name="X_RPM_PREP">
 <summary>
 internal, but overridable
 </summary>
 </cvar>
 
-<cvar name="X_RPM_GROUP_<lang>">
+<cvar name="X_RPM_POSTUNINSTALL">
 <summary>
-TODO
+This is used to fill in the
+<literal>%postun:</literal>
+section in the RPM
+<filename>.spec</filename> file.
 </summary>
 </cvar>
 
-<cvar name="X_MSI_LICENSE_TEXT">
+<cvar name="X_RPM_PREUNINSTALL">
 <summary>
-The text of the software license in rtf format. Carriage return chars will be
-replaced with the rtf equivalent \\par.
+This is used to fill in the
+<literal>%preun:</literal>
+section in the RPM
+<filename>.spec</filename> file.
 </summary>
 </cvar>
 
-<cvar name="X_MSI_LANGUAGE">
+<cvar name="X_RPM_REQUIRES">
 <summary>
-TODO
+This is used to fill in the
+<literal>Requires:</literal>
+field in the RPM
+<filename>.spec</filename> file.
 </summary>
 </cvar>
 
-<cvar name="X_MSI_UPGRADE_CODE">
+<cvar name="X_RPM_SERIAL">
 <summary>
-TODO
+This is used to fill in the
+<literal>Serial:</literal>
+field in the RPM
+<filename>.spec</filename> file.
 </summary>
 </cvar>
 
-<cvar name="X_IPK_PRIORITY">
+<cvar name="X_RPM_URL">
 <summary>
-TODO
+This is used to fill in the
+<literal>Url:</literal>
+field in the RPM
+<filename>.spec</filename> file.
 </summary>
 </cvar>
 
-<cvar name="X_IPK_SECTION">
+
+
+<!--
+
+THE FOLLOWING AREN'T CONSTRUCTION VARIABLES,
+THEY'RE "TAGS" THAT CAN BE ATTACHED
+TO DIFFERENT FILES OR DIRECTORIES.
+NOT SURE YET WHAT TO DO ABOUT THESE.
+
+<cvar name="CONFIG">
 <summary>
 TODO
 </summary>
 </cvar>
 
-<cvar name="X_IPK_MAINTAINER">
+<cvar name="CONFIG_NOREPLACE">
 <summary>
 TODO
 </summary>
 </cvar>
 
-<cvar name="X_IPK_DEPENDS">
+<cvar name="DOC">
 <summary>
 TODO
 </summary>
 </cvar>
 
-<cvar name="X_IPK_DESCRIPTION">
+<cvar name="INSTALL_LOCATION">
 <summary>
-default is "$SUMMARY\n$DESCRIPTION"
+internal, but overridable, TODO
 </summary>
 </cvar>
 
-<cvar name="X_IPK_POSTRM">
+<cvar name="LANG_lang">
 <summary>
 TODO
 </summary>
 </cvar>
 
-<cvar name="X_IPK_PRERM">
+<cvar name="UNIX_ATTR">
 <summary>
 TODO
 </summary>
@@ -394,61 +551,49 @@ TODO
 </summary>
 </cvar>
 
-<cvar name="X_IPK_PREINST">
+<cvar name="X_IPK_POSTRM">
 <summary>
 TODO
 </summary>
 </cvar>
 
-</builder>
-
-<builder name="Tag">
-Leaves hints for the Package() Builder on how specific should be packaged.
-All those tags are optional.
-<example>
-Tag( Library( 'lib.c' ), unix-attr="0644" )  # makes sure the built library will
-                                             # be installed with 0644 file
-                                             # access mode
-Tag( 'file2.txt', doc )  # marks file2.txt to be a documentation file
-</example>
-
-<cvar name="INSTALL_LOCATION">
+<cvar name="X_IPK_PREINST">
 <summary>
-internal, but overridable, TODO
+TODO
 </summary>
 </cvar>
 
-<cvar name="CONFIG">
+<cvar name="X_IPK_PRERM">
 <summary>
 TODO
 </summary>
 </cvar>
 
-<cvar name="CONFIG_NOREPLACE">
+<cvar name="X_MSI_FEATURE">
 <summary>
 TODO
 </summary>
 </cvar>
 
-<cvar name="DOC">
+<cvar name="X_MSI_FILEID">
 <summary>
 TODO
 </summary>
 </cvar>
 
-<cvar name="UNIX_ATTR=">
+<cvar name="X_MSI_LONGNAME">
 <summary>
 TODO
 </summary>
 </cvar>
 
-<cvar name="LANG_<lang>">
+<cvar name="X_MSI_SHORTNAME">
 <summary>
 TODO
 </summary>
 </cvar>
 
-<cvar name="X_RPM_VERIFY">
+<cvar name="X_MSI_VITAL">
 <summary>
 TODO
 </summary>
@@ -472,51 +617,42 @@ TODO
 </summary>
 </cvar>
 
-<cvar name="X_MSI_FEATURE=">
+<cvar name="X_RPM_VERIFY">
 <summary>
 TODO
 </summary>
 </cvar>
 
-<cvar name="X_MSI_VITAL">
-<summary>
-TODO
-</summary>
-</cvar>
+-->
 
-<cvar name="X_MSI_FILEID">
-<summary>
-TODO
-</summary>
-</cvar>
 
-<cvar name="X_MSI_LONGNAME">
+<!--
+<builder name="Tag">
 <summary>
-TODO
-</summary>
-</cvar>
+Leaves hints for the Package() Builder on how specific
+files or directories should be packaged.
+All tags are optional.
 
-<cvar name="X_MSI_SHORTNAME">
-<summary>
-TODO
-</summary>
-</cvar>
+<example>
+# makes sure the built library will be installed with 0644 file
+# access mode
+Tag( Library( 'lib.c' ), unix-attr="0644" )
 
-<cvar name="X_MSI_SHORTNAME">
-<summary>
-TODO
+# marks file2.txt to be a documentation file
+Tag( 'file2.txt', doc )
+</example>
 </summary>
-</cvar>
-
 </builder>
 
-<builder name="FindSourceFiles">
-A convenience function which returns all leafs of the build tree.
-</builder>
+<function name="FindSourceFiles">
+<summary>
+A convenience function which returns all leaves of the build tree.
+</summary>
+</function>
 
 <builder name="FindInstalledFiles">
-Returns all files "build" by the install builder.
-</builder>
-
-</tool>
-
+<summary>
+Returns all files "built" by the &b-Install; or &b-InstallAs; builders.
+</summary>
+</function>
+-->
diff --git a/src/engine/SCons/Tool/packaging/rpm.py b/src/engine/SCons/Tool/packaging/rpm.py
index 49b8ff8..94b7b7a 100644
--- a/src/engine/SCons/Tool/packaging/rpm.py
+++ b/src/engine/SCons/Tool/packaging/rpm.py
@@ -41,9 +41,7 @@ def package(env, target, source, PACKAGEROOT, NAME, VERSION,
     # initialize the rpm tool
     SCons.Tool.Tool('rpm').generate(env)
 
-    # create the neccesary builder
     bld = env['BUILDERS']['Rpm']
-    env['RPMFLAGS'] = SCons.Util.CLVar('-ta')
 
     bld.push_emitter(targz_emitter)
     bld.push_emitter(specfile_emitter)
@@ -67,8 +65,9 @@ def package(env, target, source, PACKAGEROOT, NAME, VERSION,
         if kw.has_key('ARCHITECTURE'):
             buildarchitecture = kw['ARCHITECTURE']
 
-        srcrpm = '%s-%s-%s.src.rpm' % (NAME, VERSION, PACKAGEVERSION)
-        binrpm = string.replace(srcrpm, 'src', buildarchitecture)
+        fmt = '%s-%s-%s.%s.rpm'
+        srcrpm = fmt % (NAME, VERSION, PACKAGEVERSION, 'src')
+        binrpm = fmt % (NAME, VERSION, PACKAGEVERSION, buildarchitecture)
 
         target = [ srcrpm, binrpm ]