Merged revisions 2647-2719 via svnmerge from

[scons.git] / test / Deprecated / SConscript-build_dir.py

diff --git a/test/BuildDir/Sconscript-build_dir.py b/test/Deprecated/SConscript-build_dir.py
similarity index 95%
rename from test/BuildDir/Sconscript-build_dir.py
rename to test/Deprecated/SConscript-build_dir.py
index 50e2c4f2d4d698320ae2ddfaa71cf460867064f1..1e623af0779b689773ef34e8805e595deccc4f58 100644 (file)
--- a/test/BuildDir/Sconscript-build_dir.py
+++ b/test/Deprecated/SConscript-build_dir.py
@@ -25,7 +25,9 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 """
-Verify that specifying a build_dir argument to SConscript works properly.
+Verify that specifying a build_dir argument to SConscript still works.
+
+Note that the build_dir argument does not yet print a deprecation warning.
 """
 
 import TestSCons
@@ -75,7 +77,7 @@ SConscript('src/SConscript', build_dir='build/var2', src_dir=src)
 
 SConscript('src/SConscript', build_dir='build/var3', duplicate=0)
 
-#XXX We can't support var4 and var5 yet, because our BuildDir linkage
+#XXX We can't support var4 and var5 yet, because our VariantDir linkage
 #XXX is to an entire source directory.  We haven't yet generalized our
 #XXX infrastructure to be able to take the SConscript file from one source
 #XXX directory, but the rest of the files from a different one.
@@ -92,7 +94,7 @@ env.SConscript('src/SConscript', build_dir='../$BUILD/var8', duplicate=0)
 # we set the path of the SConscript accordingly.  The below is
 # equivalent to saying:
 #
-# BuildDir('build/var9', '.')
+# VariantDir('build/var9', '.')
 # SConscript('build/var9/src/SConscript')
 SConscript('src/SConscript', build_dir='build/var9', src_dir='.')
 """) 
@@ -123,7 +125,7 @@ all_alt = "test/alt/aaa.in\ntest/alt/bbb.in\ntest/alt/ccc.in\n"
 test.must_match(all1, all_src)
 test.must_match(all2, all_src)
 test.must_match(all3, all_src)
-#XXX We can't support var4 and var5 yet, because our BuildDir linkage
+#XXX We can't support var4 and var5 yet, because our VariantDir linkage
 #XXX is to an entire source directory.  We haven't yet generalized our
 #XXX infrastructure to be able to take the SConscript file from one source
 #XXX directory, but the rest of the files from a different one.
@@ -161,7 +163,7 @@ test.must_not_exist(test.workpath('test', 'build', 'var3', 'aaa.in'))
 test.must_not_exist(test.workpath('test', 'build', 'var3', 'bbb.in'))
 test.must_not_exist(test.workpath('test', 'build', 'var3', 'ccc.in'))
  
-#XXX We can't support var4 and var5 yet, because our BuildDir linkage
+#XXX We can't support var4 and var5 yet, because our VariantDir linkage
 #XXX is to an entire source directory.  We haven't yet generalized our
 #XXX infrastructure to be able to take the SConscript file from one source
 #XXX directory, but the rest of the files from a different one.
@@ -170,7 +172,7 @@ test.must_not_exist(test.workpath('test', 'build', 'var3', 'ccc.in'))
 #XXXtest.must_not_exist(test.workpath('test', 'build', 'var4', 'bbb.in'))
 #XXXtest.must_not_exist(test.workpath('test', 'build', 'var4', 'ccc.in'))
 
-#XXX We can't support var4 and var5 yet, because our BuildDir linkage
+#XXX We can't support var4 and var5 yet, because our VariantDir linkage
 #XXX is to an entire source directory.  We haven't yet generalized our
 #XXX infrastructure to be able to take the SConscript file from one source
 #XXX directory, but the rest of the files from a different one.