diff options
| -rw-r--r-- | src/CHANGES.txt | 10 | ||||
| -rw-r--r-- | src/engine/SCons/Environment.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 7 | ||||
| -rw-r--r-- | src/engine/SCons/Script/Main.py | 1 | ||||
| -rw-r--r-- | test/SConsignFile.py | 112 | ||||
| -rw-r--r-- | test/SConsignFile/default.py | 82 | ||||
| -rw-r--r-- | test/SConsignFile/explicit-file.py | 82 | ||||
| -rw-r--r-- | test/SConsignFile/make-directory.py | 62 |
8 files changed, 246 insertions, 114 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index c3772fc..8dbe8d5 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -78,6 +78,16 @@ RELEASE 1.X - XXX - Make Glob() sort the returned list of Files or Nodes to prevent spurious rebuilds. + From Damyan Pepper: + + - Add a test case to verify that SConsignFile() files can be + created in previously non-existent subdirectories. + + From Jim Randall: + + - Make the subdirectory in which the SConsignFile() file will + live, if the subdirectory doesn't already exist. + From Ali Tofigh: - Add a test to verify duplication of files in VariantDir subdirectories. diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py index 9377610..9c04ec5 100644 --- a/src/engine/SCons/Environment.py +++ b/src/engine/SCons/Environment.py @@ -1910,6 +1910,10 @@ class Base(SubstitutionEnvironment): name = self.subst(name) if not os.path.isabs(name): name = os.path.join(str(self.fs.SConstruct_dir), name) + name = os.path.normpath(name) + sconsign_dir = os.path.dirname(name) + if sconsign_dir and not os.path.exists(sconsign_dir): + self.Execute(SCons.Defaults.Mkdir(sconsign_dir)) SCons.SConsign.File(name, dbm_module) def SideEffect(self, side_effect, target): diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index 8d11e4e..b8762dc 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -59,6 +59,8 @@ import SCons.Warnings from SCons.Debug import Trace +do_store_info = True + # The max_drift value: by default, use a cached signature value for # any file that's been untouched for more than two days. default_max_drift = 2*24*60*60 @@ -2269,7 +2271,8 @@ class File(Base): # This accomodates "chained builds" where a file that's a target # in one build (SConstruct file) is a source in a different build. # See test/chained-build.py for the use case. - self.dir.sconsign().store_info(self.name, self) + if do_store_info: + self.dir.sconsign().store_info(self.name, self) convert_copy_attrs = [ 'bsources', @@ -2395,7 +2398,7 @@ class File(Base): try: sconsign_entry = self.dir.sconsign().get_entry(self.name) - except (KeyError, OSError): + except (KeyError, EnvironmentError): import SCons.SConsign sconsign_entry = SCons.SConsign.SConsignEntry() sconsign_entry.binfo = self.new_binfo() diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index 12e7fba..76b94e0 100644 --- a/src/engine/SCons/Script/Main.py +++ b/src/engine/SCons/Script/Main.py @@ -988,6 +988,7 @@ def _build_targets(fs, options, targets, target_top): display.set_mode(not options.silent) SCons.Action.print_actions = not options.silent SCons.Action.execute_actions = not options.no_exec + SCons.Node.FS.do_store_info = not options.no_exec SCons.SConf.dryrun = options.no_exec if options.diskcheck: diff --git a/test/SConsignFile.py b/test/SConsignFile.py deleted file mode 100644 index e2b8053..0000000 --- a/test/SConsignFile.py +++ /dev/null @@ -1,112 +0,0 @@ -#!/usr/bin/env python -# -# __COPYRIGHT__ -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" - -import TestSCons -import os.path - -_python_ = TestSCons._python_ - -test = TestSCons.TestSCons() - -test.subdir('work1', ['work1', 'subdir']) -test.subdir('work2', ['work2', 'subdir']) - -test.write('build.py', r""" -import sys -contents = open(sys.argv[2], 'rb').read() -file = open(sys.argv[1], 'wb') -file.write(contents) -file.close() -""") - -# -test.write(['work1', 'SConstruct'], """ -SConsignFile() -B = Builder(action = '%(_python_)s ../build.py $TARGETS $SOURCES') -env = Environment(BUILDERS = { 'B' : B }) -env.B(target = 'f1.out', source = 'f1.in') -env.B(target = 'f2.out', source = 'f2.in') -env.B(target = 'subdir/f3.out', source = 'subdir/f3.in') -env.B(target = 'subdir/f4.out', source = 'subdir/f4.in') -""" % locals()) - -test.write(['work1', 'f1.in'], "work1/f1.in\n") -test.write(['work1', 'f2.in'], "work1/f2.in\n") -test.write(['work1', 'subdir', 'f3.in'], "work1/subdir/f3.in\n") -test.write(['work1', 'subdir', 'f4.in'], "work1/subdir/f4.in\n") - -test.run(chdir = 'work1') - -test.must_exist(test.workpath('work1', '.sconsign.dblite')) -test.must_not_exist(test.workpath('work1', '.sconsign')) -test.must_not_exist(test.workpath('work1', 'subdir', '.sconsign')) - -test.must_match(['work1', 'f1.out'], "work1/f1.in\n") -test.must_match(['work1', 'f2.out'], "work1/f2.in\n") -test.must_match(['work1', 'subdir', 'f3.out'], "work1/subdir/f3.in\n") -test.must_match(['work1', 'subdir', 'f4.out'], "work1/subdir/f4.in\n") - -test.up_to_date(chdir = 'work1', arguments = '.') - -test.must_exist(test.workpath('work1', '.sconsign.dblite')) -test.must_not_exist(test.workpath('work1', '.sconsign')) -test.must_not_exist(test.workpath('work1', 'subdir', '.sconsign')) - -# -test.write(['work2', 'SConstruct'], """ -e = Environment(XXX = 'scons') -e.SConsignFile('my_${XXX}ign') -B = Builder(action = '%(_python_)s ../build.py $TARGETS $SOURCES') -env = Environment(BUILDERS = { 'B' : B }) -env.B(target = 'f5.out', source = 'f5.in') -env.B(target = 'f6.out', source = 'f6.in') -env.B(target = 'subdir/f7.out', source = 'subdir/f7.in') -env.B(target = 'subdir/f8.out', source = 'subdir/f8.in') -""" % locals()) - -test.write(['work2', 'f5.in'], "work2/f5.in\n") -test.write(['work2', 'f6.in'], "work2/f6.in\n") -test.write(['work2', 'subdir', 'f7.in'], "work2/subdir/f7.in\n") -test.write(['work2', 'subdir', 'f8.in'], "work2/subdir/f8.in\n") - -test.run(chdir = 'work2') - -test.must_exist(test.workpath('work2', 'my_sconsign.dblite')) -test.must_not_exist(test.workpath('work2', '.sconsign')) -test.must_not_exist(test.workpath('work2', 'subdir', '.sconsign')) - -test.must_match(['work2', 'f5.out'], "work2/f5.in\n") -test.must_match(['work2', 'f6.out'], "work2/f6.in\n") -test.must_match(['work2', 'subdir', 'f7.out'], "work2/subdir/f7.in\n") -test.must_match(['work2', 'subdir', 'f8.out'], "work2/subdir/f8.in\n") - -test.up_to_date(chdir = 'work2', arguments = '.') - -test.must_exist(test.workpath('work2', 'my_sconsign.dblite')) -test.must_not_exist(test.workpath('work2', '.sconsign')) -test.must_not_exist(test.workpath('work2', 'subdir', '.sconsign')) - -test.pass_test() diff --git a/test/SConsignFile/default.py b/test/SConsignFile/default.py new file mode 100644 index 0000000..2e76c3d --- /dev/null +++ b/test/SConsignFile/default.py @@ -0,0 +1,82 @@ +#!/usr/bin/env python +# +# __COPYRIGHT__ +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +""" +Verify the default behavior of SConsignFile(), called with no arguments. +""" + +import TestSCons +import os.path + +_python_ = TestSCons._python_ + +test = TestSCons.TestSCons() + +test.subdir('subdir') + +test.write('build.py', r""" +import sys +contents = open(sys.argv[2], 'rb').read() +file = open(sys.argv[1], 'wb') +file.write(contents) +file.close() +sys.exit(0) +""") + +# +test.write('SConstruct', """ +SConsignFile() +B = Builder(action = '%(_python_)s build.py $TARGETS $SOURCES') +env = Environment(BUILDERS = { 'B' : B }) +env.B(target = 'f1.out', source = 'f1.in') +env.B(target = 'f2.out', source = 'f2.in') +env.B(target = 'subdir/f3.out', source = 'subdir/f3.in') +env.B(target = 'subdir/f4.out', source = 'subdir/f4.in') +""" % locals()) + +test.write('f1.in', "f1.in\n") +test.write('f2.in', "f2.in\n") +test.write(['subdir', 'f3.in'], "subdir/f3.in\n") +test.write(['subdir', 'f4.in'], "subdir/f4.in\n") + +test.run() + +test.must_exist(test.workpath('.sconsign.dblite')) +test.must_not_exist(test.workpath('.sconsign')) +test.must_not_exist(test.workpath('subdir', '.sconsign')) + +test.must_match('f1.out', "f1.in\n") +test.must_match('f2.out', "f2.in\n") +test.must_match(['subdir', 'f3.out'], "subdir/f3.in\n") +test.must_match(['subdir', 'f4.out'], "subdir/f4.in\n") + +test.up_to_date(arguments = '.') + +test.must_exist(test.workpath('.sconsign.dblite')) +test.must_not_exist(test.workpath('.sconsign')) +test.must_not_exist(test.workpath('subdir', '.sconsign')) + +test.pass_test() diff --git a/test/SConsignFile/explicit-file.py b/test/SConsignFile/explicit-file.py new file mode 100644 index 0000000..1c087ac --- /dev/null +++ b/test/SConsignFile/explicit-file.py @@ -0,0 +1,82 @@ +#!/usr/bin/env python +# +# __COPYRIGHT__ +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +""" +Verify the default behavior of SConsignFile(), called with no arguments. +""" + +import TestSCons +import os.path + +_python_ = TestSCons._python_ + +test = TestSCons.TestSCons() + +test.subdir('subdir') + +test.write('build.py', r""" +import sys +contents = open(sys.argv[2], 'rb').read() +file = open(sys.argv[1], 'wb') +file.write(contents) +file.close() +""") + +# +test.write('SConstruct', """ +e = Environment(XXX = 'scons') +e.SConsignFile('my_${XXX}ign') +B = Builder(action = '%(_python_)s build.py $TARGETS $SOURCES') +env = Environment(BUILDERS = { 'B' : B }) +env.B(target = 'f5.out', source = 'f5.in') +env.B(target = 'f6.out', source = 'f6.in') +env.B(target = 'subdir/f7.out', source = 'subdir/f7.in') +env.B(target = 'subdir/f8.out', source = 'subdir/f8.in') +""" % locals()) + +test.write('f5.in', "f5.in\n") +test.write('f6.in', "f6.in\n") +test.write(['subdir', 'f7.in'], "subdir/f7.in\n") +test.write(['subdir', 'f8.in'], "subdir/f8.in\n") + +test.run() + +test.must_exist(test.workpath('my_sconsign.dblite')) +test.must_not_exist(test.workpath('.sconsign')) +test.must_not_exist(test.workpath('subdir', '.sconsign')) + +test.must_match('f5.out', "f5.in\n") +test.must_match('f6.out', "f6.in\n") +test.must_match(['subdir', 'f7.out'], "subdir/f7.in\n") +test.must_match(['subdir', 'f8.out'], "subdir/f8.in\n") + +test.up_to_date(arguments = '.') + +test.must_exist(test.workpath('my_sconsign.dblite')) +test.must_not_exist(test.workpath('.sconsign')) +test.must_not_exist(test.workpath('subdir', '.sconsign')) + +test.pass_test() diff --git a/test/SConsignFile/make-directory.py b/test/SConsignFile/make-directory.py new file mode 100644 index 0000000..819b5e2 --- /dev/null +++ b/test/SConsignFile/make-directory.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python +# +# __COPYRIGHT__ +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +""" +Verify the ability to make a SConsignFile() in a non-existent +subdirectory. +""" + +import TestSCons + +test = TestSCons.TestSCons() + +test.write('SConstruct', """ +import SCons.dblite +env = Environment() +env.SConsignFile("sub/dir/sconsign", SCons.dblite) +env.Install('bar', 'foo.txt') +""") + +test.write('foo.txt', "Foo\n") + +expect = test.wrap_stdout(read_str = 'Mkdir("sub/dir")\n', + build_str = 'Install file: "foo.txt" as "bar/foo.txt"\n') + +test.run(options='-n', stdout=expect) + +test.must_not_exist(['bar', 'foo.txt']) + +test.must_not_exist('sub') +test.must_not_exist(['sub', 'dir']) +test.must_not_exist(['sub', 'dir', '.sconsign.dblite']) + +test.run(stdout=expect) + +test.must_match(['bar', 'foo.txt'], "Foo\n") + +test.must_exist(['sub', 'dir', 'sconsign.dblite']) + +test.pass_test() |