Skip to content

Commit fe1621e

Browse files
committed
Merge branch 'develop' of https://github.com/boostorg/gil into develop
2 parents f4369d1 + bbdce36 commit fe1621e

File tree

132 files changed

+8264
-646
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+8264
-646
lines changed

.appveyor.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,6 @@ environment:
2929
CXXSTD: 11
3030
TEST_HEADERS: 1
3131
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
32-
- TOOLSET: msvc-14.1
33-
ARCH: x86_64
34-
VARIANT: debug
35-
CXXSTD: 17
36-
TEST_HEADERS: 1
37-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
38-
- TOOLSET: msvc-14.1
39-
ARCH: x86_64
40-
VARIANT: release
41-
CXXSTD: 17
42-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
4332
- TOOLSET: msvc-14.1
4433
ARCH: x86_64
4534
VARIANT: debug
@@ -64,10 +53,21 @@ environment:
6453
- TOOLSET: msvc-14.1
6554
ARCH: x86_64
6655
VARIANT: debug
67-
CXXSTD: 14
68-
GENERATOR: "Visual Studio 15 2017 Win64"
69-
CMAKE_CONFIG: Debug
56+
CXXSTD: 17
57+
TEST_HEADERS: 1
58+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
59+
- TOOLSET: msvc-14.1
60+
ARCH: x86_64
61+
VARIANT: release
62+
CXXSTD: 17
7063
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
64+
# - TOOLSET: msvc-14.1
65+
# ARCH: x86_64
66+
# VARIANT: debug
67+
# CXXSTD: 14
68+
# GENERATOR: "Visual Studio 15 2017 Win64"
69+
# CMAKE_CONFIG: Debug
70+
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
7171

7272
matrix:
7373
fast_finish: true

.azure-pipelines.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
66
#
77
variables:
8-
system.debug: true
8+
#system.debug: true
99
configuration: release
1010

1111
trigger:
@@ -15,10 +15,13 @@ trigger:
1515
- ml/*
1616

1717
jobs:
18-
- job: 'ubuntu1604_gcc5_cxx11_cmake'
18+
- job: 'ubuntu1604_gcc6_cxx14_cmake'
1919
pool:
2020
vmImage: 'ubuntu-16.04'
2121
steps:
22+
- template: .ci/azure-pipelines/steps-install-gcc.yml
23+
parameters:
24+
major_version: '6'
2225
- script: which g++ && g++ --version
2326
displayName: 'Check GCC'
2427
- template: .ci/azure-pipelines/steps-check-cmake.yml
@@ -28,12 +31,16 @@ jobs:
2831
displayName: 'Install dependencies'
2932
- template: .ci/azure-pipelines/steps-install-boost.yml
3033
- template: .ci/azure-pipelines/steps-cmake-build-and-test.yml
34+
parameters:
35+
cxxver: '14'
3136

3237
- job: 'ubuntu1604_gcc8_cxx14_cmake'
3338
pool:
3439
vmImage: 'ubuntu-16.04'
3540
steps:
3641
- template: .ci/azure-pipelines/steps-install-gcc.yml
42+
parameters:
43+
major_version: '8'
3744
- script: which g++ && g++ --version
3845
displayName: 'Check GCC'
3946
- template: .ci/azure-pipelines/steps-check-cmake.yml

.ci/coverage.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

.ci/upload_docs.sh

Lines changed: 0 additions & 53 deletions
This file was deleted.

.circleci/config.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ env_gcc_cpp11_dbg: &env_gcc_cpp11_dbg
8787
- OPTIMIZ: ""
8888
- CXXSTD: "11"
8989
- LNKFLAG: ""
90+
- B2_VERBOSE: "0"
9091

9192
env_gcc_cpp11_opt_speed: &env_gcc_cpp11_opt_speed
9293
environment:
@@ -95,6 +96,7 @@ env_gcc_cpp11_opt_speed: &env_gcc_cpp11_opt_speed
9596
- OPTIMIZ: "optimization=speed"
9697
- CXXSTD: "11"
9798
- LNKFLAG: ""
99+
- B2_VERBOSE: "0"
98100

99101
env_clang_cpp11_dbg: &env_clang_cpp11_dbg
100102
environment:
@@ -103,6 +105,7 @@ env_clang_cpp11_dbg: &env_clang_cpp11_dbg
103105
- OPTIMIZ: ""
104106
- CXXSTD: "11"
105107
- LNKFLAG: ""
108+
- B2_VERBOSE: "0"
106109

107110
env_clang_cpp11_opt_speed: &env_clang_cpp11_opt_speed
108111
environment:
@@ -111,6 +114,7 @@ env_clang_cpp11_opt_speed: &env_clang_cpp11_opt_speed
111114
- OPTIMIZ: "optimization=speed"
112115
- CXXSTD: "11"
113116
- LNKFLAG: ""
117+
- B2_VERBOSE: "0"
114118

115119
##############################################################################
116120
# Build configurations
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
name: 'Get Docs Prerequisites'
2+
description: 'Downloads all the necessary packages for building documentation'
3+
runs:
4+
using: composite
5+
steps:
6+
- run: sudo apt-get install doxygen python3 python3-pip python3-setuptools python3-sphinx
7+
shell: bash
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: 'Generate Doc'
2+
description: 'Runs b2 on lib/gil/doc to generate documentation'
3+
runs:
4+
using: composite
5+
steps:
6+
- run: |
7+
echo "using doxygen ;" > ~/user-config.jam
8+
cd ../boost-root/libs
9+
../b2 gil/doc
10+
cd gil
11+
chmod +x $GITHUB_WORKSPACE/.github/actions/generate-doc/docs-config.sh
12+
$GITHUB_WORKSPACE/.github/actions/generate-doc/docs-config.sh
13+
shell: bash
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/bin/bash
2+
set -e # Exit with Non Zero exit Code
3+
4+
mkdir temp-doc
5+
cd temp-doc
6+
7+
git init
8+
9+
10+
git remote add upstream "https://github.com/boostorg/gil.git"
11+
12+
git fetch upstream
13+
git switch gh-pages
14+
15+
16+
if [ "${GITHUB_REF##*/}" = develop ]; then
17+
# Only updates develop directory and keeps others intact
18+
rm -r develop
19+
mkdir -p develop/doc
20+
cp ../index.html develop/
21+
cp ../doc/index.html develop/doc
22+
cp -a ../doc/html develop/doc/
23+
else
24+
# main branch
25+
rm index.html
26+
rm -r html
27+
cp ../doc/index.html .
28+
cp -r ../doc/html .
29+
fi
30+
31+
# Remove version control
32+
rm -rf .git
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: 'Setup-Boost'
2+
description: 'Downloads and sets up the necessary dependencies of Boost'
3+
runs:
4+
using: composite
5+
steps:
6+
- run: |
7+
REF=${GITHUB_BASE_REF:-$GITHUB_REF}
8+
BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
9+
cd ..
10+
git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
11+
cd boost-root
12+
cp -r $GITHUB_WORKSPACE/* libs/gil
13+
git submodule update --init tools/boostdep
14+
python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" gil
15+
./bootstrap.sh
16+
./b2 -d0 headers
17+
shell: bash

0 commit comments

Comments
 (0)