Don't remove source files specified on the command line!

git-svn-id: http://scons.tigris.org/svn/scons/trunk@448 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 7eaf87fa8ec5d6d9e298a56a4759acc1da2373b4..74b562132e30226b980847af2782ae195664cd14 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -22,6 +22,8 @@ RELEASE 0.09 -
  - Fix auto-deduction of target names so that deduced targets end
    up in the same subdirectory as the source.
 
+ - Don't remove source files specified on the command line!
+
  From Anthony Roach:
 
  - Fixed use of command lines with spaces in their arguments,

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 5d01314c2bf2557f042692d9a76f11ad57742118..96381e3b3a620c75f9e7aecdbb55265147ce2317 100644 (file)
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -773,7 +773,7 @@ class File(Entry):
     def prepare(self):
         """Prepare for this file to be created."""
         if self.exists():
-            if not self.precious:
+            if self.builder and not self.precious:
                 os.unlink(self.path)
                 if hasattr(self, '_exists'):
                     delattr(self, '_exists')

diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index 24a508beb0159c1761a99c5c934f18e4f11bddc3..3bba3f4d33bda9407342988f2dfc5a8198d8e102 100644 (file)
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -493,9 +493,16 @@ class FSTestCase(unittest.TestCase):
         nonexistent(fs.Dir, 'nonexistent')
         nonexistent(fs.Dir, 'nonexistent/foo')
 
+        test.write("preserve_me", "\n")
+        assert os.path.exists(test.workpath("preserve_me"))
+        f1 = fs.File(test.workpath("preserve_me"))
+        f1.prepare()
+        assert os.path.exists(test.workpath("preserve_me"))
+
         test.write("remove_me", "\n")
         assert os.path.exists(test.workpath("remove_me"))
         f1 = fs.File(test.workpath("remove_me"))
+        f1.builder = 1
         f1.prepare()
         assert not os.path.exists(test.workpath("remove_me"))
 

diff --git a/test/preserve-source.py b/test/preserve-source.py
new file mode 100644 (file)
index 0000000..4ca9cd6
--- /dev/null
+++ b/test/preserve-source.py
@@ -0,0 +1,61 @@
+#!/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.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os.path
+import sys
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+#
+test.write('SConstruct', r"""
+def cat(env, source, target):
+    target = str(target[0])
+    source = map(str, source)
+    print 'cat(%s) > %s' % (source, target)
+    f = open(target, "wb")
+    for src in source:
+        f.write(open(src, "rb").read())
+    f.close()
+
+env = Environment(BUILDERS={'Build':Builder(action=cat)})
+env.Build('aaa.out', 'aaa.in')
+""")
+
+test.write('aaa.in', "aaa.in\n")
+
+#
+test.run(arguments = '.')
+
+test.fail_test(test.read('aaa.out') != "aaa.in\n")
+
+#
+test.run(arguments = "aaa.in", stdout = "")
+
+test.fail_test(not os.path.exists('aaa.in'))
+
+#
+test.pass_test()