[Boost-commit] svn:boost r47090 - trunk/tools/build/v2/tools

From: jurko.gospodnetic_at_[hidden]
Date: 2008-07-05 05:08:35

Author: jurko
Date: 2008-07-05 05:08:35 EDT (Sat, 05 Jul 2008)
New Revision: 47090
URL: http://svn.boost.org/trac/boost/changeset/47090

Log:
Minor stylistic changes in Boost Build's Comeau C/C++ toolset modules.
Text files modified: 
   trunk/tools/build/v2/tools/como-linux.jam |    30 +++++++++--------                       
   trunk/tools/build/v2/tools/como-win.jam   |    65 +++++++++++++++++++++------------------ 
   trunk/tools/build/v2/tools/como.jam       |     5 +-                                      
   3 files changed, 53 insertions(+), 47 deletions(-)

Modified: trunk/tools/build/v2/tools/como-linux.jam
==============================================================================
--- trunk/tools/build/v2/tools/como-linux.jam	(original)
+++ trunk/tools/build/v2/tools/como-linux.jam	2008-07-05 05:08:35 EDT (Sat, 05 Jul 2008)
@@ -1,9 +1,10 @@
-# Copyright 2004, 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) 
+# Copyright 2004, 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)
 
 # The following #// line will be used by the regression test table generation
-# program as the column heading for HTML tables. Must not include version number.
+# program as the column heading for HTML tables. Must not include a version
+# number.
 #//Comeau
C++
 
 import toolset ;
@@ -12,34 +13,36 @@
 import common ;
 import generators ;
 
-import unix ;  
+import unix ;
 import como ;
 
 feature.extend-subfeature toolset como : platform : linux ;
 
-toolset.inherit-generators como-linux 
+toolset.inherit-generators como-linux
      <toolset>como <toolset-como:platform>linux : unix ;
-generators.override como-linux.prebuilt : builtin.lib-generator ;     
+generators.override como-linux.prebuilt : builtin.lib-generator ;
 generators.override como-linux.searched-lib-generator : searched-lib-generator ;
 toolset.inherit-flags como-linux : unix ;
 toolset.inherit-rules como-linux : gcc ;
 
-generators.register-c-compiler como-linux.compile.c++ : CPP : OBJ 
-  : <toolset>como <toolset-como:platform>linux ;
+generators.register-c-compiler como-linux.compile.c++ : CPP : OBJ
+    : <toolset>como <toolset-como:platform>linux ;
 generators.register-c-compiler como-linux.compile.c : C : OBJ
-  : <toolset>como <toolset-como:platform>linux ;
+    : <toolset>como <toolset-como:platform>linux ;
+
 
 rule init ( version ? : command * : options * )
 {
     local condition = [ common.check-init-parameters como-linux
         : version $(version) ] ;
-    
-    command = [ common.get-invocation-command como-linux : como 
+
+    command = [ common.get-invocation-command como-linux : como
         : $(command) ] ;
-    
+
     common.handle-options como-linux : $(condition) : $(command) : $(options) ;
 }
 
+
 flags como-linux C++FLAGS <exception-handling>off : --no_exceptions ;
 flags como-linux C++FLAGS <exception-handling>on : --exceptions ;
 
@@ -98,4 +101,3 @@
 {
     ar rcu $(<) $(>)
 }
-

Modified: trunk/tools/build/v2/tools/como-win.jam
==============================================================================
--- trunk/tools/build/v2/tools/como-win.jam	(original)
+++ trunk/tools/build/v2/tools/como-win.jam	2008-07-05 05:08:35 EDT (Sat, 05 Jul 2008)
@@ -6,7 +6,8 @@
 # http://www.boost.org/LICENSE_1_0.txt)
 
 # The following #// line will be used by the regression test table generation
-# program as the column heading for HTML tables. Must not include version number.
+# program as the column heading for HTML tables. Must not include a version
+# number.
 #//Comeau
C++
 
 import common ;
@@ -17,38 +18,42 @@
 
 feature.extend-subfeature toolset como : platform : win ;
 
-# Initializes the Comeau toolset for windows.
-# The command is the command which invokes the compiler.
-# You should either set environment variable COMO_XXX_INCLUDE where
-# XXX is the used backed (as described in documentation), or pass
-# that as part of command, e.g:
-# 
+
+# Initializes the Comeau toolset for windows. The command is the command which
+# invokes the compiler. You should either set environment variable
+# COMO_XXX_INCLUDE where XXX is the used backend (as described in the
+# documentation), or pass that as part of command, e.g:
+#
 #   using como-win : 4.3 : "set COMO_BCC_INCLUDE=C:/include &&" como.exe ;
+#
 rule init ( version ? : command * : options * )
 {
     local condition = [  common.check-init-parameters como-win
         : version $(version) ] ;
-    
+
     command = [ common.get-invocation-command como-win : como.exe :
-        $(command) ] ;    
-    
+        $(command) ] ;
+
     common.handle-options como-win : $(condition) : $(command) : $(options) ;
 }
 
