[Boost-commit] svn:boost r75892 - in branches/quickbook-dev/tools/quickbook: doc src test

Subject: [Boost-commit] svn:boost r75892 - in branches/quickbook-dev/tools/quickbook: doc src test
From: dnljms_at_[hidden]
Date: 2011-12-11 06:11:54

Author: danieljames
Date: 2011-12-11 06:11:50 EST (Sun, 11 Dec 2011)
New Revision: 75892
URL: http://svn.boost.org/trac/boost/changeset/75892

Log:
Quickbook: Use 1.7 for everything on dev branch.

Might promote them to 1.6 later.
Added:
   branches/quickbook-dev/tools/quickbook/test/version-1_8-fail.quickbook   (contents, props changed)
      - copied, changed from r75848, /branches/quickbook-dev/tools/quickbook/test/version-1_7-fail.quickbook
Removed:
   branches/quickbook-dev/tools/quickbook/test/version-1_7-fail.quickbook
Text files modified: 
   branches/quickbook-dev/tools/quickbook/doc/1_6.qbk                     |     7 +++++--                                 
   branches/quickbook-dev/tools/quickbook/src/actions.cpp                 |     4 ++--                                    
   branches/quickbook-dev/tools/quickbook/src/doc_info_actions.cpp        |     7 ++++---                                 
   branches/quickbook-dev/tools/quickbook/test/Jamfile.v2                 |     2 +-                                      
   branches/quickbook-dev/tools/quickbook/test/version-1_8-fail.quickbook |     2 +-                                      
   5 files changed, 13 insertions(+), 9 deletions(-)

Modified: branches/quickbook-dev/tools/quickbook/doc/1_6.qbk
==============================================================================
--- branches/quickbook-dev/tools/quickbook/doc/1_6.qbk	(original)
+++ branches/quickbook-dev/tools/quickbook/doc/1_6.qbk	2011-12-11 06:11:50 EST (Sun, 11 Dec 2011)
@@ -278,6 +278,10 @@
 
 [endsect]
 
+[endsect] [/ Quickbok 1.6]
+
+[section:1_7 Quickbook 1.7]
+
 [section:glob Including multiple files with Globs]
 
 One can now include multiple files at once using a glob pattern for the
@@ -298,5 +302,4 @@
 
 [endsect]
 
-[endsect] [/ Quickbok 1.6]
-
+[endsect] [/ Quickbok 1.7]

Modified: branches/quickbook-dev/tools/quickbook/src/actions.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/actions.cpp	(original)
+++ branches/quickbook-dev/tools/quickbook/src/actions.cpp	2011-12-11 06:11:50 EST (Sun, 11 Dec 2011)
@@ -1699,7 +1699,7 @@
         std::string path_text = path.is_encoded() ? path.get_encoded() :
             path.get_quickbook();
 
-        if(qbk_version_n >= 106u && path_text.find_first_of("[]?*"))
+        if(qbk_version_n >= 107u && path_text.find_first_of("[]?*"))
         {
             // For a glob expression we don't correct '\' as it's could be
             // an escape for the glob.
@@ -1838,7 +1838,7 @@
 
             // If the path has some glob match characters
             // we do a discovery of all the matches..
-            if (qbk_version_n >= 106u && path_to_string(path).find_first_of("[]?*") != path_string_t::npos)
+            if (qbk_version_n >= 107u && path_to_string(path).find_first_of("[]?*") != path_string_t::npos)
             {
                 // Search for the current dir accumulating to the result.
                 include_search_glob(result,current,path,actions);

Modified: branches/quickbook-dev/tools/quickbook/src/doc_info_actions.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/doc_info_actions.cpp	(original)
+++ branches/quickbook-dev/tools/quickbook/src/doc_info_actions.cpp	2011-12-11 06:11:50 EST (Sun, 11 Dec 2011)
@@ -103,7 +103,7 @@
                 result = ((unsigned) major_verison * 100) +
                     (unsigned) minor_verison;
             
-                if(result < 100 || result > 106)
+                if(result < 100 || result > 107)
                 {
                     detail::outerr(actions.current_file->path)
                         << "Unknown version: "
@@ -205,10 +205,11 @@
 
         unsigned new_version = get_version(actions, use_doc_info, qbk_version);
 
-        if (new_version != qbk_version_n && new_version == 106)
+        if (new_version != qbk_version_n && new_version >= 106)
         {
             detail::outwarn(actions.current_file->path)
-                << "Quickbook 1.6 is still under development and is "
+                << "Quickbook " << (new_version / 100) << "." << (new_version % 100)
+                << " is still under development and is "
                 "likely to change in the future." << std::endl;
         }
 

Modified: branches/quickbook-dev/tools/quickbook/test/Jamfile.v2
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/Jamfile.v2	(original)
+++ branches/quickbook-dev/tools/quickbook/test/Jamfile.v2	2011-12-11 06:11:50 EST (Sun, 11 Dec 2011)
@@ -106,7 +106,7 @@
     [ quickbook-error-test variablelist-1_5-fail ]
     [ quickbook-test variablelist-1_5 ]
     [ quickbook-error-test version-0_1-fail ]
-    [ quickbook-error-test version-1_7-fail ]
+    [ quickbook-error-test version-1_8-fail ]
     [ quickbook-error-test version-2_0-fail ]
     [ quickbook-test xml_escape-1_2 ]
     [ quickbook-test xml_escape-1_5 ]

Deleted: branches/quickbook-dev/tools/quickbook/test/version-1_7-fail.quickbook
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/version-1_7-fail.quickbook	2011-12-11 06:11:50 EST (Sun, 11 Dec 2011)
+++ (empty file)
@@ -1,5 +0,0 @@
-[article Future version of quickbook
-    [quickbook 1.7]
-]
-
-This should fail...
\ No newline at end of file

Copied: branches/quickbook-dev/tools/quickbook/test/version-1_8-fail.quickbook (from r75848, /branches/quickbook-dev/tools/quickbook/test/version-1_7-fail.quickbook)
==============================================================================
--- /branches/quickbook-dev/tools/quickbook/test/version-1_7-fail.quickbook	(original)
+++ branches/quickbook-dev/tools/quickbook/test/version-1_8-fail.quickbook	2011-12-11 06:11:50 EST (Sun, 11 Dec 2011)
@@ -1,5 +1,5 @@
 [article Future version of quickbook
-    [quickbook 1.7]
+    [quickbook 1.8]
 ]
 
 This should fail...
\ No newline at end of file