From e29345438ea9ccb9888eac8685359d60f83bbee7 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 18 Nov 2007 20:24:25 +0000 Subject: [PATCH] Inspection report fixes. [SVN r41212] --- v2/build/build-request.jam | 7 ++-- v2/build/modifiers.jam | 7 ++-- v2/doc/Jamfile.v2 | 3 ++ v2/example/generate/Jamroot | 43 +++++++++++--------- v2/example/generate/REAME.txt | 3 ++ v2/example/generate/a.cpp | 6 +++ v2/example/generator/Jamroot | 5 ++- v2/example/generator/README.txt | 3 ++ v2/example/generator/foo.gci | 7 +++- v2/example/generator/soap.jam | 27 ++++++------ v2/example/python_modules/Jamroot | 5 ++- v2/example/python_modules/python_helpers.jam | 3 ++ v2/example/python_modules/python_helpers.py | 5 ++- v2/test/dependency_property.py | 7 ++-- v2/test/dependency_test.py | 5 +++ v2/test/double_loading.py | 7 ++-- v2/test/duplicate.py | 7 ++-- v2/test/echo_args.jam | 4 ++ v2/test/empty.jam | 6 ++- v2/test/expansion.py | 7 ++-- v2/test/explicit.py | 7 ++-- v2/test/gcc_runtime.py | 7 ++-- v2/test/project-test3/lib3/Jamfile | 3 ++ v2/test/readme.txt | 4 ++ v2/test/test_system.html | 8 ++-- 25 files changed, 122 insertions(+), 74 deletions(-) diff --git a/v2/build/build-request.jam b/v2/build/build-request.jam index 82d39b022..d0ff34f39 100644 --- a/v2/build/build-request.jam +++ b/v2/build/build-request.jam @@ -1,7 +1,6 @@ -# (C) Copyright David Abrahams 2002. Permission to copy, use, modify, sell and -# distribute this software is granted provided this copyright notice appears in -# all copies. This software is provided "as is" without express or implied -# warranty, and with no claim as to its suitability for any purpose. +# Copyright 2002 Dave Abrahams +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) import sequence ; import set ; diff --git a/v2/build/modifiers.jam b/v2/build/modifiers.jam index 9a4e150ac..40bed930d 100644 --- a/v2/build/modifiers.jam +++ b/v2/build/modifiers.jam @@ -1,7 +1,6 @@ -# (C) Copyright Rene Rivera, 2003. -# -# See accompanying license for terms and conditions of use. -# +# Copyright 2003 Rene Rivera +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) # Modifiers are generalized generators that mutate targets in specific ways. # This structure allows for grouping a variety of functionality in an diff --git a/v2/doc/Jamfile.v2 b/v2/doc/Jamfile.v2 index e5e83c479..a00f6ff7d 100644 --- a/v2/doc/Jamfile.v2 +++ b/v2/doc/Jamfile.v2 @@ -1,3 +1,6 @@ +# Copyright 2004,2006 Vladimir Prus +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) import quickbook ; diff --git a/v2/example/generate/Jamroot b/v2/example/generate/Jamroot index 52c00d811..bc8563a4a 100644 --- a/v2/example/generate/Jamroot +++ b/v2/example/generate/Jamroot @@ -1,3 +1,6 @@ +# Copyright 2007 Vladimir Prus +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) import common ; import "class" : new ; @@ -7,26 +10,26 @@ rule generate-example ( project name : property-set : sources * ) local result ; for local s in $(sources) { - #local ea = [ $(s).action ] ; - #local ep = [ $(ea).properties ] ; - - # Create a new action, that takes the source target - # and runs 'common.copy' comamnd on it. - local a = [ - new non-scanning-action $(s) : common.copy : $(property-set) ] ; - - local source-name = [ $(s).name ] ; - - # Create the target to represent the result of the action. - # The target has the name that was specified in Jamfile - # and passed here via the 'name' parameter, - # and the same type and project as the source. - result += [ new file-target $(name) - : [ $(s).type ] - : $(project) - : $(a) ] ; - } + #local ea = [ $(s).action ] ; + #local ep = [ $(ea).properties ] ; + + # Create a new action, that takes the source target + # and runs 'common.copy' comamnd on it. + local a = [ + new non-scanning-action $(s) : common.copy : $(property-set) ] ; + + local source-name = [ $(s).name ] ; + + # Create the target to represent the result of the action. + # The target has the name that was specified in Jamfile + # and passed here via the 'name' parameter, + # and the same type and project as the source. + result += [ new file-target $(name) + : [ $(s).type ] + : $(project) + : $(a) ] ; + } return $(result) ; } -generate a2 : a.cpp : @generate-example ; \ No newline at end of file +generate a2 : a.cpp : @generate-example ; diff --git a/v2/example/generate/REAME.txt b/v2/example/generate/REAME.txt index e4e9e9781..e8cecc1ed 100644 --- a/v2/example/generate/REAME.txt +++ b/v2/example/generate/REAME.txt @@ -10,3 +10,6 @@ flexible. Please consult the docs for more explanations. +# Copyright 2007 Vladimir Prus +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) diff --git a/v2/example/generate/a.cpp b/v2/example/generate/a.cpp index 42187a0de..364975671 100644 --- a/v2/example/generate/a.cpp +++ b/v2/example/generate/a.cpp @@ -2,3 +2,9 @@ int main() { } + +/* +Copyright 2007 Vladimir Prus +Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) + */ diff --git a/v2/example/generator/Jamroot b/v2/example/generator/Jamroot index a67e24ca0..9703134db 100644 --- a/v2/example/generator/Jamroot +++ b/v2/example/generator/Jamroot @@ -1,3 +1,6 @@ +# Copyright 2006 Vladimir Prus +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) import soap ; -exe foo : foo.gci : on ; \ No newline at end of file +exe foo : foo.gci : on ; diff --git a/v2/example/generator/README.txt b/v2/example/generator/README.txt index 340b9a7bd..c711dd206 100644 --- a/v2/example/generator/README.txt +++ b/v2/example/generator/README.txt @@ -2,3 +2,6 @@ This example shows how to declare a new generator class. It's necessary when generator's logic is more complex that just running a single tool. +# Copyright 2006 Vladimir Prus +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) diff --git a/v2/example/generator/foo.gci b/v2/example/generator/foo.gci index 7d5f90dff..2ccc45c6c 100644 --- a/v2/example/generator/foo.gci +++ b/v2/example/generator/foo.gci @@ -2,4 +2,9 @@ int main() { return 0; -} \ No newline at end of file +} +/* +Copyright 2006 Vladimir Prus +Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) + */ diff --git a/v2/example/generator/soap.jam b/v2/example/generator/soap.jam index ce69391f4..d28bfdecc 100644 --- a/v2/example/generator/soap.jam +++ b/v2/example/generator/soap.jam @@ -1,3 +1,6 @@ +# Copyright 2006 Vladimir Prus +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) # This is example of a fictional code generator tool. # It accepts a single input of type '.gci' and produces @@ -19,47 +22,47 @@ feature.feature server : off on : incidental ; class soap-generator : generator { import "class" : new ; - + rule __init__ ( * : * ) { generator.__init__ $(1) : $(2) : $(3) : $(4) : $(5) : $(6) : $(7) : $(8) : $(9) ; } - + rule run ( project name ? : property-set : sources * ) { if ! $(sources[2]) { # Accept only single source. local t = [ $(sources[1]).type ] ; - if $(t) = GCI + if $(t) = GCI { # The type is correct. - + # If no output name is specified, guess it from sources. if ! $(name) { name = [ generator.determine-output-name $(sources) ] ; } - + # Produce one output, using just copy. - local a = [ new action $(sources[1]) + local a = [ new action $(sources[1]) : common.copy : $(property-set) ] ; local t = [ new file-target $(name) : CPP : $(project) : $(a) ] ; - + # If in server mode, create another output -- an # empty file. If this were a real SOAP generator, we # might have created a single action, and two targets # both using that action. - local t2 ; - if [ $(property-set).get ] = "on" - { + local t2 ; + if [ $(property-set).get ] = "on" + { local a = [ new action : soap.touch : $(property-set) ] ; t2 = [ new file-target $(name)_server : CPP : $(project) : $(a) ] ; } - return [ virtual-target.register $(t) ] - [ virtual-target.register $(t2) ] ; + return [ virtual-target.register $(t) ] + [ virtual-target.register $(t2) ] ; } } } diff --git a/v2/example/python_modules/Jamroot b/v2/example/python_modules/Jamroot index f504aaeb0..c53e75d58 100644 --- a/v2/example/python_modules/Jamroot +++ b/v2/example/python_modules/Jamroot @@ -1,5 +1,8 @@ +# Copyright 2006 Vladimir Prus +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) import python_helpers ; ECHO "test1:" [ python_helpers.test1 ] ; -ECHO "test2:" [ python_helpers.test2 1234 : 5678 ] ; \ No newline at end of file +ECHO "test2:" [ python_helpers.test2 1234 : 5678 ] ; diff --git a/v2/example/python_modules/python_helpers.jam b/v2/example/python_modules/python_helpers.jam index d21e2d732..d6363af67 100644 --- a/v2/example/python_modules/python_helpers.jam +++ b/v2/example/python_modules/python_helpers.jam @@ -1,3 +1,6 @@ +# Copyright 2006 Vladimir Prus +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) # Import the Python rules to Boost.Build PYTHON_IMPORT_RULE python_helpers : test1 : python_helpers : test1 ; diff --git a/v2/example/python_modules/python_helpers.py b/v2/example/python_modules/python_helpers.py index 4b5839f27..8148f57c3 100644 --- a/v2/example/python_modules/python_helpers.py +++ b/v2/example/python_modules/python_helpers.py @@ -1,3 +1,6 @@ +# Copyright 2006 Vladimir Prus +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) # Declare a couple of functions called from Boost.Build # @@ -10,6 +13,6 @@ def test1(l): return ["foo", "bar"] - + def test2(l, l2): return [l[0], l2[0]] \ No newline at end of file diff --git a/v2/test/dependency_property.py b/v2/test/dependency_property.py index 3004c3554..5383108b2 100644 --- a/v2/test/dependency_property.py +++ b/v2/test/dependency_property.py @@ -1,9 +1,8 @@ #!/usr/bin/python -# Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and -# distribute this software is granted provided this copyright notice appears in -# all copies. This software is provided "as is" without express or implied -# warranty, and with no claim as to its suitability for any purpose. +# Copyright 2003 Vladimir Prus +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) # Regression test: virtual targets with different dependency properties # were considered different by 'virtual-target.register', but the code diff --git a/v2/test/dependency_test.py b/v2/test/dependency_test.py index 6a1b4972e..be056f415 100644 --- a/v2/test/dependency_test.py +++ b/v2/test/dependency_test.py @@ -1,5 +1,10 @@ #!/usr/bin/python +# Copyright 2003 Dave Abrahams +# Copyright 2002, 2003, 2005, 2006 Vladimir Prus +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) + from BoostBuild import Tester, List t = Tester() diff --git a/v2/test/double_loading.py b/v2/test/double_loading.py index e1418dccd..14bb0ea43 100644 --- a/v2/test/double_loading.py +++ b/v2/test/double_loading.py @@ -1,9 +1,8 @@ #!/usr/bin/python -# Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and -# distribute this software is granted provided this copyright notice appears in -# all copies. This software is provided "as is" without express or implied -# warranty, and with no claim as to its suitability for any purpose. +# Copyright 2003 Vladimir Prus +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) from BoostBuild import Tester, List import string diff --git a/v2/test/duplicate.py b/v2/test/duplicate.py index f26de455a..18922e75b 100644 --- a/v2/test/duplicate.py +++ b/v2/test/duplicate.py @@ -1,9 +1,8 @@ #!/usr/bin/python -# Copyright (C) Vladimir Prus 2004. Permission to copy, use, modify, sell and -# distribute this software is granted provided this copyright notice appears in -# all copies. This software is provided "as is" without express or implied -# warranty, and with no claim as to its suitability for any purpose. +# Copyright 2004 Vladimir Prus +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) # This test tries to stage the same file to the same location by *two* # different stage rules, in two different projects. This is not exactly diff --git a/v2/test/echo_args.jam b/v2/test/echo_args.jam index 99fff9868..0f6956e46 100644 --- a/v2/test/echo_args.jam +++ b/v2/test/echo_args.jam @@ -1,3 +1,7 @@ +# Copyright 2001 Dave Abrahams +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) + rule echo_args ( a b ? c ? : d + : e * ) { ECHO a= $(a) b= $(b) c= $(c) ":" d= $(d) ":" e= $(e) ; diff --git a/v2/test/empty.jam b/v2/test/empty.jam index 712bd9a2e..895b1087e 100644 --- a/v2/test/empty.jam +++ b/v2/test/empty.jam @@ -1 +1,5 @@ -# This file is empty; it just suppresses warnings \ No newline at end of file +# This file is empty; it just suppresses warnings + +# Copyright 2001 Dave Abrahams +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) diff --git a/v2/test/expansion.py b/v2/test/expansion.py index 71b0bc893..b3e93e38c 100644 --- a/v2/test/expansion.py +++ b/v2/test/expansion.py @@ -1,9 +1,8 @@ #!/usr/bin/python -# Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and -# distribute this software is granted provided this copyright notice appears in -# all copies. This software is provided "as is" without express or implied -# warranty, and with no claim as to its suitability for any purpose. +# Copyright 2003 Vladimir Prus +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) # This file is template for Boost.Build tests. It creates a simple # project that builds one exe from one source, and checks that the exe diff --git a/v2/test/explicit.py b/v2/test/explicit.py index 616ce9248..a2c183308 100644 --- a/v2/test/explicit.py +++ b/v2/test/explicit.py @@ -1,9 +1,8 @@ #!/usr/bin/python -# Copyright (C) Vladimir Prus 2003. Permission to copy, use, modify, sell and -# distribute this software is granted provided this copyright notice appears in -# all copies. This software is provided "as is" without express or implied -# warranty, and with no claim as to its suitability for any purpose. +# Copyright 2003 Vladimir Prus +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) # This file is template for Boost.Build tests. It creates a simple # project that builds one exe from one source, and checks that the exe diff --git a/v2/test/gcc_runtime.py b/v2/test/gcc_runtime.py index 2efb68704..bb3bb75d2 100644 --- a/v2/test/gcc_runtime.py +++ b/v2/test/gcc_runtime.py @@ -1,9 +1,8 @@ #!/usr/bin/python -# Copyright (C) Vladimir Prus 2004. Permission to copy, use, modify, sell and -# distribute this software is granted provided this copyright notice appears in -# all copies. This software is provided "as is" without express or implied -# warranty, and with no claim as to its suitability for any purpose. +# Copyright 2004 Vladimir Prus +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) # Tests that on gcc, we correctly report problem when static runtime # is requested when building DLL. diff --git a/v2/test/project-test3/lib3/Jamfile b/v2/test/project-test3/lib3/Jamfile index a6e61f6b6..0d457817e 100644 --- a/v2/test/project-test3/lib3/Jamfile +++ b/v2/test/project-test3/lib3/Jamfile @@ -1,3 +1,6 @@ +# Copyright 2003, 2005 Vladimir Prus +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) # This project-root.jam also serves the role of Jamfile project lib3 ; diff --git a/v2/test/readme.txt b/v2/test/readme.txt index 0d2fb4631..b29e79dc0 100644 --- a/v2/test/readme.txt +++ b/v2/test/readme.txt @@ -1,3 +1,7 @@ Comprehensive tests for Boost.Build v2; requires Python. To test, execute: python test_all.py + +# Copyright 2002 Dave Abrahams +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) diff --git a/v2/test/test_system.html b/v2/test/test_system.html index d70935222..7cdb48529 100644 --- a/v2/test/test_system.html +++ b/v2/test/test_system.html @@ -545,11 +545,9 @@ t.cleanup()

Last modified: Mar 11, 2005

-

© Copyright Vladimir Prus 2002, 2003, 2004, 2005. Permission to - copy, use, modify, sell and distribute this document is granted provided - this copyright notice appears in all copies. This document is provided - ``as is'' without express or implied warranty, and with no claim as to - its suitability for any purpose.

+

© Copyright Vladimir Prus 2002, 2003, 2004, 2005. + Distributed under the Boost Software License, Version 1.0. + (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)