Skip to content

Commit 351e06f

Browse files
committed
Merge branch 'develop'
2 parents da39dba + 231b5f9 commit 351e06f

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ Distributed under the [Boost Software License, Version 1.0](https://www.boost.or
4646

4747
Branch | GH Actions | Appveyor | Drone | codecov.io | Deps | Docs | Tests |
4848
:-------------: | ---------- | -------- | ----- | ---------- | ---- | ---- | ----- |
49-
[`master`](https://github.com/boostorg/locale/tree/master) | [![CI](https://github.com/boostorg/locale/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/boostorg/locale/actions/workflows/ci.yml) | [![Build status](https://ci.appveyor.com/api/projects/status/github/boostorg/locale?branch=master&svg=true)](https://ci.appveyor.com/project/Flamefire/locale/branch/master) | [![Build Status](https://drone.cpp.al/api/badges/boostorg/locale/status.svg?ref=refs/heads/master)](https://drone.cpp.al/boostorg/locale) | [![codecov](https://codecov.io/gh/boostorg/locale/branch/master/graph/badge.svg)](https://codecov.io/gh/boostorg/locale/branch/master) | [![Deps](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/locale.html) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](https://www.boost.org/doc/libs/master/libs/locale/doc/html/index.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](https://regression.boost.io/master/developer/locale.html)
50-
[`develop`](https://github.com/boostorg/locale/tree/develop) | [![CI](https://github.com/boostorg/locale/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/boostorg/locale/actions/workflows/ci.yml) | [![Build status](https://ci.appveyor.com/api/projects/status/github/boostorg/locale?branch=develop&svg=true)](https://ci.appveyor.com/project/Flamefire/locale/branch/develop) | [![Build Status](https://drone.cpp.al/api/badges/boostorg/locale/status.svg?ref=refs/heads/develop)](https://drone.cpp.al/boostorg/locale) | [![codecov](https://codecov.io/gh/boostorg/locale/branch/develop/graph/badge.svg)](https://codecov.io/gh/boostorg/locale/branch/develop) | [![Deps](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/locale.html) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](https://www.boost.org/doc/libs/develop/libs/locale/doc/html/index.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](https://regression.boost.io/develop/developer/locale.html)
49+
[`master`](https://github.com/boostorg/locale/tree/master) | [![CI](https://github.com/boostorg/locale/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/boostorg/locale/actions/workflows/ci.yml) | [![Build status](https://ci.appveyor.com/api/projects/status/github/boostorg/locale?branch=master&svg=true)](https://ci.appveyor.com/project/Flamefire/locale/branch/master) | [![Build Status](https://drone.cpp.al/api/badges/boostorg/locale/status.svg?ref=refs/heads/master)](https://drone.cpp.al/boostorg/locale) | [![codecov](https://codecov.io/gh/boostorg/locale/branch/master/graph/badge.svg)](https://codecov.io/gh/boostorg/locale/branch/master) | [![Deps](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/locale.html) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](https://www.boost.org/doc/libs/master/libs/locale/doc/html/index.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](https://regression.boost.org/master/developer/locale.html)
50+
[`develop`](https://github.com/boostorg/locale/tree/develop) | [![CI](https://github.com/boostorg/locale/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/boostorg/locale/actions/workflows/ci.yml) | [![Build status](https://ci.appveyor.com/api/projects/status/github/boostorg/locale?branch=develop&svg=true)](https://ci.appveyor.com/project/Flamefire/locale/branch/develop) | [![Build Status](https://drone.cpp.al/api/badges/boostorg/locale/status.svg?ref=refs/heads/develop)](https://drone.cpp.al/boostorg/locale) | [![codecov](https://codecov.io/gh/boostorg/locale/branch/develop/graph/badge.svg)](https://codecov.io/gh/boostorg/locale/branch/develop) | [![Deps](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/locale.html) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](https://www.boost.org/doc/libs/develop/libs/locale/doc/html/index.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](https://regression.boost.org/develop/developer/locale.html)
5151

5252
### Directories
5353

build/Jamfile.v2

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@ constant boost_dependencies_private :
2121
/boost/thread//boost_thread
2222
;
2323

24-
project
25-
: source-location $(TOP)/src
26-
: common-requirements <library>$(boost_dependencies)
27-
: requirements <library>$(boost_dependencies_private)
28-
;
24+
project : source-location $(TOP)/src ;
2925

3026
local rule debug-message ( message * )
3127
{
@@ -408,7 +404,7 @@ local cxx_requirements = [ requires
408404
] ;
409405

410406
lib boost_locale
411-
:
407+
: sources
412408
encoding/codepage.cpp
413409
shared/date_time.cpp
414410
shared/format.cpp
@@ -424,7 +420,9 @@ lib boost_locale
424420
util/encoding.cpp
425421
util/info.cpp
426422
util/locale_data.cpp
427-
: # requirements
423+
: requirements
424+
<library>$(boost_dependencies_private)/<warnings-as-errors>off
425+
<library>$(boost_dependencies)/<warnings-as-errors>off
428426
$(cxx_requirements)
429427
<link>shared:<define>BOOST_LOCALE_DYN_LINK=1
430428
<define>BOOST_LOCALE_SOURCE
@@ -433,7 +431,8 @@ lib boost_locale
433431
<target-os>windows:<define>_SCL_SECURE_NO_WARNINGS
434432
# Meanwhile remove this
435433
<conditional>@configure
436-
: : # usage-requirements
434+
: usage-requirements
435+
<library>$(boost_dependencies)/<warnings-as-errors>off
437436
$(cxx_requirements)
438437
<link>shared:<define>BOOST_LOCALE_DYN_LINK=1
439438
<define>BOOST_LOCALE_NO_LIB=1

doc/templates/footer.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<!--BEGIN GENERATE_TREEVIEW-->
22
<li class="footer">
3-
&copy; Copyright 2009-2012 Artyom Beilis, Distributed under the <a href="https://www.boost.org/LICENSE_1_0.txt">Boost Software License</a>, Version 1.0.
3+
&copy; Copyright 2009-2012 Artyom Beilis, &copy; Copyright 2021-2025 Alexander Grund, Distributed under the <a href="https://www.boost.org/LICENSE_1_0.txt">Boost Software License</a>, Version 1.0.
4+
Distributed under the <a href="https://www.boost.org/LICENSE_1_0.txt">Boost Software License</a>, Version 1.0.
45
</li>
56
</ul>
67
</div>
78
<!--END GENERATE_TREEVIEW-->
89
<!--BEGIN !GENERATE_TREEVIEW-->
910
<hr class="footer"/><address class="footer"><small>
10-
&copy; Copyright 2009-2012 Artyom Beilis, Distributed under the <a href="https://www.boost.org/LICENSE_1_0.txt">Boost Software License</a>, Version 1.0.
11+
&copy; Copyright 2009-2012 Artyom Beilis, &copy; Copyright 2021-2025 Alexander Grund, Distributed under the <a href="https://www.boost.org/LICENSE_1_0.txt">Boost Software License</a>, Version 1.0.
1112
</small></address>
1213
<!--END !GENERATE_TREEVIEW-->
1314
</body>

0 commit comments

Comments
 (0)