Prep for formal inclusion into Boost trunk.

doc/build.jam

@@ -11,13 +11,22 @@ if ! $(BOOST_ROOT)
     BOOST_ROOT = [ modules.peek : BOOST_ROOT ] ;
 }
 
-local BOOST_PREDEF_HEADERS = [ path.glob-tree $(BOOST_PREDEF_ROOT)/include/boost/predef : *.h ] ;
+if $(BOOST_PREDEF_ROOT)
+{
+    path-constant BOOST_PREDEF_INCLUDE_ROOT : $(BOOST_PREDEF_ROOT)/include ;
+}
+else
+{
+    path-constant BOOST_PREDEF_INCLUDE_ROOT : $(BOOST_ROOT) ;
+}
+
+local BOOST_PREDEF_HEADERS = [ path.glob-tree $(BOOST_PREDEF_INCLUDE_ROOT)/boost/predef : *.h ] ;
 
 xml predef
     :
         predef.qbk
     :
-        <dependency>$(BOOST_PREDEF_ROOT)/include/boost/predef.h
+        <dependency>$(BOOST_PREDEF_INCLUDE_ROOT)/boost/predef.h
         <dependency>$(BOOST_PREDEF_HEADERS)
     ;
 explicit predef ;

doc/html/index.html

@@ -48,18 +48,9 @@
 <dt><span class="section"><a href="predef/acknoledgements.html">Acknoledgements</a></span></dt>
 </dl>
 </div>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-      This is a <span class="bold"><strong>proposed</strong></span> Boost Library and <span class="bold"><strong>is not</strong></span> part of the Boost C++ Libraries.
-    </p></td></tr>
-</table></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: April 22, 2013 at 14:00:37 GMT</small></p></td>
+<td align="left"><p><small>Last revised: July 28, 2013 at 17:05:40 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>

doc/html/predef/acknoledgements.html

@@ -12,7 +12,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="reference/version_definition_macros.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a>
 </div>
-<div class="section predef_acknoledgements">
+<div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="predef.acknoledgements"></a><a class="link" href="acknoledgements.html" title="Acknoledgements">Acknoledgements</a>
 </h2></div></div></div>

doc/html/predef/adding_new_predefs.html

@@ -13,7 +13,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="using_the_predefs.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="reference.html"><img src="../images/next.png" alt="Next"></a>
 </div>
-<div class="section predef_adding_new_predefs">
+<div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="predef.adding_new_predefs"></a><a class="link" href="adding_new_predefs.html" title="Adding new predefs">Adding new predefs</a>
 </h2></div></div></div>

doc/html/predef/introduction.html

@@ -13,7 +13,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../index.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="using_the_predefs.html"><img src="../images/next.png" alt="Next"></a>
 </div>
-<div class="section predef_introduction">
+<div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="predef.introduction"></a><a class="link" href="introduction.html" title="Introduction">Introduction</a>
 </h2></div></div></div>

doc/html/predef/reference.html

@@ -13,7 +13,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="adding_new_predefs.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="reference/boost_arch_architecture_macros.html"><img src="../images/next.png" alt="Next"></a>
 </div>
-<div class="section predef_reference">
+<div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="predef.reference"></a><a class="link" href="reference.html" title="Reference">Reference</a>
 </h2></div></div></div>

doc/html/predef/reference/boost_arch_architecture_macros.html

@@ -13,7 +13,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../reference.html"><img src="../../images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../images/home.png" alt="Home"></a><a accesskey="n" href="boost_comp_compiler_macros.html"><img src="../../images/next.png" alt="Next"></a>
 </div>
-<div class="section predef_reference_boost_arch_architecture_macros">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="predef.reference.boost_arch_architecture_macros"></a><a class="link" href="boost_arch_architecture_macros.html" title="BOOST_ARCH architecture macros"><code class="computeroutput"><span class="identifier">BOOST_ARCH</span></code> architecture macros</a>
 </h3></div></div></div>

doc/html/predef/reference/boost_comp_compiler_macros.html

@@ -13,7 +13,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="boost_arch_architecture_macros.html"><img src="../../images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../images/home.png" alt="Home"></a><a accesskey="n" href="boost_lang_language_standards_ma.html"><img src="../../images/next.png" alt="Next"></a>
 </div>
-<div class="section predef_reference_boost_comp_compiler_macros">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="predef.reference.boost_comp_compiler_macros"></a><a class="link" href="boost_comp_compiler_macros.html" title="BOOST_COMP compiler macros"><code class="computeroutput"><span class="identifier">BOOST_COMP</span></code> compiler macros</a>
 </h3></div></div></div>

doc/html/predef/reference/boost_lang_language_standards_ma.html

@@ -13,7 +13,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="boost_comp_compiler_macros.html"><img src="../../images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../images/home.png" alt="Home"></a><a accesskey="n" href="boost_lib_library_macros.html"><img src="../../images/next.png" alt="Next"></a>
 </div>
-<div class="section predef_reference_boost_lang_language_standards_ma">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="predef.reference.boost_lang_language_standards_ma"></a><a class="link" href="boost_lang_language_standards_ma.html" title="BOOST_LANG language standards macros"><code class="computeroutput"><span class="identifier">BOOST_LANG</span></code> language standards macros</a>
 </h3></div></div></div>

doc/html/predef/reference/boost_lib_library_macros.html

