Skip to content

Commit f024f92

Browse files
committed
Merge branch 'develop'
2 parents 8239711 + e8870b2 commit f024f92

97 files changed

Lines changed: 2730 additions & 866 deletions

File tree

Some content is hidden

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

.drone.jsonnet

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,6 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
107107
};
108108

109109
[
110-
linux_pipeline(
111-
"Linux 18.04 GCC 7* 32/64",
112-
"cppalliance/droneubuntu1804:1",
113-
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '14,17', ADDRMD: '64' },
114-
"nload",
115-
),
116-
117110
linux_pipeline(
118111
"Linux 18.04 GCC 8 32/64",
119112
"cppalliance/droneubuntu1804:1",

.github/workflows/ci.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@ jobs:
3434
fail-fast: false
3535
matrix:
3636
include:
37-
- toolset: gcc-7
38-
cxxstd: "03,11,14,17"
39-
address_model: 64
40-
os: ubuntu-latest
41-
container: ubuntu:18.04
42-
install:
43-
- g++-7-multilib
4437
- toolset: gcc-8
4538
cxxstd: "03,11,14,17,2a"
4639
address_model: 32,64

CMakeLists.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,7 @@
44

55
cmake_minimum_required(VERSION 3.10...3.20)
66

7-
# Set version explicitly if not part of Boost superproject
8-
if(NOT BOOST_SUPERPROJECT_VERSION)
9-
set(BOOST_DECIMAL_VERSION 6.0.1)
10-
else()
11-
set(BOOST_DECIMAL_VERSION ${BOOST_SUPERPROJECT_VERSION})
12-
endif()
13-
14-
project(boost_decimal VERSION ${BOOST_DECIMAL_VERSION} LANGUAGES CXX)
7+
project(boost_decimal VERSION 1.91.0 LANGUAGES CXX)
158

169
add_library(boost_decimal INTERFACE)
1710

README.md

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
| | Master | Develop |
44
|------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------|
5-
| Drone | [![Build Status](https://drone.cpp.al/api/badges/cppalliance/decimal/status.svg?ref=refs/heads/master)](https://drone.cpp.al/cppalliance/decimal) | [![Build Status](https://drone.cpp.al/api/badges/cppalliance/decimal/status.svg?ref=refs/heads/develop)](https://drone.cpp.al/cppalliance/decimal) |
6-
| Github Actions | [![CI](https://github.com/cppalliance/decimal/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/cppalliance/decimal/actions/workflows/ci.yml) | [![CI](https://github.com/cppalliance/decimal/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/cppalliance/decimal/actions/workflows/ci.yml)
7-
| Codecov | [![codecov](https://codecov.io/gh/cppalliance/decimal/branch/master/graph/badge.svg?token=drvY8nnV5S)](https://codecov.io/gh/cppalliance/decimal) | [![codecov](https://codecov.io/gh/cppalliance/decimal/graph/badge.svg?token=drvY8nnV5S)](https://codecov.io/gh/cppalliance/decimal) |
8-
| Fuzzing | [![Fuzzing](https://github.com/cppalliance/decimal/actions/workflows/fuzz.yml/badge.svg?branch=master)](https://github.com/cppalliance/decimal/actions/workflows/fuzz.yml) | [![Fuzzing](https://github.com/cppalliance/decimal/actions/workflows/fuzz.yml/badge.svg?branch=develop)](https://github.com/cppalliance/decimal/actions/workflows/fuzz.yml) |
9-
| Metal | [![Metal](https://github.com/cppalliance/decimal/actions/workflows/metal.yml/badge.svg?branch=master)](https://github.com/cppalliance/decimal/actions/workflows/metal.yml) | [![Metal](https://github.com/cppalliance/decimal/actions/workflows/metal.yml/badge.svg?branch=develop)](https://github.com/cppalliance/decimal/actions/workflows/metal.yml) |
5+
| Drone | [![Build Status](https://drone.cpp.al/api/badges/boostorg/decimal/status.svg?ref=refs/heads/master)](https://drone.cpp.al/boostorg/decimal) | [![Build Status](https://drone.cpp.al/api/badges/boostorg/decimal/status.svg?ref=refs/heads/develop)](https://drone.cpp.al/boostorg/decimal) |
6+
| Github Actions | [![CI](https://github.com/boostorg/decimal/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/boostorg/decimal/actions/workflows/ci.yml) | [![CI](https://github.com/boostorg/decimal/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/boostorg/decimal/actions/workflows/ci.yml)
7+
| Codecov | [![codecov](https://codecov.io/gh/boostorg/decimal/branch/master/graph/badge.svg?token=drvY8nnV5S)](https://codecov.io/gh/boostorg/decimal) | [![codecov](https://codecov.io/gh/boostorg/decimal/graph/badge.svg?token=drvY8nnV5S)](https://codecov.io/gh/boostorg/decimal) |
8+
| Fuzzing | [![Fuzzing](https://github.com/boostorg/decimal/actions/workflows/fuzz.yml/badge.svg?branch=master)](https://github.com/boostorg/decimal/actions/workflows/fuzz.yml) | [![Fuzzing](https://github.com/boostorg/decimal/actions/workflows/fuzz.yml/badge.svg?branch=develop)](https://github.com/boostorg/decimal/actions/workflows/fuzz.yml) |
9+
| Metal | [![Metal](https://github.com/boostorg/decimal/actions/workflows/metal.yml/badge.svg?branch=master)](https://github.com/boostorg/decimal/actions/workflows/metal.yml) | [![Metal](https://github.com/boostorg/decimal/actions/workflows/metal.yml/badge.svg?branch=develop)](https://github.com/boostorg/decimal/actions/workflows/metal.yml) |
1010

1111
---
1212

@@ -21,7 +21,7 @@ Simply `#include` it and use it.
2121
## CMake
2222

2323
```sh
24-
git clone https://github.com/cppalliance/decimal
24+
git clone https://github.com/boostorg/decimal
2525
cd decimal
2626
mkdir build && cd build
2727
cmake .. OR cmake .. -DCMAKE_INSTALL_PREFIX=/your/custom/path
@@ -32,25 +32,18 @@ then you can use `find_package(boost_decimal REQUIRED)`
3232

3333
## vcpkg
3434

35-
```sh
36-
git clone https://github.com/cppalliance/decimal
37-
cd decimal
38-
vcpkg install decimal --overlay-ports=ports/decimal
39-
```
35+
Available in official vcpkg sources soon
4036

4137
## Conan
4238

43-
```sh
44-
git clone https://github.com/cppalliance/decimal
45-
conan create decimal/conan --build missing
46-
```
39+
Available in official conan sources soon
4740

4841
# Supported Platforms
4942

5043
Boost.Decimal is tested natively on Ubuntu (x86_64, s390x, and aarch64), macOS (x86_64, and Apple Silicon),
5144
and Windows (x32 and x64); as well as emulated PPC64LE and ARM Cortex-M using QEMU with the following compilers:
5245

53-
* GCC 7 and later
46+
* GCC 8 and later
5447
* Clang 6 and later
5548
* Visual Studio 2019 and later
5649
* Intel OneAPI DPC++
@@ -90,7 +83,7 @@ They have their own implementations of the Standard-Library functions
9083
(e.g. like those found in `<cmath>`, `<charconv>`, `<cstdlib>`, etc.).
9184
The entire library can be conveniently included with `#include <boost/decimal.hpp>`
9285

93-
Using the decimal types is simple and can be learned by [example](https://develop.decimal.cpp.al/decimal/examples.html).
86+
Using the decimal types is straightforward and can be learned by [example](https://develop.decimal.cpp.al/decimal/examples.html).
9487
Their usage closely resembles that of built-in binary floating point types by design.
9588

9689
# Full Documentation

build.jam

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,10 @@
66

77
require-b2 5.2 ;
88

9-
project /boost/decimal
10-
: common-requirements
11-
<include>include
12-
;
9+
project /boost/decimal ;
1310

1411
explicit
15-
[ alias boost_decimal ]
12+
[ alias boost_decimal : : : : <include>include <library>$(boost_dependencies) ]
1613
[ alias all : boost_decimal test ]
1714
;
1815

conan/conanfile.py

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

conan/targets.cmake

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/Jamfile.v2

Lines changed: 12 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,28 @@
1-
import generate ;
2-
import path ;
3-
import property-set ;
4-
import virtual-target ;
1+
# Copyright 2026 Joaquin M Lopez Munoz
2+
# Distributed under the Boost Software License, Version 1.0. (See accompanying
3+
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
54

6-
path-constant HERE : . ;
5+
import path ;
76

8-
make html/index.html : build_antora.sh : @run-script ;
9-
generate files-to-install : html/index.html : <generating-rule>@delayed-glob ;
10-
install install
11-
: files-to-install
12-
: <location>html
13-
<install-source-root>html/decimal
14-
;
15-
explicit html/index.html files-to-install ;
7+
make html_ : build_antora.sh : @run-script ;
168

17-
# this runs the antora script
189
actions run-script
1910
{
2011
bash $(>)
2112
}
2213

23-
# this globs after its sources are created
24-
rule delayed-glob ( project name : property-set : sources * )
25-
{
26-
for local src in $(sources)
27-
{
28-
# the next line causes the source to be generated immediately
29-
# and not later (which it normally would)
30-
UPDATE_NOW [ $(src).actualize ] ;
31-
}
14+
path-constant DOC_DIR : . ;
15+
.node_modules = [ path.join $(DOC_DIR) node_modules ] ;
3216

33-
# we need to construct the path to the globbed directory;
34-
# this path would be <current-project>/antora
35-
local root = [ path.root html [ $(project).location ] ] ;
36-
local files ;
17+
make cleanup_node_modules_ : html_ : @cleanup-node-modules ;
3718

38-
# actual globbing happens here
39-
for local file in [ path.glob-tree $(root) : * ]
40-
{
41-
# we have to skip directories, because our match expression accepts anything
42-
if [ CHECK_IF_FILE $(file) ]
43-
{
44-
# we construct a list of targets to copy
45-
files += [ virtual-target.from-file $(file:D=) : $(file:D) : $(project) ] ;
46-
}
47-
}
48-
49-
# we prepend empty usage requirements to the result
50-
return [ property-set.empty ] $(files) ;
19+
actions cleanup-node-modules
20+
{
21+
rm -rf $(.node_modules)
5122
}
5223

5324
###############################################################################
5425
alias boostdoc ;
5526
explicit boostdoc ;
56-
alias boostrelease : install ;
27+
alias boostrelease : html_ cleanup_node_modules_ ;
5728
explicit boostrelease ;

doc/antora.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: decimal
1+
name: ROOT
22
version: ~
33
title: Boost.Decimal
44
nav:

doc/antora_docs.sh

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

0 commit comments

Comments
 (0)