Merge pull request mat007#92 from Flamefire/clean_build_dir

Clean build dir

.github/workflows/release.yml

@@ -0,0 +1,63 @@
+# Copyright 2020 Alexander Grund
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
+
+name: Release
+
+on:
+  push:
+    branches: [master]
+    tags: ['v*']
+
+jobs:
+  release:
+    name: Create Release
+    runs-on: ubuntu-latest
+    env:
+      BOOST_VERSION: 1.71.0
+      BOOST_ROOT: ${{github.workspace}}/dependencies/boost
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
+        with:
+          repository: boostorg/boost
+          ref: boost-${{env.BOOST_VERSION}}
+          path: ${{env.BOOST_ROOT}}
+          fetch-depth: 1
+      - name: Prepare boost
+        working-directory: ${{env.BOOST_ROOT}}
+        run: |
+          git submodule update --init --jobs 3 tools/boostdep tools/quickbook tools/boostbook
+          python tools/boostdep/depinst/depinst.py --exclude test --git_args '--jobs 3' ../tools/quickbook
+          ./bootstrap.sh || (cat bootstrap.log && false)
+      - name: Install dependencies
+        run: sudo apt-get install xsltproc docbook-xsl docbook-xml
+      - name: Create documentation
+        run: scripts/build_doc.sh -j3
+      - name: Package documentation
+        run: tar -czvf turtle_doc.tar.gz html
+        working-directory: doc
+      # This runs only when actual tags are created
+      - name: Create Release
+        if: startsWith(github.ref, 'refs/tags/')
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          body: |
+            C++ mock object library for Boost 
+          draft: true
+          prerelease: false
+      - name: Upload docs
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: doc/turtle_doc.tar.gz
+          asset_name: turtle_doc.tar.gz
+          asset_content_type: application/tar.gz

.gitignore

@@ -1,5 +1,5 @@
 .vscode
 bin
 out
-build/xsl
+/build
 __build

.travis.yml

@@ -3,11 +3,7 @@
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 #
 # Copyright Antony Polukhin 2014.
-
-#
-# See https://svn.boost.org/trac/boost/wiki/TravisCoverals for description of this file
-# and how it can be used with Boost libraries.
-#
+# Copyright Alexander Grund 2020.
 
 language: cpp
 
@@ -49,32 +45,28 @@ before_install:
     - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 60 --slave /usr/bin/g++ g++ /usr/bin/g++-5
     - gcc --version
 
-    # Set this to the name of your Boost library
-    # Autodetect library name by using the following code: - PROJECT_TO_TEST=$(basename $(pwd))
-    - PROJECT_TO_TEST=$(basename $(pwd))
-
     # Files, which coverage results must be ignored (files from other projects). Example: - IGNORE_COVERAGE='*/boost/progress.hpp */filesystem/src/path.cpp'
     - IGNORE_COVERAGE='*/boost-local/*'
 
     # From this point and below code is same for all the Boost libs
     # Cloning Boost libraries (fast nondeep cloning)
     - PROJECT_DIR=`pwd`
     - git --version
-    - BOOST=$HOME/boost-local
-    - git clone -b $BRANCH_TO_TEST --depth 1 https://github.com/boostorg/boost.git $BOOST
-    - cd $BOOST
+    - BOOST_ROOT=$HOME/boost-local
+    - git clone -b $BRANCH_TO_TEST --depth 1 https://github.com/boostorg/boost.git $BOOST_ROOT
+    - cd $BOOST_ROOT
     - git submodule update --init --depth 1
     - ./bootstrap.sh
     - ./b2 headers
 
 script:
     - cd $PROJECT_DIR
-    - export BOOST_ROOT=$BOOST
+    - export BOOST_ROOT
     # `--coverage` flags required to generate coverage info for Coveralls
-    - build/build.sh --toolset=$CC "cxxflags=-std=c++$CXX_STANDARD -Wno-unused-local-typedefs -Wno-unused-function -Wno-deprecated-declarations --coverage" "linkflags=--coverage" -j3
+    - scripts/build.sh --toolset=$CC "cxxflags=-std=c++$CXX_STANDARD -Wno-unused-local-typedefs -Wno-unused-function -Wno-deprecated-declarations --coverage" "linkflags=--coverage" -j3
     # CMake build
-    - cd $BOOST && ./b2 --with-test --with-thread --with-chrono --with-system --with-atomic --with-date_time -a -j3 # Build required libs
-    - mkdir $PROJECT_DIR/__build && cd $PROJECT_DIR/__build
+    - cd $BOOST_ROOT && ./b2 --with-test --with-thread --with-chrono --with-system --with-atomic --with-date_time -a -j3 # Build required libs
+    - mkdir $PROJECT_DIR/build && cd $PROJECT_DIR/build
     - cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-std=c++$CXX_STANDARD"
     - cmake --build . --config Debug -- -j3
     - ctest --output-on-failure --build-config Debug

CMakeLists.txt

@@ -22,7 +22,7 @@ endif()
 find_package(Boost 1.58 REQUIRED)
 
 set(MOCK_VERSION "\"${PROJECT_VERSION}\"")
-configure_file(build/version.hpp ${CMAKE_CURRENT_BINARY_DIR}/include/turtle/version.hpp @ONLY)
+configure_file(version.hpp.cmake ${CMAKE_CURRENT_BINARY_DIR}/include/turtle/version.hpp @ONLY)
 
 add_library(turtle INTERFACE)
 add_library(turtle::turtle ALIAS turtle)

Jamroot.jam

@@ -6,9 +6,11 @@
 
 import modules ;
 
-local boost = [ modules.peek : BOOST ] ;
+if BOOST_ROOT
+{
+    local boost = [ modules.peek : BOOST_ROOT ] ;
 
-project mock : requirements <include>$(boost) <include>. ;
+    project mock : requirements <include>$(boost) ;
 
-# This seems to prevent some Boost.Build errors that otherwise occur :-(
-use-project /boost : $(boost) ;
+    #use-project /boost : $(boost) ;
+}

appveyor.yml

@@ -53,7 +53,7 @@ build_script:
   - cd %APPVEYOR_BUILD_FOLDER%
   - if NOT "%CXX_STANDARD%"=="" set CXX_FLAGS=cxxflags=/std:c++%CXX_STANDARD%
   - set BUILD_ARGS=address-model=32,64 variant=debug,release
-  - call build\build.bat --toolset=%TOOLSET% %CXX_FLAGS% -j3
+  - call scripts\build.bat --toolset=%TOOLSET% %CXX_FLAGS% -j3
 
 for:
   - matrix:
@@ -62,8 +62,7 @@ for:
     build_script:
       - set BOOST_ROOT=C:\Libraries\boost_%BOOST%
       - cd %APPVEYOR_BUILD_FOLDER%
-      - mkdir __build
-      - cd __build
+      - mkdir build && cd build
       - cmake .. -DCMAKE_BUILD_TYPE=Debug
       - cmake --build . --config Debug
       - ctest --output-on-failure --build-config Debug