[Boost-commit] svn:boost r70515 - in branches/release/tools/inspect: . build/msvc

Subject: [Boost-commit] svn:boost r70515 - in branches/release/tools/inspect: . build/msvc
From: dnljms_at_[hidden]
Date: 2011-03-24 16:09:41

Author: danieljames
Date: 2011-03-24 16:09:40 EDT (Thu, 24 Mar 2011)
New Revision: 70515
URL: http://svn.boost.org/trac/boost/changeset/70515

Log:
Inspect: merge.

- Remove obsolete shell script.
- Fix string compares for windows paths.
- HTML encode error messages when generating html report.
- Ignore directories with `boost-no-inspect` file.

Removed:
   branches/release/tools/inspect/run_inspect.sh
Properties modified: 
   branches/release/tools/inspect/   (props changed)
Text files modified: 
   branches/release/tools/inspect/build/msvc/readme.txt |     5 +++--                                   
   branches/release/tools/inspect/inspect.cpp           |    39 +++++++++++++++++++++++++++++++-------- 
   2 files changed, 34 insertions(+), 10 deletions(-)

Modified: branches/release/tools/inspect/build/msvc/readme.txt
==============================================================================
--- branches/release/tools/inspect/build/msvc/readme.txt	(original)
+++ branches/release/tools/inspect/build/msvc/readme.txt	2011-03-24 16:09:40 EDT (Thu, 24 Mar 2011)
@@ -1,3 +1,4 @@
-The provided Microsoft VC++ solution assumes the following has been run in the root directory"
+The provided Microsoft VC++ solution assumes the following commands have been run in the root directory:
 
-     bjam --toolset=msvc-9.0express --build-type=complete --with-filesystem,regex stage
\ No newline at end of file
+     bjam --toolset=msvc-9.0express --build-type=complete --with-filesystem stage
+     bjam --toolset=msvc-9.0express --build-type=complete --with-regex stage

Modified: branches/release/tools/inspect/inspect.cpp
==============================================================================
--- branches/release/tools/inspect/inspect.cpp	(original)
+++ branches/release/tools/inspect/inspect.cpp	2011-03-24 16:09:40 EDT (Thu, 24 Mar 2011)
@@ -152,14 +152,9 @@
       // don't look at binaries
       && leaf != "bin"
       && leaf != "bin.v2"
-      // this really out of our hands
-      && leaf != "jam_src"
-      && local.find("tools/jam/src") != 0
-      && local.find("tools/build/v2/engine") != 0
-      // too many issues with generated HTML files
-      && leaf != "status"
       // no point in checking doxygen xml output
       && local.find("doc/xml") != 0
+      && local.find("doc\\xml") != 0
       // ignore some web files
       && leaf != ".htaccess"
       // ignore svn files:
@@ -169,6 +164,8 @@
       && leaf != ".bzr"
       // ignore OS X directory info files:
       && leaf != ".DS_Store"
+      // ignore if tag file present
+      && !boost::filesystem::exists(pth / "boost-no-inspect")
       ;
   }
 
@@ -348,6 +345,32 @@
       std::cout << "</blockquote>\n"; 
   }
 
+//  html_encode  -------------------------------------------------------------//
+
+  std::string html_encode(std::string const& text)
+  {
+    std::string result;
+    
+    for(std::string::const_iterator it = text.begin(),
+        end = text.end(); it != end; ++it)
+    {
+      switch(*it) {
+      case '<':
+        result += "&lt;";
+        break;
+      case '>':
+        result += "&gt;";
+        break;
+      case '&':
+        result += "&amp;";
+        break;
+      default:
+        result += *it;
+      }      
+    }
+    
+    return result;
+  }
 
 //  display_details  ---------------------------------------------------------//
 
@@ -442,8 +465,8 @@
 
           // print the message
           if (itr->line_number)
-            std::cout << sep << "(line " << itr->line_number << ") " << itr->msg;
-          else std::cout << sep << itr->msg;
+            std::cout << sep << "(line " << itr->line_number << ") " << html_encode(itr->msg);
+          else std::cout << sep << html_encode(itr->msg);
 
           first_sep = false;
         }

Deleted: branches/release/tools/inspect/run_inspect.sh
==============================================================================
--- branches/release/tools/inspect/run_inspect.sh	2011-03-24 16:09:40 EDT (Thu, 24 Mar 2011)
+++ (empty file)
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-#~ Copyright Rene Rivera 2006.
-#~ Distributed under the Boost Software License, Version 1.0.
-#~ (See accompanying file LICENSE_1_0.txt or copy at
-#~ http://www.boost.org/LICENSE_1_0.txt)
-
-set -e
-
-#~ Configuration options.
-mail_from="Rene Rivera <grafikrobot_at_[hidden]>"
-mail_to="Boost <boost_at_[hidden]>"
-mail_date=`date --iso-8601 --utc`
-mail_in_reply_to="$2"
-cvs_branch="$1"
-cvs_user=":ext:${USER}"
-cvs_co="cvs -q -z9 -d${cvs_user}@boost.cvs.sourceforge.net:/cvsroot/boost co -P -r ${cvs_branch}"
-cvs_dir="${HOME}/devroots"
-
-#~ Build bjam.
-cd ${cvs_dir}
-${cvs_co} -d boost_jam_src boost/tools/jam/src
-cd boost_jam_src
-LOCATE_TARGET=bin sh ./build.sh
-
-#~ Build inspect.
-cd ${cvs_dir}
-${cvs_co} -d boost_${cvs_branch} boost
-cd boost_${cvs_branch}/tools/inspect/build
-${cvs_dir}/boost_jam_src/bin/bjam --v2
-
-#~ Run the inspection.
-cd ${cvs_dir}
-cd boost_${cvs_branch}
-opt=""
-opt="${opt} -crlf"
-opt="${opt} -end"
-opt="${opt} -link"
-opt="${opt} -long_name"
-opt="${opt} -tab"
-opt="${opt} -minmax"
-opt="${opt} -unnamed"
-./dist/bin/inspect -text ${opt} > inspect-X.out
-opt=""
-opt="${opt} -license"
-opt="${opt} -copyright"
-./dist/bin/inspect -text -brief ${opt} > inspect-LC.out
-
-#~ Send email(s) with results.
-/usr/sbin/sendmail "${mail_to}" <<EMAIL
-From: ${mail_from}
-To: ${mail_to}
-Reply-To: ${mail_to}
-References: ${mail_in_reply_to}
-In-Reply-To: ${mail_in_reply_to}
-Subject: Boost inspection notification (${mail_date}/${cvs_branch}) *X*
-
-`cat inspect-X.out`
-EMAIL
-/usr/sbin/sendmail "${mail_to}" <<EMAIL
-From: ${mail_from}
-To: ${mail_to}
-Reply-To: ${mail_to}
-References: ${mail_in_reply_to}
-In-Reply-To: ${mail_in_reply_to}
-Subject: Boost inspection notification (${mail_date}/${cvs_branch}) *LC*
-
-`cat inspect-LC.out`
-EMAIL