diff options
| -rw-r--r-- | runtest.py | 2 | ||||
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 10 | ||||
| -rw-r--r-- | src/engine/SCons/Script/__init__.py | 1 | ||||
| -rw-r--r-- | test/Repository/option-n.py | 94 | ||||
| -rw-r--r-- | test/option-n.py | 57 |
6 files changed, 165 insertions, 2 deletions
@@ -279,6 +279,8 @@ else: scons_lib_dir = ld or os.path.join(cwd, 'src', 'engine') + pythonpath_dir = scons_lib_dir + if scons: # Let the version of SCons that the -x option pointed to find # its own modules. diff --git a/src/CHANGES.txt b/src/CHANGES.txt index c3b9d869..a97caaa7 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -70,6 +70,9 @@ RELEASE 0.09 - flavors) to help people who want to ship SCons as a stand-alone build tool in their software packages. + - Prevent SCons from unlinking files in certain situations when + the -n option is used. + From Steven Knight and Anthony Roach: - Man page: document the fact that Builder calls return Node objects. diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index 9976ef25..a3ac7bee 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -46,6 +46,8 @@ import sys import SCons.Errors import SCons.Warnings +execute_actions = 1 + try: import os _link = os.link @@ -834,6 +836,8 @@ class File(Entry): if isinstance(p, ParentOfRoot): raise SCons.Errors.StopError, parent.path parent = p + if not execute_actions: + return listDirs.reverse() for dirnode in listDirs: try: @@ -861,7 +865,8 @@ class File(Entry): if self.exists(): if self.builder and not self.precious: - os.unlink(self.path) + if execute_actions: + os.unlink(self.path) if hasattr(self, '_exists'): delattr(self, '_exists') else: @@ -909,7 +914,8 @@ class File(Entry): if self._local: # ...and they'd like a local copy. print "Local copy of %s from %s" % (self.path, r.path) - file_link(r.path, self.path) + if execute_actions: + file_link(r.path, self.path) self.set_bsig(bsig) self.store_bsig() return 1 diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py index 57d0eeb0..338b98fc 100644 --- a/src/engine/SCons/Script/__init__.py +++ b/src/engine/SCons/Script/__init__.py @@ -641,6 +641,7 @@ def _main(): _setup_warn(options.warn) if options.noexec: SCons.Action.execute_actions = None + SCons.Node.FS.execute_actions = None CleanTask.execute = CleanTask.show if options.no_progress or options.silent: global display diff --git a/test/Repository/option-n.py b/test/Repository/option-n.py new file mode 100644 index 00000000..b4beda72 --- /dev/null +++ b/test/Repository/option-n.py @@ -0,0 +1,94 @@ +#!/usr/bin/env python +# +# Copyright (c) 2001, 2002 Steven Knight +# +# 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. +# + +""" +This test verifies that building using the -n option doesn't create a +local copy of a file specified as Local() in the SConstruct. +""" + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +import os.path +import sys +import TestSCons + +test = TestSCons.TestSCons() + +test.subdir('repository', ['repository', 'src'], + 'work', ['work', 'src']) + +repository_aaa_out = test.workpath('repository', 'aaa.out') +work_aaa_out = test.workpath('work', 'aaa.out') + +opts = "-Y " + test.workpath('repository') + +# +test.write(['repository', 'SConstruct'], r""" +def copy(env, source, target): + source = str(source[0]) + target = str(target[0]) + print 'copy() < %s > %s' % (source, target) + open(target, "wb").write(open(source, "rb").read()) + +Build = Builder(action=copy) +env = Environment(BUILDERS={'Build':Build}) +env.Build('aaa.out', 'aaa.in') +Local('aaa.out') +""") + +test.write(['repository', 'aaa.in'], "repository/aaa.in\n") + +# +test.run(chdir = 'repository', options = opts, arguments = '.') + +test.fail_test(test.read(repository_aaa_out) != "repository/aaa.in\n") + +test.up_to_date(chdir = 'repository', options = opts, arguments = '.') + +# Make the entire repository non-writable, so we'll detect +# if we try to write into it accidentally. +test.writable('repository', 0) + +# +expect = test.wrap_stdout("""\ +Local copy of aaa.out from %s +scons: "aaa.out" is up to date. +""" % repository_aaa_out) + +test.run(chdir = 'work', + options = opts, + arguments = '-n aaa.out', + stdout = expect) + +test.fail_test(os.path.exists(work_aaa_out)) + +test.run(chdir = 'work', + options = opts, + arguments = 'aaa.out', + stdout = expect) + +test.fail_test(test.read(work_aaa_out) != "repository/aaa.in\n") + +# +test.pass_test() diff --git a/test/option-n.py b/test/option-n.py index 0fed3d00..5871978d 100644 --- a/test/option-n.py +++ b/test/option-n.py @@ -22,6 +22,18 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # +""" +This test verifies: + 1) that we don't build files when we use the -n, --no-exec, + --just-print, --dry-run, and --recon options; + 2) that we don't remove built files when -n is used in + conjunction with -c; + 3) that files installed by the Install() method don't get + installed when -n is used; + 4) that source files don't get duplicated in a BuildDir + when -n is used. +""" + __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os.path @@ -33,6 +45,8 @@ python = sys.executable test = TestSCons.TestSCons() +test.subdir('build', 'src') + test.write('build.py', r""" import sys file = open(sys.argv[1], 'wb') @@ -45,10 +59,20 @@ MyBuild = Builder(action = r'%s build.py $TARGETS') env = Environment(BUILDERS = { 'MyBuild' : MyBuild }) env.MyBuild(target = 'f1.out', source = 'f1.in') env.MyBuild(target = 'f2.out', source = 'f2.in') +env.Install('install', 'f3.in') +BuildDir('build', 'src', duplicate=1) +SConscript('build/SConscript', "env") """ % python) +test.write(['src', 'SConscript'], """ +Import("env") +env.MyBuild(target = 'f4.out', source = 'f4.in') +""") + test.write('f1.in', "f1.in\n") test.write('f2.in', "f2.in\n") +test.write('f3.in', "f3.in\n") +test.write(['src', 'f4.in'], "src/f4.in\n") args = 'f1.out f2.out' expect = test.wrap_stdout("%s build.py f1.out\n%s build.py f2.out\n" % (python, python)) @@ -93,5 +117,38 @@ test.run(arguments = '-c -n ' + args, stdout = expect) test.fail_test(not os.path.exists(test.workpath('f1.out'))) test.fail_test(not os.path.exists(test.workpath('f2.out'))) +# XXX Because Install is a function action, it doesn't know how +# to print what's going on when -n is used. Following the +# directions on the XXX lines below whenever that gets fixed. +# +# XXX Uncomment the next line and remove the one after it when we +# fix the Install print during -n. +#expect = test.wrap_stdout('Install file: "f3.in" as "install/f3.in"\n') +expect = test.wrap_stdout('') + +test.run(arguments = '-n install', stdout = expect) +test.fail_test(os.path.exists(test.workpath('install', 'f3.in'))) + +# XXX Remove the next line when we fix the Install print during -n. +expect = test.wrap_stdout('Install file: "f3.in" as "install/f3.in"\n') + +test.run(arguments = 'install', stdout = expect) +test.fail_test(not os.path.exists(test.workpath('install', 'f3.in'))) + +test.write('f3.in', "f3.in again\n") + +# XXX Remove the next line when we fix the Install print during -n. +expect = test.wrap_stdout('') + +test.run(arguments = '-n install', stdout = expect) +test.fail_test(not os.path.exists(test.workpath('install', 'f3.in'))) + +# This last test (duplicate BuildDir files not getting created when +# -n is used) still fails, but it's going to take more time to +# work out the details of the fix. And since it's not a bug that +# destroys anything, we're going to leave it alone for now. +#test.run(arguments = '-n build') +#test.fail_test(os.path.exists(test.workpath('build', 'f4.in'))) + test.pass_test() |