summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2002-12-06 02:36:23 (GMT)
committerSteven Knight <knight@baldmt.com>2002-12-06 02:36:23 (GMT)
commit33fc59eca6af0a6e509e1987efc9a1bfa4ad133a (patch)
treebd66581c3d4799a0aa9c2c5f6ac5fa76d3b6c93d /config
parentcbf751b2a58f446e7a6a4230c918c4816710b3fa (diff)
downloadSCons-33fc59eca6af0a6e509e1987efc9a1bfa4ad133a.zip
SCons-33fc59eca6af0a6e509e1987efc9a1bfa4ad133a.tar.gz
SCons-33fc59eca6af0a6e509e1987efc9a1bfa4ad133a.tar.bz2
Fix integration builds, put back symlinks temporarily.
Diffstat (limited to 'config')
-rw-r--r--config14
1 files changed, 7 insertions, 7 deletions
diff --git a/config b/config
index 331e9e5..3593c70 100644
--- a/config
+++ b/config
@@ -23,20 +23,20 @@
*
* Look in aesub(5) for more information about command substitutions.
*/
-build_command = "SCONS_LIB_DIR=${BaseLine}/build/scons-src/src/engine python ${Source src/script/scons.py} -Y${SUBSTitute : \\ -Y $Search_Path} date='${DAte %Y/%m/%d %H:%M:%S}' developer=${DEVeloper} version=${VERsion} change=${Change}";
+build_command = "SCONS_LIB_DIR=src/engine python ${Source src/script/scons.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;
/*
-integrate_begin_command =
- "";
-*/
+ * This is set temporarily to allow us to build using the SCons
+ * currently checked in to the src directory.
+ */
+create_symlinks_before_build = true;
/*
* aegis - project change supervisor
@@ -213,7 +213,7 @@ diff_command =
/*
* We use a runtest.pl script to execute tests. This takes care of
- * massaging environment variables and the like to test agains the
+ * massaging environment variables and the like to test against the
* unpacked package in the current directory.
*
* Note that we must include $spe in the batch_test_command line (so