@@ -13,7 +13,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="boost_lang_language_standards_ma.html"><img src="../../images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../images/home.png" alt="Home"></a><a accesskey="n" href="boost_os_operating_system_macros.html"><img src="../../images/next.png" alt="Next"></a>
 </div>
-<div class="section predef_reference_boost_lib_library_macros">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="predef.reference.boost_lib_library_macros"></a><a class="link" href="boost_lib_library_macros.html" title="BOOST_LIB library macros"><code class="computeroutput"><span class="identifier">BOOST_LIB</span></code> library macros</a>
 </h3></div></div></div>

doc/html/predef/reference/boost_os_operating_system_macros.html

@@ -13,7 +13,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="boost_lib_library_macros.html"><img src="../../images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../images/home.png" alt="Home"></a><a accesskey="n" href="other_macros.html"><img src="../../images/next.png" alt="Next"></a>
 </div>
-<div class="section predef_reference_boost_os_operating_system_macros">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="predef.reference.boost_os_operating_system_macros"></a><a class="link" href="boost_os_operating_system_macros.html" title="BOOST_OS operating system macros"><code class="computeroutput"><span class="identifier">BOOST_OS</span></code> operating system macros</a>
 </h3></div></div></div>

doc/html/predef/reference/other_macros.html

@@ -13,7 +13,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="boost_os_operating_system_macros.html"><img src="../../images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../images/home.png" alt="Home"></a><a accesskey="n" href="version_definition_macros.html"><img src="../../images/next.png" alt="Next"></a>
 </div>
-<div class="section predef_reference_other_macros">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="predef.reference.other_macros"></a><a class="link" href="other_macros.html" title="Other macros">Other macros</a>
 </h3></div></div></div>
@@ -67,84 +67,6 @@
             Generally available searches for headers that define endianness.
           </li>
 </ol></div>
-<h5>
-<a name="predef.reference.other_macros.h1"></a>
-        <span class="phrase"><a name="predef.reference.other_macros.boost_plat_mingw"></a></span><a class="link" href="other_macros.html#predef.reference.other_macros.boost_plat_mingw"><code class="computeroutput"><span class="identifier">BOOST_PLAT_MINGW</span></code></a>
-      </h5>
-<p>
-        <a href="http://en.wikipedia.org/wiki/MinGW" target="_top">MinGW</a> platform. Version
-        number available as major, minor, and patch.
-      </p>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Symbol
-                </p>
-              </th>
-<th>
-                <p>
-                  Version
-                </p>
-              </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">__MINGW32__</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  <span class="bold"><strong>detection</strong></span>
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">__MINGW64__</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  <span class="bold"><strong>detection</strong></span>
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">__MINGW64_VERSION_MAJOR</span></code>,
-                  <code class="computeroutput"><span class="identifier">__MINGW64_VERSION_MINOR</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  V.R.0
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">__MINGW32_VERSION_MAJOR</span></code>,
-                  <code class="computeroutput"><span class="identifier">__MINGW32_VERSION_MINOR</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  V.R.0
-                </p>
-              </td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>

doc/html/predef/reference/version_definition_macros.html

@@ -13,7 +13,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="other_macros.html"><img src="../../images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../images/home.png" alt="Home"></a><a accesskey="n" href="../acknoledgements.html"><img src="../../images/next.png" alt="Next"></a>
 </div>
-<div class="section predef_reference_version_definition_macros">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="predef.reference.version_definition_macros"></a><a class="link" href="version_definition_macros.html" title="Version definition macros">Version definition
       macros</a>

doc/html/predef/using_the_predefs.html

@@ -13,7 +13,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="introduction.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="adding_new_predefs.html"><img src="../images/next.png" alt="Next"></a>
 </div>
-<div class="section predef_using_the_predefs">
+<div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="predef.using_the_predefs"></a><a class="link" href="using_the_predefs.html" title="Using the predefs">Using the predefs</a>
 </h2></div></div></div>

doc/predef.qbk

@@ -12,9 +12,6 @@
     [source-mode c++]
 ]
 
-[warning This is a *proposed* Boost Library and *is not* part of the
-Boost C++ Libraries.]
-
 [section Introduction]
 
 This library defines a set of compiler, architecture, operating system,

test/build.jam

@@ -4,15 +4,24 @@
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
+if $(BOOST_PREDEF_ROOT)
+{
+    path-constant BOOST_PREDEF_INCLUDE_ROOT : $(BOOST_PREDEF_ROOT)/include ;
+}
+else
+{
+    path-constant BOOST_PREDEF_INCLUDE_ROOT : $(BOOST_ROOT) ;
+}
+
 project test
     :   requirements
-        <include>$(BOOST_PREDEF_ROOT)/include
+        <include>$(BOOST_PREDEF_INCLUDE_ROOT)
-        <dependency>$(BOOST_PREDEF_ROOT)/include/boost/predef.h
+        <dependency>$(BOOST_PREDEF_INCLUDE_ROOT)/boost/predef.h
     ;
 
 using testing ;
 
-test-suite config :
+test-suite predef :
     [ run info_as_cpp.cpp : : : <test-info>always_show_run_output ]
     [ run info_as_c.c : : : <test-info>always_show_run_output ]
     [ run info_as_objcpp.mm : : : <test-info>always_show_run_output ]