Fix XML in documentation, and in the bin/scons-doc.py script that generates

[scons.git] / config

diff --git a/config b/config
index 0769a2bc7fe8d7be984668c32b1537951aa07efa..b055bdb279db7b37b1e50800a32947900c0de254 100644 (file)
--- a/config
+++ b/config
@@ -50,15 +50,16 @@
  *
  * Look in aesub(5) for more information about command substitutions.
  */
-build_command = "python ${Source bootstrap.py} -Y${SUBSTitute : \\ -Y $Search_Path} date='${DAte %Y/%m/%d %H:%M:%S}' developer=${DEVeloper} version=${VERsion} change=${Change}";
+build_command = "python2.1 ${Source bootstrap.py} -Y${SUBSTitute : \\ -Y $Search_Path} date='${DAte %Y/%m/%d %H:%M:%S}' developer=${DEVeloper} version=${VERsion} change=${Change}";
 
 /*
  * SCons removes its targets before constructing them, which qualifies it
  * for the following entry in the config file.  The files must be removed
  * first, otherwise the baseline would cease to be self-consistent.
-link_integration_directory = true;
  */
 
+link_integration_directory = true;
+
 /*
  * This is set temporarily to allow us to build using the SCons
  * currently checked in to the src directory.
@@ -233,13 +234,20 @@ merge -p -L baseline -L C$c ${quote $mostrecent} ${quote $original} \
 ${quote $input} > ${quote $output}; \
 test $? -le 1";
 
+/*
+ * The diff command in Red Hat 8.0 changed the exit status so it *fails*
+ * when *it* thinks it's trying to diff a binary (non-ASCII-text) file.
+ * The -a option disables this behavior and makes diff's exit status
+ * behave like it used to, even on any binary files we have checked in.
+ */
+
 diff_command =
        "set +e; \
-       diff -c ${quote $original} ${quote $input} > ${quote $output}; \
+       diff -a -c ${quote $original} ${quote $input} > ${quote $output}; \
        test $? -le 1";
 
 /*
- * We use a runtest.pl script to execute tests.  This takes care of
+ * We use a runtest.py script to execute tests.  This takes care of
  * massaging environment variables and the like to test against the
  * unpacked package in the current directory.
  *
@@ -250,9 +258,9 @@ diff_command =
  * is set appropriately during a baseline test.  So we just use the
  * proper aesub variable to comment out the expanded $spe.
  */
-test_command = "python ${Source runtest.py Absolute} -p tar-gz -v ${SUBSTitute '\\.[CD][0-9]+$' '' ${VERsion}} -q ${File_Name}";
+test_command = "python1.5 ${Source runtest.py Absolute} --noqmtest -p tar-gz -t -v ${SUBSTitute '\\.[CD][0-9]+$' '' ${VERsion}} -q --sp ${Search_Path} --spe ${Search_Path_Executable} ${File_Name}";
 
-batch_test_command = "python ${Source runtest.py Absolute} -p tar-gz -v ${SUBSTitute '\\.[CD][0-9]+$' '' ${VERsion}} -o ${Output} ${File_Names} ${COMment $spe}";
+batch_test_command = "python1.5 ${Source runtest.py Absolute} --noqmtest -p tar-gz -t -v ${SUBSTitute '\\.[CD][0-9]+$' '' ${VERsion}} -o ${Output} --aegis  --sp ${Search_Path} --spe ${Search_Path_Executable} ${File_Names}";
 
 new_test_filename = "test/CHANGETHIS.py";
 
@@ -278,3 +286,14 @@ file_template =
                body = "${read_file ${source template/test.py abs}}";
        },
 ];
+
+/*
+ * Command for distributing changes from Aegis to all of the repositories
+ * we want to mirror the information.
+ *
+ * XXX Uncomment after upgrading to an Aegis version that supports this.
+
+integrate_pass_notify_command =
+        "$sh ${s bin/scons-cdist} -p $project $change";
+ *
+ */