Subject: [Boost-commit] svn:boost r84500 - in branches/release/tools/quickbook: . src test/python test/snippets test/xinclude/sub
From: dnljms_at_[hidden]
Date: 2013-05-25 11:57:49
Author: danieljames
Date: 2013-05-25 11:57:48 EDT (Sat, 25 May 2013)
New Revision: 84500
URL: http://svn.boost.org/trac/boost/changeset/84500
Log:
Merge quickbook to release.
Added:
branches/release/tools/quickbook/test/xinclude/sub/boost-no-inspect
- copied unchanged from r84497, /trunk/tools/quickbook/test/xinclude/sub/boost-no-inspect
Properties modified:
branches/release/tools/quickbook/ (props changed)
Text files modified:
branches/release/tools/quickbook/src/quickbook.cpp | 2 +-
branches/release/tools/quickbook/test/python/include_path_deps.txt | 3 +++
branches/release/tools/quickbook/test/python/include_path_locs.txt | 3 +++
branches/release/tools/quickbook/test/python/missing_relative_deps.txt | 3 +++
branches/release/tools/quickbook/test/python/missing_relative_locs.txt | 3 +++
branches/release/tools/quickbook/test/python/output-deps.py | 6 ++++++
branches/release/tools/quickbook/test/python/svg_missing_deps.txt | 3 +++
branches/release/tools/quickbook/test/python/svg_missing_locs.txt | 3 +++
branches/release/tools/quickbook/test/snippets/unbalanced_snippet1.cpp | 8 ++++++++
branches/release/tools/quickbook/test/snippets/unbalanced_snippet2.cpp | 9 +++++++++
10 files changed, 42 insertions(+), 1 deletions(-)
Modified: branches/release/tools/quickbook/src/quickbook.cpp
==============================================================================
--- branches/release/tools/quickbook/src/quickbook.cpp (original)
+++ branches/release/tools/quickbook/src/quickbook.cpp 2013-05-25 11:57:48 EDT (Sat, 25 May 2013)
@@ -40,7 +40,7 @@
#pragma warning(disable:4355)
#endif
-#define QUICKBOOK_VERSION "Quickbook Version 1.5.9 (dev)"
+#define QUICKBOOK_VERSION "Quickbook Version 1.5.9"
namespace quickbook
{
Modified: branches/release/tools/quickbook/test/python/include_path_deps.txt
==============================================================================
--- branches/release/tools/quickbook/test/python/include_path_deps.txt (original)
+++ branches/release/tools/quickbook/test/python/include_path_deps.txt 2013-05-25 11:57:48 EDT (Sat, 25 May 2013)
@@ -1,3 +1,6 @@
+# Copyright 2012-2013 Daniel James
+# 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)
include_path.qbk
sub1/a.qbk
sub2/b.qbk
Modified: branches/release/tools/quickbook/test/python/include_path_locs.txt
==============================================================================
--- branches/release/tools/quickbook/test/python/include_path_locs.txt (original)
+++ branches/release/tools/quickbook/test/python/include_path_locs.txt 2013-05-25 11:57:48 EDT (Sat, 25 May 2013)
@@ -1,3 +1,6 @@
+# Copyright 2012-2013 Daniel James
+# 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)
+ include_path.qbk
- a.qbk
+ sub1/a.qbk
Modified: branches/release/tools/quickbook/test/python/missing_relative_deps.txt
==============================================================================
--- branches/release/tools/quickbook/test/python/missing_relative_deps.txt (original)
+++ branches/release/tools/quickbook/test/python/missing_relative_deps.txt 2013-05-25 11:57:48 EDT (Sat, 25 May 2013)
@@ -1 +1,4 @@
+# Copyright 2012-2013 Daniel James
+# 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)
missing_relative.qbk
Modified: branches/release/tools/quickbook/test/python/missing_relative_locs.txt
==============================================================================
--- branches/release/tools/quickbook/test/python/missing_relative_locs.txt (original)
+++ branches/release/tools/quickbook/test/python/missing_relative_locs.txt 2013-05-25 11:57:48 EDT (Sat, 25 May 2013)
@@ -1,3 +1,6 @@
+# Copyright 2012-2013 Daniel James
+# 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)
+ missing_relative.qbk
- ../missing.qbk
- missing-dir/x.qbk
Modified: branches/release/tools/quickbook/test/python/output-deps.py
==============================================================================
--- branches/release/tools/quickbook/test/python/output-deps.py (original)
+++ branches/release/tools/quickbook/test/python/output-deps.py 2013-05-25 11:57:48 EDT (Sat, 25 May 2013)
@@ -1,5 +1,9 @@
#!/usr/bin/env python
+# Copyright 2012-2013 Daniel James
+# 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 sys, os, subprocess, tempfile, re
def main(args, directory):
@@ -110,6 +114,7 @@
dependencies = set()
f = open(filename, 'r')
for path in f:
+ if path[0] == '#': continue
if adjust_paths:
path = os.path.realpath(path)
if path in dependencies:
@@ -122,6 +127,7 @@
dependencies = {}
f = open(filename, 'r')
for line in f:
+ if line[0] == '#': continue
m = line_matcher.match(line)
if not m:
raise Exception("Invalid dependency file: %1s" % filename)
Modified: branches/release/tools/quickbook/test/python/svg_missing_deps.txt
==============================================================================
--- branches/release/tools/quickbook/test/python/svg_missing_deps.txt (original)
+++ branches/release/tools/quickbook/test/python/svg_missing_deps.txt 2013-05-25 11:57:48 EDT (Sat, 25 May 2013)
@@ -1 +1,4 @@
+# Copyright 2012-2013 Daniel James
+# 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)
svg_missing.qbk
Modified: branches/release/tools/quickbook/test/python/svg_missing_locs.txt
==============================================================================
--- branches/release/tools/quickbook/test/python/svg_missing_locs.txt (original)
+++ branches/release/tools/quickbook/test/python/svg_missing_locs.txt 2013-05-25 11:57:48 EDT (Sat, 25 May 2013)
@@ -1,2 +1,5 @@
+# Copyright 2012-2013 Daniel James
+# 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)
- html/missing.svg
+ svg_missing.qbk
Modified: branches/release/tools/quickbook/test/snippets/unbalanced_snippet1.cpp
==============================================================================
--- branches/release/tools/quickbook/test/snippets/unbalanced_snippet1.cpp (original)
+++ branches/release/tools/quickbook/test/snippets/unbalanced_snippet1.cpp 2013-05-25 11:57:48 EDT (Sat, 25 May 2013)
@@ -1,3 +1,11 @@
+/*=============================================================================
+ Copyright (c) 2011 Daniel James
+
+ Use, modification and distribution is subject to 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)
+=============================================================================*/
+
//[unclosed
int main() {}
Modified: branches/release/tools/quickbook/test/snippets/unbalanced_snippet2.cpp
==============================================================================
--- branches/release/tools/quickbook/test/snippets/unbalanced_snippet2.cpp (original)
+++ branches/release/tools/quickbook/test/snippets/unbalanced_snippet2.cpp 2013-05-25 11:57:48 EDT (Sat, 25 May 2013)
@@ -1 +1,10 @@
//]
+
+/*=============================================================================
+ Copyright (c) 2011 Daniel James
+
+ Use, modification and distribution is subject to 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)
+=============================================================================*/
+