|
|
Boost-Commit : |
From: grafikrobot_at_[hidden]
Date: 2007-11-18 15:24:28
Author: grafik
Date: 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
New Revision: 41212
URL: http://svn.boost.org/trac/boost/changeset/41212
Log:
Inspection report fixes.
Text files modified:
trunk/tools/build/v2/build/build-request.jam | 7 ++---
trunk/tools/build/v2/build/modifiers.jam | 7 ++---
trunk/tools/build/v2/doc/Jamfile.v2 | 3 ++
trunk/tools/build/v2/example/generate/Jamroot | 43 +++++++++++++++++++++------------------
trunk/tools/build/v2/example/generate/REAME.txt | 3 ++
trunk/tools/build/v2/example/generate/a.cpp | 6 +++++
trunk/tools/build/v2/example/generator/Jamroot | 5 +++
trunk/tools/build/v2/example/generator/README.txt | 3 ++
trunk/tools/build/v2/example/generator/foo.gci | 7 +++++
trunk/tools/build/v2/example/generator/soap.jam | 27 +++++++++++++-----------
trunk/tools/build/v2/example/python_modules/Jamroot | 5 +++
trunk/tools/build/v2/example/python_modules/python_helpers.jam | 3 ++
trunk/tools/build/v2/example/python_modules/python_helpers.py | 5 +++
trunk/tools/build/v2/test/dependency_property.py | 7 ++---
trunk/tools/build/v2/test/dependency_test.py | 5 ++++
trunk/tools/build/v2/test/double_loading.py | 7 ++---
trunk/tools/build/v2/test/duplicate.py | 7 ++---
trunk/tools/build/v2/test/echo_args.jam | 4 +++
trunk/tools/build/v2/test/empty.jam | 6 ++++
trunk/tools/build/v2/test/expansion.py | 7 ++---
trunk/tools/build/v2/test/explicit.py | 7 ++---
trunk/tools/build/v2/test/gcc_runtime.py | 7 ++---
trunk/tools/build/v2/test/project-test3/lib3/Jamfile | 3 ++
trunk/tools/build/v2/test/readme.txt | 4 +++
trunk/tools/build/v2/test/test_system.html | 8 ++----
25 files changed, 122 insertions(+), 74 deletions(-)
Modified: trunk/tools/build/v2/build/build-request.jam
==============================================================================
--- trunk/tools/build/v2/build/build-request.jam (original)
+++ trunk/tools/build/v2/build/build-request.jam 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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 ;
Modified: trunk/tools/build/v2/build/modifiers.jam
==============================================================================
--- trunk/tools/build/v2/build/modifiers.jam (original)
+++ trunk/tools/build/v2/build/modifiers.jam 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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
Modified: trunk/tools/build/v2/doc/Jamfile.v2
==============================================================================
--- trunk/tools/build/v2/doc/Jamfile.v2 (original)
+++ trunk/tools/build/v2/doc/Jamfile.v2 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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
;
Modified: trunk/tools/build/v2/example/generate/Jamroot
==============================================================================
--- trunk/tools/build/v2/example/generate/Jamroot (original)
+++ trunk/tools/build/v2/example/generate/Jamroot 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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 @@
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 : <generating-rule>@generate-example ;
\ No newline at end of file
+generate a2 : a.cpp : <generating-rule>@generate-example ;
Modified: trunk/tools/build/v2/example/generate/REAME.txt
==============================================================================
--- trunk/tools/build/v2/example/generate/REAME.txt (original)
+++ trunk/tools/build/v2/example/generate/REAME.txt 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -10,3 +10,6 @@
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)
Modified: trunk/tools/build/v2/example/generate/a.cpp
==============================================================================
--- trunk/tools/build/v2/example/generate/a.cpp (original)
+++ trunk/tools/build/v2/example/generate/a.cpp 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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)
+ */
Modified: trunk/tools/build/v2/example/generator/Jamroot
==============================================================================
--- trunk/tools/build/v2/example/generator/Jamroot (original)
+++ trunk/tools/build/v2/example/generator/Jamroot 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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 : <server>on ;
\ No newline at end of file
+exe foo : foo.gci : <server>on ;
Modified: trunk/tools/build/v2/example/generator/README.txt
==============================================================================
--- trunk/tools/build/v2/example/generator/README.txt (original)
+++ trunk/tools/build/v2/example/generator/README.txt 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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)
Modified: trunk/tools/build/v2/example/generator/foo.gci
==============================================================================
--- trunk/tools/build/v2/example/generator/foo.gci (original)
+++ trunk/tools/build/v2/example/generator/foo.gci 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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)
+ */
Modified: trunk/tools/build/v2/example/generator/soap.jam
==============================================================================
--- trunk/tools/build/v2/example/generator/soap.jam (original)
+++ trunk/tools/build/v2/example/generator/soap.jam 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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 @@
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 <server> ] = "on"
- {
+ local t2 ;
+ if [ $(property-set).get <server> ] = "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) ] ;
}
}
}
Modified: trunk/tools/build/v2/example/python_modules/Jamroot
==============================================================================
--- trunk/tools/build/v2/example/python_modules/Jamroot (original)
+++ trunk/tools/build/v2/example/python_modules/Jamroot 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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 ] ;
Modified: trunk/tools/build/v2/example/python_modules/python_helpers.jam
==============================================================================
--- trunk/tools/build/v2/example/python_modules/python_helpers.jam (original)
+++ trunk/tools/build/v2/example/python_modules/python_helpers.jam 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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 ;
Modified: trunk/tools/build/v2/example/python_modules/python_helpers.py
==============================================================================
--- trunk/tools/build/v2/example/python_modules/python_helpers.py (original)
+++ trunk/tools/build/v2/example/python_modules/python_helpers.py 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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
Modified: trunk/tools/build/v2/test/dependency_property.py
==============================================================================
--- trunk/tools/build/v2/test/dependency_property.py (original)
+++ trunk/tools/build/v2/test/dependency_property.py 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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
Modified: trunk/tools/build/v2/test/dependency_test.py
==============================================================================
--- trunk/tools/build/v2/test/dependency_test.py (original)
+++ trunk/tools/build/v2/test/dependency_test.py 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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()
Modified: trunk/tools/build/v2/test/double_loading.py
==============================================================================
--- trunk/tools/build/v2/test/double_loading.py (original)
+++ trunk/tools/build/v2/test/double_loading.py 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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
Modified: trunk/tools/build/v2/test/duplicate.py
==============================================================================
--- trunk/tools/build/v2/test/duplicate.py (original)
+++ trunk/tools/build/v2/test/duplicate.py 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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
Modified: trunk/tools/build/v2/test/echo_args.jam
==============================================================================
--- trunk/tools/build/v2/test/echo_args.jam (original)
+++ trunk/tools/build/v2/test/echo_args.jam 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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) ;
Modified: trunk/tools/build/v2/test/empty.jam
==============================================================================
--- trunk/tools/build/v2/test/empty.jam (original)
+++ trunk/tools/build/v2/test/empty.jam 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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)
Modified: trunk/tools/build/v2/test/expansion.py
==============================================================================
--- trunk/tools/build/v2/test/expansion.py (original)
+++ trunk/tools/build/v2/test/expansion.py 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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
Modified: trunk/tools/build/v2/test/explicit.py
==============================================================================
--- trunk/tools/build/v2/test/explicit.py (original)
+++ trunk/tools/build/v2/test/explicit.py 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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
Modified: trunk/tools/build/v2/test/gcc_runtime.py
==============================================================================
--- trunk/tools/build/v2/test/gcc_runtime.py (original)
+++ trunk/tools/build/v2/test/gcc_runtime.py 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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.
Modified: trunk/tools/build/v2/test/project-test3/lib3/Jamfile
==============================================================================
--- trunk/tools/build/v2/test/project-test3/lib3/Jamfile (original)
+++ trunk/tools/build/v2/test/project-test3/lib3/Jamfile 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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 ;
Modified: trunk/tools/build/v2/test/readme.txt
==============================================================================
--- trunk/tools/build/v2/test/readme.txt (original)
+++ trunk/tools/build/v2/test/readme.txt 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -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)
Modified: trunk/tools/build/v2/test/test_system.html
==============================================================================
--- trunk/tools/build/v2/test/test_system.html (original)
+++ trunk/tools/build/v2/test/test_system.html 2007-11-18 15:24:25 EST (Sun, 18 Nov 2007)
@@ -545,11 +545,9 @@
<p class="revision">Last modified: Mar 11, 2005</p>
- <p>© 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.</p>
+ <p>© 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)</p>
</body>
</html>
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk