diff --git a/scons.org/guidelines.php b/scons.org/guidelines.php
index 47184850..33393082 100644
--- a/scons.org/guidelines.php
+++ b/scons.org/guidelines.php
@@ -9,7 +9,7 @@
SCons Developer's Guidelines
-
28 September 2004
+
22 May 2006
-
General
@@ -18,10 +18,10 @@ General
-
All SCons software (SCons itself, tests, supporting utilities) will be
-written to Python version 1.5.2.
+written to work with Python version 1.5.2.
-
-SCons will be tested against Python versions 1.5.2 and 2.2.x.
+SCons will be tested against Python versions 1.5.2 and some version of 2.x.
-
The SCons distribution will be generated
@@ -37,7 +37,7 @@ SCons installation will be atomic, and will install all necessary
non-standard modules and/or packages.
-
-At a minimum, SCons will be tested on Linux and Windows 2000. We will add
+At a minimum, SCons will be tested on Linux and Windows XP. We will add
other platforms as they become available. All tests must be written
portably.
@@ -62,9 +62,13 @@ Aegis.
SCons infrastructure module tests are written using PyUnit.
-
-Tests of full SCons script functionality are written using the
+Tests of SCons packaging are written using subclasses of the
TestCmd.py module.
+-
+Tests of full SCons script functionality are written using subclasses
+of the TestCmd.py module.
+
@@ -136,8 +140,8 @@ the infrastructure as needed to continue to make testing even easier, so
long as it still does the job.
-SCons development uses two testing methodologies, one for unit tests and
-one for end-to-end functional tests:
+SCons development uses three (!) testing harnesses, one for unit tests,
+one for end-to-end functional tests, and one for test execution:
-
@@ -158,14 +162,23 @@ one for end-to-end functional tests:
live in the
test/
subdirectory and which use the
TestCmd.py infrastructure.
+ -
+ Execution of these tests will be handled by the
+ QMTest
+ infrastructure, as wrapped by an execution script.
+ Note: The transition to using
+ QMTest is still in progress. The wrapper execution script
+ currently executes the test scripts directly.
+
-The end-to-end tests in the test/
subdirectory are not
-substitutes for module unit tests. If you modify a module under the
-src/scons/
subdirectory, you *must* modify its
-*Tests.py
script to validate your change. This can be
-(and probably should be) in addition to a test/*
-test of how the modification affects the end-to-end workings of SCons.
+The end-to-end tests in the test/
subdirectory are
+not substitutes for module unit tests. If you modify a module
+under the src/scons/
subdirectory, you generally
+mustmodify its *Tests.py
script to
+validate your change. This can be (and probably should be) in addition to
+a test/*
test of how the modification affects the end-to-end
+workings of SCons.
@@ -176,16 +189,17 @@ General developer requirements
-
-All developers must subscribe to the dev@scons.tigris.org mailing list.
+All project developers must subscribe to the dev@scons.tigris.org
+mailing list.
-
-All developers are encouraged, but not required, to register at
-Tigris.org and SourceForge.
+All project developers must register at Tigris.org and be added to the
+SCons developer list, so that the number of active developers can be
+accurately represented on the SCons project page.
-
-Developers registered at SourceForge should be added to the SCons
-developer list, so that the number of active developers can be
-accurately represented on the SCons project page.
+We will accept patches from developers not actually registered on
+the project, so long as the patches conform to our normal requirements.
@@ -237,7 +251,7 @@ automatically to the Tigris.org and SourceForge CVS repositories.
-Using CVS for SCons development
+Using Subversion for SCons development
-