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

Subject: [Boost-commit] svn:boost r80179 - trunk/tools/build/v2/engine
From: jurko.gospodnetic_at_[hidden]
Date: 2012-08-24 19:23:44

Author: jurko
Date: 2012-08-24 19:23:44 EDT (Fri, 24 Aug 2012)
New Revision: 80179
URL: http://svn.boost.org/trac/boost/changeset/80179

Log:
Boost Jam cleanup - minor stylistic changes.
Text files modified: 
   trunk/tools/build/v2/engine/build.jam |    25 ++++++++++++-------------               
   trunk/tools/build/v2/engine/build.sh  |    18 +++++++++---------                      
   trunk/tools/build/v2/engine/jam.c     |     2 +-                                      
   3 files changed, 22 insertions(+), 23 deletions(-)

Modified: trunk/tools/build/v2/engine/build.jam
==============================================================================
--- trunk/tools/build/v2/engine/build.jam	(original)
+++ trunk/tools/build/v2/engine/build.jam	2012-08-24 19:23:44 EDT (Fri, 24 Aug 2012)
@@ -1,6 +1,7 @@
 #~ Copyright 2002-2007 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)
+#~ (See accompanying file LICENSE_1_0.txt or copy at
+#~ http://www.boost.org/LICENSE_1_0.txt)
 
 # Clean env vars of any "extra" empty values.
 for local v in ARGV CC CFLAGS LIBS
@@ -472,7 +473,7 @@
 
 if --show-locate-target in $(ARGV)
 {
-  ECHO $(locate-target) ;
+    ECHO $(locate-target) ;
 }
 
 # We have some different files for UNIX, and NT.
@@ -786,11 +787,10 @@
 
 
 # Scan sources for header dependencies.
-#	WARNING: Yes those are *REAL TABS* below. DO NOT CHANGE,
-#	under any circumstances, to spaces!! And the tabs
-#	indenting this are so that if someone is in the mood to
-#	replace tabs they hit this comment, and hopefully notice
-#	their error.
+#	WARNING: Yes those are *REAL TABS* below. DO NOT CHANGE, under any 
+#	circumstances, to spaces!! And the tabs indenting this are here so that if
+#	someone is in the mood to replace tabs they hit this comment, and hopefully
+#	notice their error.
 rule .scan
 {
     HDRRULE on $(<:D=) = .hdr.scan ;
@@ -805,10 +805,9 @@
 }
 .scan [ GLOB . : *.c ] ;
 
-# Distribution making from here on out. Assumes that
-# the docs are already built as html at ../doc/html. If
-# they aren't, then the docs are not included in the dist
-# archive.
+# Distribution making from here on out. Assumes that the docs are already built
+# as HTML at ../doc/html. If they are not, then the docs are not included in the
+# dist archive.
 dist.license =
     [ GLOB . : $(LICENSE).txt ]
     ;
@@ -996,8 +995,8 @@
     rm -f rpm.out
 }
 
-# The distribution targets. Don't bother with the targets if
-# distribution build not requested.
+# The distribution targets. Do not bother with them unless this is a
+# distribution build.
 if dist in $(ARGV)
 {
     #~ .binary bjam ;

Modified: trunk/tools/build/v2/engine/build.sh
==============================================================================
--- trunk/tools/build/v2/engine/build.sh	(original)
+++ trunk/tools/build/v2/engine/build.sh	2012-08-24 19:23:44 EDT (Fri, 24 Aug 2012)
@@ -2,13 +2,14 @@
 
 #~ Copyright 2002-2005 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)
+#~ (See accompanying file LICENSE_1_0.txt or copy at
+#~ http://www.boost.org/LICENSE_1_0.txt)
 
 # Reset the toolset.
 BOOST_JAM_TOOLSET=
 
-# Run a command, and echo before doing so. Also checks the exit
-# status and quits if there was an error.
+# Run a command, and echo before doing so. Also checks the exit status and quits
+# if there was an error.
 echo_run ()
 {
     echo "$@"
@@ -153,11 +154,10 @@
         BOOST_JAM_TOOLSET_ROOT=/opt/intel/compiler50/ia32/
     fi
     if test -r ${BOOST_JAM_TOOLSET_ROOT}bin/iccvars.sh ; then
-        # iccvars doesn't change LD_RUN_PATH. We adjust LD_RUN_PATH
-        # here in order not to have to rely on ld.so.conf knowing the
-        # icc library directory. We do this before running iccvars.sh
-        # in order to allow a user to add modifications to LD_RUN_PATH
-        # in iccvars.sh.
+        # iccvars does not change LD_RUN_PATH. We adjust LD_RUN_PATH here in
+        # order not to have to rely on ld.so.conf knowing the icc library
+        # directory. We do this before running iccvars.sh in order to allow a
+        # user to add modifications to LD_RUN_PATH in iccvars.sh.
         if test -z "${LD_RUN_PATH}"; then
             LD_RUN_PATH="${BOOST_JAM_TOOLSET_ROOT}lib"
         else
@@ -262,7 +262,7 @@
 esac
 
 BJAM_UPDATE=
-if test "$1" = "--update" -o "$2" = "--update" -o "$3" = "--update" -o "$4" = "--update"  ; then
+if test "$1" = "--update" -o "$2" = "--update" -o "$3" = "--update" -o "$4" = "--update" ; then
     BJAM_UPDATE="update"
 fi
 if test "${BJAM_UPDATE}" = "update" -a ! -x "./bootstrap/jam0" ; then

Modified: trunk/tools/build/v2/engine/jam.c
==============================================================================
--- trunk/tools/build/v2/engine/jam.c	(original)
+++ trunk/tools/build/v2/engine/jam.c	2012-08-24 19:23:44 EDT (Fri, 24 Aug 2012)
@@ -621,7 +621,7 @@
     uint32_t size = sizeof( buf );
     return _NSGetExecutablePath( buf, &size ) ? NULL : strdup( buf );
 }
-#elif defined(sun) || defined(__sun) /* Not tested */
+#elif defined(sun) || defined(__sun)  /* Not tested */
 # include <stdlib.h>
 char * executable_path( char const * argv0 )
 {