-generators.register-c-compiler como-win.compile.c++ : CPP : OBJ 
-  : <toolset>como <toolset-como:platform>win ;
+generators.register-c-compiler como-win.compile.c++ : CPP : OBJ
+    : <toolset>como <toolset-como:platform>win ;
 generators.register-c-compiler como-win.compile.c : C : OBJ
-  : <toolset>como <toolset-como:platform>win ;
+    : <toolset>como <toolset-como:platform>win ;
+
+
+generators.register-linker como-win.link
+    : OBJ SEARCHED_LIB STATIC_LIB IMPORT_LIB
+    : EXE
+    : <toolset>como <toolset-como:platform>win ;
+
+# Note that status of shared libraries support is not clear, so we do not define
+# the link.dll generator.
+generators.register-archiver como-win.archive
+    : OBJ : STATIC_LIB
+    : <toolset>como <toolset-como:platform>win ;
 
-generators.register-linker como-win.link 
-  : OBJ SEARCHED_LIB STATIC_LIB IMPORT_LIB 
-  : EXE
-  : <toolset>como <toolset-como:platform>win ;  
-# Note that status of shared libraries support is not clear, so we don't
-# define the link.dll generator.
-generators.register-archiver como-win.archive 
-  : OBJ : STATIC_LIB
-  : <toolset>como <toolset-como:platform>win ;  
 
 flags como-win C++FLAGS <exception-handling>off : --no_exceptions ;
 flags como-win C++FLAGS <exception-handling>on : --exceptions ;
@@ -56,16 +61,17 @@
 flags como-win CFLAGS <inlining>off : --no_inlining ;
 flags como-win CFLAGS <inlining>on <inlining>full : --inlining ;
 
-# The following seems to be VC-specific options. At least,
-# when I uncomment then, Comeau with bcc as backend reports
-# that bcc32 invocation.
+
+# The following seems to be VC-specific options. At least, when I uncomment
+# then, Comeau with bcc as backend reports that bcc32 invocation failed.
 #
 #flags como-win CFLAGS <debug-symbols>on : /Zi ;
 #flags como-win CFLAGS <optimization>off : /Od ;
 
+
 flags como-win CFLAGS <cflags> ;
-flags como-win CFLAGS : -D_WIN32 ; # make sure that we get the Boost Win32 platform config header.
-flags como-win CFLAGS <threading>multi : -D_MT ; # make sure that our config knows that threading is on.
+flags como-win CFLAGS : -D_WIN32 ;  # Make sure that we get the Boost Win32 platform config header.
+flags como-win CFLAGS <threading>multi : -D_MT ;  # Make sure that our config knows that threading is on.
 flags como-win C++FLAGS <cxxflags> ;
 flags como-win DEFINES <define> ;
 flags como-win UNDEFS <undef> ;
@@ -83,12 +89,12 @@
 flags como-win FINDLIBS <find-shared-library> ;
 flags como-win FINDLIBS <find-static-library> ;
 
-RM = [ common.rm-command ] ;
 nl = "
 " ;
 
 
-# for como, we repeat all libraries so that dependencies are always resolved
+# For como, we repeat all libraries so that dependencies are always resolved.
+#
 actions link bind LIBRARIES
 {
     $(CONFIG_COMMAND) --no_version --no_prelink_verbose $(LINKFLAGS) -o "$(<[1]:S=)" @"@($(<[1]:W).rsp:E=$(nl)"$(>)")" "$(LIBRARIES)" "$(FINDLIBS:S=.lib)"
@@ -109,4 +115,3 @@
     $(CONFIG_COMMAND) --no_version --no_prelink_verbose --prelink_object "$(>)"
     lib $(ARFLAGS) /nologo /out:"$(<:S=.lib)" "$(>)"
 }
-

Modified: trunk/tools/build/v2/tools/como.jam
==============================================================================
--- trunk/tools/build/v2/tools/como.jam	(original)
+++ trunk/tools/build/v2/tools/como.jam	2008-07-05 05:08:35 EDT (Sat, 05 Jul 2008)
@@ -3,9 +3,8 @@
 # (See accompanying file LICENSE_1_0.txt
 # or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-# This is a generic 'intel' toolset. Depending on the current
-# system, it forwards either to 'intel-linux' or 'intel-win'
-# modules.
+# This is a generic 'como' toolset. Depending on the current system, it
+# forwards either to 'como-linux' or 'como-win' modules.
 
 import feature ;
 import os ;