diff options
-rw-r--r-- | src/CHANGES.txt | 4 | ||||
-rw-r--r-- | src/engine/SCons/Tool/BitKeeper.py | 66 | ||||
-rw-r--r-- | src/engine/SCons/Tool/BitKeeper.xml | 123 | ||||
-rw-r--r-- | src/engine/SCons/Tool/__init__.py | 2 | ||||
-rw-r--r-- | test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOM.py | 140 | ||||
-rw-r--r-- | test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOMSTR.py | 141 | ||||
-rw-r--r-- | test/Deprecated/SourceCode/BitKeeper/BitKeeper.py | 383 |
7 files changed, 3 insertions, 856 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 67bd2a3..cc9ab5a 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -30,8 +30,8 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Fixed SCons.Tool.Packaging.rpm.package source nondeterminism across builds. From William Deegan: - - Removed deprecated source code tool Perforce. - + - Removed deprecated source code tool Perforce, BitKeeper. + From Daniel Moody: - Fixed msvs.py for Visual Studio generated projects which were creating invalid xml for greater than and less than symbols. diff --git a/src/engine/SCons/Tool/BitKeeper.py b/src/engine/SCons/Tool/BitKeeper.py deleted file mode 100644 index 44632d7..0000000 --- a/src/engine/SCons/Tool/BitKeeper.py +++ /dev/null @@ -1,66 +0,0 @@ -"""SCons.Tool.BitKeeper.py - -Tool-specific initialization for the BitKeeper source code control -system. - -There normally shouldn't be any need to import this module directly. -It will usually be imported through the generic SCons.Tool.Tool() -selection method. - -""" - -# -# __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 SCons.Action -import SCons.Builder -import SCons.Util - -def generate(env): - """Add a Builder factory function and construction variables for - BitKeeper to an Environment.""" - - def BitKeeperFactory(env=env): - """ """ - import SCons.Warnings as W - W.warn(W.DeprecatedSourceCodeWarning, """The BitKeeper() factory is deprecated and there is no replacement.""") - act = SCons.Action.Action("$BITKEEPERCOM", "$BITKEEPERCOMSTR") - return SCons.Builder.Builder(action = act, env = env) - - env.BitKeeper = BitKeeperFactory - - env['BITKEEPER'] = 'bk' - env['BITKEEPERGET'] = '$BITKEEPER get' - env['BITKEEPERGETFLAGS'] = SCons.Util.CLVar('') - env['BITKEEPERCOM'] = '$BITKEEPERGET $BITKEEPERGETFLAGS $TARGET' - -def exists(env): - return env.Detect('bk') - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/src/engine/SCons/Tool/BitKeeper.xml b/src/engine/SCons/Tool/BitKeeper.xml deleted file mode 100644 index 30a5e77..0000000 --- a/src/engine/SCons/Tool/BitKeeper.xml +++ /dev/null @@ -1,123 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -__COPYRIGHT__ - -This file is processed by the bin/SConsDoc.py module. -See its __doc__ string for a discussion of the format. ---> - -<!DOCTYPE sconsdoc [ -<!ENTITY % scons SYSTEM '../../../../doc/scons.mod'> -%scons; -<!ENTITY % builders-mod SYSTEM '../../../../doc/generated/builders.mod'> -%builders-mod; -<!ENTITY % functions-mod SYSTEM '../../../../doc/generated/functions.mod'> -%functions-mod; -<!ENTITY % tools-mod SYSTEM '../../../../doc/generated/tools.mod'> -%tools-mod; -<!ENTITY % variables-mod SYSTEM '../../../../doc/generated/variables.mod'> -%variables-mod; -]> - -<sconsdoc xmlns="http://www.scons.org/dbxsd/v1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd"> - -<tool name="BitKeeper"> -<summary> -<para> -Sets construction variables for the BitKeeper -source code control system. -</para> -</summary> -<sets> -<item>BITKEEPER</item> -<item>BITKEEPERGET</item> -<item>BITKEEPERGETFLAGS</item> -<item>BITKEEPERCOM</item> -</sets> -<uses> -<item>BITKEEPERCOMSTR</item> -</uses> -</tool> - -<cvar name="BITKEEPER"> -<summary> -<para> -The BitKeeper executable. -</para> -</summary> -</cvar> - -<cvar name="BITKEEPERCOM"> -<summary> -<para> -The command line for -fetching source files using BitKeeper. -</para> -</summary> -</cvar> - -<cvar name="BITKEEPERCOMSTR"> -<summary> -<para> -The string displayed when fetching -a source file using BitKeeper. -If this is not set, then &cv-link-BITKEEPERCOM; -(the command line) is displayed. -</para> -</summary> -</cvar> - -<cvar name="BITKEEPERGET"> -<summary> -<para> -The command (&cv-link-BITKEEPER;) and subcommand -for fetching source files using BitKeeper. -</para> -</summary> -</cvar> - -<cvar name="BITKEEPERGETFLAGS"> -<summary> -<para> -Options that are passed to the BitKeeper -<command>get</command> -subcommand. -</para> -</summary> -</cvar> - -<scons_function name="BitKeeper"> -<arguments signature="env"> -() -</arguments> -<summary> -<para> -A factory function that -returns a Builder object -to be used to fetch source files -using BitKeeper. -The returned Builder -is intended to be passed to the -&f-SourceCode; -function. -</para> - -<para> -This function is deprecated. For details, see the entry for the -&f-SourceCode; -function. -</para> - -<para> -Example: -</para> - -<example_commands> -env.SourceCode('.', env.BitKeeper()) -</example_commands> -</summary> -</scons_function> - -</sconsdoc> diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py index 4647587..f95b175 100644 --- a/src/engine/SCons/Tool/__init__.py +++ b/src/engine/SCons/Tool/__init__.py @@ -1157,7 +1157,7 @@ def tool_list(platform, env): # Archivers 'tar', 'zip', # SourceCode factories - 'BitKeeper', 'CVS', + 'CVS', 'RCS', 'SCCS', # 'Subversion', ], env) diff --git a/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOM.py b/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOM.py deleted file mode 100644 index 8ff4ced..0000000 --- a/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOM.py +++ /dev/null @@ -1,140 +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__" - -""" -Test setting the $BITKEEPERCOM variable. -""" - -import os.path - -import TestSCons - -_python_ = TestSCons._python_ - -test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) - -test.write('SConscript', """ -Environment(tools = ['BitKeeper']).BitKeeper() -""") - -msg_bk = """The BitKeeper() factory is deprecated and there is no replacement.""" -warn_bk = test.deprecated_fatal('deprecated-build-dir', msg_bk) -msg_sc = """SourceCode() has been deprecated and there is no replacement. -\tIf you need this function, please contact scons-dev@scons.org""" -warn_sc = test.deprecated_wrap(msg_sc) - -test.subdir('BitKeeper', ['BitKeeper', 'sub'], 'sub') - -sub_BitKeeper = os.path.join('sub', 'BitKeeper') -sub_SConscript = os.path.join('sub', 'SConscript') -sub_all = os.path.join('sub', 'all') -sub_ddd_in = os.path.join('sub', 'ddd.in') -sub_ddd_out = os.path.join('sub', 'ddd.out') -sub_eee_in = os.path.join('sub', 'eee.in') -sub_eee_out = os.path.join('sub', 'eee.out') -sub_fff_in = os.path.join('sub', 'fff.in') -sub_fff_out = os.path.join('sub', 'fff.out') - -test.write('my-bk-get.py', """ -import shutil -import sys -for f in sys.argv[1:]: - shutil.copy('BitKeeper/'+f, f) -""") - -test.write('SConstruct', """ -SetOption('warn', 'deprecated-source-code') -def cat(env, source, target): - target = str(target[0]) - f = open(target, "wb") - for src in source: - f.write(open(str(src), "rb").read()) - f.close() -env = Environment(TOOLS = ['default', 'BitKeeper'], - BUILDERS={'Cat':Builder(action=cat)}, - BITKEEPERCOM=r'%(_python_)s my-bk-get.py $TARGET') -env.Cat('aaa.out', 'aaa.in') -env.Cat('bbb.out', 'bbb.in') -env.Cat('ccc.out', 'ccc.in') -env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out']) -env.SourceCode('.', env.BitKeeper()) -SConscript('sub/SConscript', "env") -""" % locals()) - -test.write(['BitKeeper', 'sub', 'SConscript'], """\ -Import("env") -env.Cat('ddd.out', 'ddd.in') -env.Cat('eee.out', 'eee.in') -env.Cat('fff.out', 'fff.in') -env.Cat('all', ['ddd.out', 'eee.out', 'fff.out']) -""") - -test.write(['BitKeeper', 'aaa.in'], "BitKeeper/aaa.in\n") -test.write('bbb.in', "checked-out bbb.in\n") -test.write(['BitKeeper', 'ccc.in'], "BitKeeper/ccc.in\n") - -test.write(['BitKeeper', 'sub', 'ddd.in'], "BitKeeper/sub/ddd.in\n") -test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n") -test.write(['BitKeeper', 'sub', 'fff.in'], "BitKeeper/sub/fff.in\n") - -read_str = """\ -%(_python_)s my-bk-get.py %(sub_SConscript)s -""" % locals() - -build_str = """\ -%(_python_)s my-bk-get.py aaa.in -cat(["aaa.out"], ["aaa.in"]) -cat(["bbb.out"], ["bbb.in"]) -%(_python_)s my-bk-get.py ccc.in -cat(["ccc.out"], ["ccc.in"]) -cat(["all"], ["aaa.out", "bbb.out", "ccc.out"]) -%(_python_)s my-bk-get.py %(sub_ddd_in)s -cat(["%(sub_ddd_out)s"], ["%(sub_ddd_in)s"]) -cat(["%(sub_eee_out)s"], ["%(sub_eee_in)s"]) -%(_python_)s my-bk-get.py %(sub_fff_in)s -cat(["%(sub_fff_out)s"], ["%(sub_fff_in)s"]) -cat(["%(sub_all)s"], ["%(sub_ddd_out)s", "%(sub_eee_out)s", "%(sub_fff_out)s"]) -""" % locals() - -stdout = test.wrap_stdout(read_str = read_str, build_str = build_str) - -test.run(arguments = '.', - stdout = TestSCons.re_escape(stdout), - stderr = warn_bk + warn_sc) - -test.must_match('all', - "BitKeeper/aaa.in\nchecked-out bbb.in\nBitKeeper/ccc.in\n") - -test.must_match(['sub', 'all'], - "BitKeeper/sub/ddd.in\nchecked-out sub/eee.in\nBitKeeper/sub/fff.in\n") - - -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOMSTR.py b/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOMSTR.py deleted file mode 100644 index 5bbdea2..0000000 --- a/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOMSTR.py +++ /dev/null @@ -1,141 +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__" - -""" -Test customizing the output with the the $BITKEEPERCOMSTR variable. -""" - -import os.path - -import TestSCons - -_python_ = TestSCons._python_ - -test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) - -test.write('SConscript', """ -Environment(tools = ['BitKeeper']).BitKeeper() -""") - -msg_bk = """The BitKeeper() factory is deprecated and there is no replacement.""" -warn_bk = test.deprecated_fatal('deprecated-build-dir', msg_bk) -msg_sc = """SourceCode() has been deprecated and there is no replacement. -\tIf you need this function, please contact scons-dev@scons.org""" -warn_sc = test.deprecated_wrap(msg_sc) - -test.subdir('BitKeeper', ['BitKeeper', 'sub'], 'sub') - -sub_BitKeeper = os.path.join('sub', 'BitKeeper') -sub_SConscript = os.path.join('sub', 'SConscript') -sub_all = os.path.join('sub', 'all') -sub_ddd_in = os.path.join('sub', 'ddd.in') -sub_ddd_out = os.path.join('sub', 'ddd.out') -sub_eee_in = os.path.join('sub', 'eee.in') -sub_eee_out = os.path.join('sub', 'eee.out') -sub_fff_in = os.path.join('sub', 'fff.in') -sub_fff_out = os.path.join('sub', 'fff.out') - -test.write('my-bk-get.py', """ -import shutil -import sys -for f in sys.argv[1:]: - shutil.copy('BitKeeper/'+f, f) -""") - -test.write('SConstruct', """ -SetOption('warn', 'deprecated-source-code') -def cat(env, source, target): - target = str(target[0]) - f = open(target, "wb") - for src in source: - f.write(open(str(src), "rb").read()) - f.close() -env = Environment(tools = ['default', 'BitKeeper'], - BUILDERS={'Cat':Builder(action=cat)}, - BITKEEPERCOM=r'%(_python_)s my-bk-get.py $TARGET', - BITKEEPERCOMSTR='Checking out $TARGET from our fake BitKeeper') -env.Cat('aaa.out', 'aaa.in') -env.Cat('bbb.out', 'bbb.in') -env.Cat('ccc.out', 'ccc.in') -env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out']) -env.SourceCode('.', env.BitKeeper()) -SConscript('sub/SConscript', "env") -""" % locals()) - -test.write(['BitKeeper', 'sub', 'SConscript'], """\ -Import("env") -env.Cat('ddd.out', 'ddd.in') -env.Cat('eee.out', 'eee.in') -env.Cat('fff.out', 'fff.in') -env.Cat('all', ['ddd.out', 'eee.out', 'fff.out']) -""") - -test.write(['BitKeeper', 'aaa.in'], "BitKeeper/aaa.in\n") -test.write('bbb.in', "checked-out bbb.in\n") -test.write(['BitKeeper', 'ccc.in'], "BitKeeper/ccc.in\n") - -test.write(['BitKeeper', 'sub', 'ddd.in'], "BitKeeper/sub/ddd.in\n") -test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n") -test.write(['BitKeeper', 'sub', 'fff.in'], "BitKeeper/sub/fff.in\n") - -read_str = """\ -Checking out %(sub_SConscript)s from our fake BitKeeper -""" % locals() - -build_str = """\ -Checking out aaa.in from our fake BitKeeper -cat(["aaa.out"], ["aaa.in"]) -cat(["bbb.out"], ["bbb.in"]) -Checking out ccc.in from our fake BitKeeper -cat(["ccc.out"], ["ccc.in"]) -cat(["all"], ["aaa.out", "bbb.out", "ccc.out"]) -Checking out %(sub_ddd_in)s from our fake BitKeeper -cat(["%(sub_ddd_out)s"], ["%(sub_ddd_in)s"]) -cat(["%(sub_eee_out)s"], ["%(sub_eee_in)s"]) -Checking out %(sub_fff_in)s from our fake BitKeeper -cat(["%(sub_fff_out)s"], ["%(sub_fff_in)s"]) -cat(["%(sub_all)s"], ["%(sub_ddd_out)s", "%(sub_eee_out)s", "%(sub_fff_out)s"]) -""" % locals() - -stdout = test.wrap_stdout(read_str = read_str, build_str = build_str) - -test.run(arguments = '.', - stdout = TestSCons.re_escape(stdout), - stderr = warn_bk + warn_sc) - -test.must_match('all', - "BitKeeper/aaa.in\nchecked-out bbb.in\nBitKeeper/ccc.in\n") - -test.must_match(['sub', 'all'], - "BitKeeper/sub/ddd.in\nchecked-out sub/eee.in\nBitKeeper/sub/fff.in\n") - - -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/Deprecated/SourceCode/BitKeeper/BitKeeper.py b/test/Deprecated/SourceCode/BitKeeper/BitKeeper.py deleted file mode 100644 index 04dfd9b..0000000 --- a/test/Deprecated/SourceCode/BitKeeper/BitKeeper.py +++ /dev/null @@ -1,383 +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. -from __future__ import print_function - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" - -""" -Test fetching source files from BitKeeper. -""" - -import os - -import TestSCons - -test = TestSCons.TestSCons() -test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) - -test.write('SConscript', """ -Environment(tools = ['BitKeeper']).BitKeeper() -""") - -msg_bk = """The BitKeeper() factory is deprecated and there is no replacement.""" -warn_bk = test.deprecated_fatal('deprecated-build-dir', msg_bk) -msg_sc = """SourceCode() has been deprecated and there is no replacement. -\tIf you need this function, please contact scons-dev@scons.org""" -warn_sc = test.deprecated_wrap(msg_sc) - -test.skip_test("Need BitKeeper to debug these tests.\n") - -bk = test.where_is('bk') -if not bk: - test.skip_test("Could not find 'bk'; skipping remaining tests.\n") - -try: - login = os.getlogin() -except (AttributeError, OSError): - try: - login = os.environ['USER'] - except KeyError: - login = 'USER' - -host = os.uname()[1] - -email = "%s@%s" % (login, host) - -test.subdir('BK', 'import', ['import', 'sub']) - -# Test using BitKeeper to fetch from SCCS/s.file files. -sccs = test.where_is('sccs') -if not sccs: - print("Could not find SCCS, skipping sub-test of BitKeeper using SCCS files.") -else: - test.subdir('work1', - ['work1', 'SCCS'], - ['work1', 'sub'], - ['work1', 'sub', 'SCCS']) - - for file in ['aaa.in', 'bbb.in', 'ccc.in']: - test.write(['work1', file], "work1/%s\n" % file) - args = "create %s" % file - test.run(chdir = 'work1', program = sccs, arguments = args, stderr = None) - test.unlink(['work1', file]) - test.unlink(['work1', ','+file]) - - test.write(['work1', 'sub', 'SConscript'], """if True: - Import("env") - env.Cat('ddd.out', 'ddd.in') - env.Cat('eee.out', 'eee.in') - env.Cat('fff.out', 'fff.in') - env.Cat('all', ['ddd.out', 'eee.out', 'fff.out']) - """) - args = "create SConscript" - test.run(chdir = 'work1/sub', program = sccs, arguments = args, stderr = None) - test.unlink(['work1', 'sub', 'SConscript']) - test.unlink(['work1', 'sub', ',SConscript']) - - for file in ['ddd.in', 'eee.in', 'fff.in']: - test.write(['work1', 'sub', file], "work1/sub/%s\n" % file) - args = "create %s" % file - test.run(chdir = 'work1/sub', program = sccs, arguments = args, stderr = None) - test.unlink(['work1', 'sub', file]) - test.unlink(['work1', 'sub', ','+file]) - - test.write(['work1', 'SConstruct'], """if True: - SetOption('warn', 'deprecated-source-code') - def cat(env, source, target): - target = str(target[0]) - f = open(target, "wb") - for src in source: - f.write(open(str(src), "rb").read()) - f.close() - env = Environment(BUILDERS={'Cat':Builder(action=cat)}, - BITKEEPERGETFLAGS='-e') - env.Cat('aaa.out', 'aaa.in') - env.Cat('bbb.out', 'bbb.in') - env.Cat('ccc.out', 'ccc.in') - env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out']) - env.SourceCode('.', env.BitKeeper()) - SConscript('sub/SConscript', "env") - """) - - test.write(['work1', 'bbb.in'], "checked-out work1/bbb.in\n") - - test.write(['work1', 'sub', 'eee.in'], "checked-out work1/sub/eee.in\n") - - read_str = """\ -bk get -e sub/SConscript -""" - - build_str = """\ -bk get -e aaa.in -cat(["aaa.out"], ["aaa.in"]) -cat(["bbb.out"], ["bbb.in"]) -bk get -e ccc.in -cat(["ccc.out"], ["ccc.in"]) -cat(["all"], ["aaa.out", "bbb.out", "ccc.out"]) -bk get -e sub/ddd.in -cat(["sub/ddd.out"], ["sub/ddd.in"]) -cat(["sub/eee.out"], ["sub/eee.in"]) -bk get -e sub/fff.in -cat(["sub/fff.out"], ["sub/fff.in"]) -cat(["sub/all"], ["sub/ddd.out", "sub/eee.out", "sub/fff.out"]) -""" - - stdout = test.wrap_stdout(read_str = read_str, build_str = build_str) - - stderr = """\ -sub/SConscript 1.1 -> 1.2: 5 lines -aaa.in 1.1 -> 1.2: 1 lines -ccc.in 1.1 -> 1.2: 1 lines -sub/ddd.in 1.1 -> 1.2: 1 lines -sub/fff.in 1.1 -> 1.2: 1 lines -""" - - test.run(arguments = '.', - stdout = TestSCons.re_escape(stdout), - stderr = warn_bk + warn_sc + TestSCons.re_escape(stderr)) - - test.must_match(['work1', 'all'], "work1/aaa.in\nchecked-out work1/bbb.in\nwork1/ccc.in\n") - - test.must_be_writable(test.workpath('work1', 'sub', 'SConscript')) - test.must_be_writable(test.workpath('work1', 'aaa.in')) - test.must_be_writable(test.workpath('work1', 'ccc.in')) - test.must_be_writable(test.workpath('work1', 'sub', 'ddd.in')) - test.must_be_writable(test.workpath('work1', 'sub', 'fff.in')) - -# Test using BitKeeper to fetch from RCS/file,v files. -rcs = test.where_is('rcs') -ci = test.where_is('ci') -if not rcs: - print("Could not find RCS,\nskipping sub-test of BitKeeper using RCS files.") -elif not ci: - print("Could not find the RCS ci command,\nskipping sub-test of BitKeeper using RCS files.") -else: - test.subdir('work2', - ['work2', 'RCS'], - ['work2', 'sub'], - ['work2', 'sub', 'RCS']) - - for file in ['aaa.in', 'bbb.in', 'ccc.in']: - test.write(['work2', file], "work2/%s\n" % file) - args = "-f -t%s %s" % (file, file) - test.run(chdir = 'work2', program = ci, arguments = args, stderr = None) - - test.write(['work2', 'sub', 'SConscript'], """\ -Import("env") -env.Cat('ddd.out', 'ddd.in') -env.Cat('eee.out', 'eee.in') -env.Cat('fff.out', 'fff.in') -env.Cat('all', ['ddd.out', 'eee.out', 'fff.out']) -""") - args = "-f -tsub/SConscript sub/SConscript" - test.run(chdir = 'work2', program = ci, arguments = args, stderr = None) - - for file in ['ddd.in', 'eee.in', 'fff.in']: - test.write(['work2', 'sub', file], "work2/sub/%s\n" % file) - args = "-f -tsub/%s sub/%s" % (file, file) - test.run(chdir = 'work2', program = ci, arguments = args, stderr = None) - - test.no_result(os.path.exists(test.workpath('work2', 'aaa.in'))) - test.no_result(os.path.exists(test.workpath('work2', 'bbb.in'))) - test.no_result(os.path.exists(test.workpath('work2', 'ccc.in'))) - - test.no_result(os.path.exists(test.workpath('work2', 'sub', 'SConscript'))) - - test.no_result(os.path.exists(test.workpath('work2', 'sub', 'ddd.in'))) - test.no_result(os.path.exists(test.workpath('work2', 'sub', 'eee.in'))) - test.no_result(os.path.exists(test.workpath('work2', 'sub', 'fff.in'))) - - test.write(['work2', 'SConstruct'], """if True: - SetOption('warn', 'deprecated-source-code') - def cat(env, source, target): - target = str(target[0]) - f = open(target, "wb") - for src in source: - f.write(open(str(src), "rb").read()) - f.close() - env = Environment(BUILDERS={'Cat':Builder(action=cat)}, - BITKEEPERGET='$BITKEEPER co', - BITKEEPERGETFLAGS='-q') - env.Cat('aaa.out', 'aaa.in') - env.Cat('bbb.out', 'bbb.in') - env.Cat('ccc.out', 'ccc.in') - env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out']) - env.SourceCode('.', env.BitKeeper()) - SConscript('sub/SConscript', "env") - """) - - test.write(['work2', 'bbb.in'], "checked-out work2/bbb.in\n") - - test.write(['work2', 'sub', 'eee.in'], "checked-out work2/sub/eee.in\n") - - read_str = """\ -bk co -q sub/SConscript -""" - - build_str = """\ -bk co -q aaa.in -cat(["aaa.out"], ["aaa.in"]) -cat(["bbb.out"], ["bbb.in"]) -bk co -q ccc.in -cat(["ccc.out"], ["ccc.in"]) -cat(["all"], ["aaa.out", "bbb.out", "ccc.out"]) -bk co -q sub/ddd.in -cat(["sub/ddd.out"], ["sub/ddd.in"]) -cat(["sub/eee.out"], ["sub/eee.in"]) -bk co -q sub/fff.in -cat(["sub/fff.out"], ["sub/fff.in"]) -cat(["sub/all"], ["sub/ddd.out", "sub/eee.out", "sub/fff.out"]) -""" - - stdout = test.wrap_stdout(read_str = read_str, build_str = build_str) - - test.run(arguments = '.', - stdout = TestSCons.re_escape(stdout), - stderr = warn_bk + warn_sc) - - test.must_match(['work2', 'all'], "work2/aaa.in\nchecked-out work2/bbb.in\nwork2/ccc.in\n") - - test.must_match(['work2', 'sub', 'all'], "work2/sub/ddd.in\nchecked-out work2/sub/eee.in\nwork2/sub/fff.in\n") - - test.must_not_be_writable(test.workpath('work2', 'sub', 'SConscript')) - test.must_not_be_writable(test.workpath('work2', 'aaa.in')) - test.must_not_be_writable(test.workpath('work2', 'ccc.in')) - test.must_not_be_writable(test.workpath('work2', 'sub', 'ddd.in')) - test.must_not_be_writable(test.workpath('work2', 'sub', 'fff.in')) - -# Set up a "pure" BitKeeper hierarchy. -# BitKeeper's licensing restrictions require a configuration file that -# specifies you're not using it multi-user. This seems to be the -# minimal configuration that satisfies these requirements. -test.write('bk.conf', """\ -description:test project 'foo' -logging:none -email:%s -single_user:%s -single_host:%s -""" % (email, login, host)) - -# Plus, we need to set the external environment variable that gets it to -# shut up and not prompt us to accept the license. -os.environ['BK_LICENSE'] = 'ACCEPTED' - -test.write(['import', 'aaa.in'], "import/aaa.in\n") -test.write(['import', 'bbb.in'], "import/bbb.in\n") -test.write(['import', 'ccc.in'], "import/ccc.in\n") - -test.write(['import', 'sub', 'SConscript'], """\ -Import("env") -env.Cat('ddd.out', 'ddd.in') -env.Cat('eee.out', 'eee.in') -env.Cat('fff.out', 'fff.in') -env.Cat('all', ['ddd.out', 'eee.out', 'fff.out']) -""") - -test.write(['import', 'sub', 'ddd.in'], "import/sub/ddd.in\n") -test.write(['import', 'sub', 'eee.in'], "import/sub/eee.in\n") -test.write(['import', 'sub', 'fff.in'], "import/sub/fff.in\n") - -# Test transparent source file checkouts using BitKeeper, by overriding -# the 'SCCS' construction variable in the default Environment. -work3 = test.workpath('work3') - -test.run(program = bk, - arguments = 'setup -f -c bk.conf work3') - -test.run(chdir = 'import', - program = bk, - arguments = 'import -q -f -tplain . %s' % test.workpath('work3')) - -test.write(['work3', 'SConstruct'], """ -SetOption('warn', 'deprecated-source-code') -def cat(env, source, target): - target = str(target[0]) - f = open(target, "wb") - for src in source: - f.write(open(str(src), "rb").read()) - f.close() -DefaultEnvironment(tools=['SCCS'])['SCCS'] = r'%s' -env = Environment(BUILDERS={'Cat':Builder(action=cat)}) -env.Cat('aaa.out', 'aaa.in') -env.Cat('bbb.out', 'bbb.in') -env.Cat('ccc.out', 'ccc.in') -env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out']) -SConscript('sub/SConscript', "env") -""" % bk) - -test.write(['work3', 'bbb.in'], "work3/bbb.in\n") - -test.subdir(['work3', 'sub']) -test.write(['work3', 'sub', 'eee.in'], "work3/sub/eee.in\n") - -read_str = """\ -%s get sub/SConscript -""" % bk - -build_str = """\ -%s get aaa.in -cat(["aaa.out"], ["aaa.in"]) -cat(["bbb.out"], ["bbb.in"]) -%s get ccc.in -cat(["ccc.out"], ["ccc.in"]) -cat(["all"], ["aaa.out", "bbb.out", "ccc.out"]) -%s get sub/ddd.in -cat(["sub/ddd.out"], ["sub/ddd.in"]) -cat(["sub/eee.out"], ["sub/eee.in"]) -%s get sub/fff.in -cat(["sub/fff.out"], ["sub/fff.in"]) -cat(["sub/all"], ["sub/ddd.out", "sub/eee.out", "sub/fff.out"]) -""" % (bk, bk, bk, bk) - -stdout = test.wrap_stdout(read_str = read_str, build_str = build_str) - -stderr = """\ -sub/SConscript 1.1: 5 lines -aaa.in 1.1: 1 lines -ccc.in 1.1: 1 lines -sub/ddd.in 1.1: 1 lines -sub/fff.in 1.1: 1 lines -""" - -test.run(chdir = 'work3', - arguments = '.', - stdout = TestSCons.re_escape(stdout), - stderr = TestSCons.re_escape(stderr)) - -test.must_match(['work3', 'all'], "import/aaa.in\nwork3/bbb.in\nimport/ccc.in\n") - -test.must_match(['work3', 'sub', 'all'], "import/sub/ddd.in\nwork3/sub/eee.in\nimport/sub/fff.in\n") - -test.must_not_be_writable(test.workpath('work3', 'sub', 'SConscript')) -test.must_not_be_writable(test.workpath('work3', 'aaa.in')) -test.must_not_be_writable(test.workpath('work3', 'ccc.in')) -test.must_not_be_writable(test.workpath('work3', 'sub', 'ddd.in')) -test.must_not_be_writable(test.workpath('work3', 'sub', 'fff.in')) - -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: |