Merge pull request #13 from boostorg/danieljames-patch-3

Change the path of the quickbook documentation
2026-08-10 15:31:30 +02:00 · 2017-03-26 13:09:03 +03:00 · 2017-03-25 21:50:29 +00:00 · 2017-03-25 22:44:56 +03:00 · 2017-03-25 09:31:51 +03:00 · 2017-03-24 09:23:59 +00:00
3 changed files with 11 additions and 14 deletions
@@ -9,10 +9,10 @@ project doc/conversion ;
 using quickbook ;
 import boostbook ;

-xml conversion_lib : conversion.qbk ;
+xml conversion : conversion.qbk ;
 boostbook standalone
    :
-        conversion_lib
+        conversion
    :
        <xsl:param>boost.root=../../../..
        # File name of HTML output:
@@ -32,7 +32,7 @@ boostbook standalone
     ;

 ###############################################################################
-alias boostdoc : standalone ;
+alias boostdoc : conversion ;
 explicit boostdoc ;
 alias boostrelease ;
 explicit boostrelease ;
@@ -7,7 +7,7 @@
 [article The Conversion Library
    [quickbook 1.6]
    [compatibility-mode 1.5]
-    [id conversion_lib]
+    [id conversion]
    [version 1.6]
    [authors [Stroustrup, Bjarne], [Abrahams, Dave], [Rasin, Boris], [Polukhin, Antony]]
    [copyright 2001 Beman Dawes]
@@ -2,27 +2,23 @@
 # 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)
 #
-# Copyright Antony Polukhin 2016.
+# Copyright Antony Polukhin 2016-2017.

 #
 # See https://svn.boost.org/trac/boost/wiki/TravisCoverals for description of this file
 # and how it can be used with Boost libraries.
 #
-# File revision #2
+# File revision #3

 init:
-    - set BRANCH_TO_TEST=%APPVEYOR_REPO_BRANCH%
-    - set BOOST_REMOVE=conversion
-
-os: Visual Studio 2015
-configuration: Debug
-platform: x64
+    - set BRANCH_TO_TEST=%APPVEYOR_REPO_BRANCH%  # Change to branch you wish to test. Use %APPVEYOR_REPO_BRANCH% for current branch.
+    - set BOOST_REMOVE=conversion                # Remove this folder from lib from full clone of Boost. If you are testing `any` repo, write here `any`.

 ###############################################################################################################
 # From this point and below code is same for all the Boost libs
 ###############################################################################################################

-version: 1.61.{build}-{branch}
+version: 1.64.{build}-{branch}
 
 # branches to build
 branches:
@@ -32,6 +28,7 @@ branches:
 skip_tags: true

 before_build:
+    - set PATH=%PATH%;C:\\MinGW\\bin
    # Set this to the name of the library
    - set PROJECT_TO_TEST=%APPVEYOR_PROJECT_NAME%
    - echo "Testing %PROJECT_TO_TEST%"
@@ -59,7 +56,7 @@ build_script:
 after_build:
 before_test:
 test_script:
-  - ..\..\..\b2.exe address-model=64 architecture=x86 cxxflags="-DBOOST_TRAVISCI_BUILD" -sBOOST_BUILD_PATH=.
+    - ..\..\..\b2.exe address-model=32 architecture=x86 toolset=msvc,gcc cxxflags="-DBOOST_TRAVISCI_BUILD" -sBOOST_BUILD_PATH=.

 after_test:
 on_success:
Author	SHA1	Message	Date
Antony PolukhinandGitHub	51d544e6b8	Merge pull request #13 from boostorg/danieljames-patch-3 Change the path of the quickbook documentation	2017-03-26 13:09:03 +03:00
Daniel JamesandGitHub	ee92f4f98b	Change the path of the quickbook documentation The html path is determined by the quickbook id.	2017-03-25 21:50:29 +00:00
Antony Polukhin	d46e12c921	Attempt to fix the docs build and redirects	2017-03-25 22:44:56 +03:00
Antony PolukhinandGitHub	2648b144be	Merge pull request #11 from boostorg/danieljames-patch-1 Try to fix the documentation build	2017-03-25 09:31:51 +03:00
Daniel JamesandGitHub	32130aa427	Try to fix the documentation build I think boostdoc is depending on the wrong target. Not sure if this will work, but worth a go?	2017-03-24 09:23:59 +00:00
Antony Polukhin	c704762482	Run MinGW tests too (thanks to Pavel Filinov for showing that appveyor apability)	2017-02-23 21:21:50 +03:00