Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,7 @@

cmake_minimum_required(VERSION 3.10...3.20)

# Set version explicitly if not part of Boost superproject
if(NOT BOOST_SUPERPROJECT_VERSION)
set(BOOST_DECIMAL_VERSION 6.0.1)
else()
set(BOOST_DECIMAL_VERSION ${BOOST_SUPERPROJECT_VERSION})
endif()

project(boost_decimal VERSION ${BOOST_DECIMAL_VERSION} LANGUAGES CXX)
project(boost_decimal VERSION 1.91.0 LANGUAGES CXX)

add_library(boost_decimal INTERFACE)

Expand Down
25 changes: 9 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

| | Master | Develop |
|------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------|
| 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) |
| 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)
| 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) |
| 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) |
| 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) |
| 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) |
| 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)
| 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) |
| 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) |
| 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) |

---

Expand All @@ -21,7 +21,7 @@ Simply `#include` it and use it.
## CMake

```sh
git clone https://github.com/cppalliance/decimal
git clone https://github.com/boostorg/decimal
cd decimal
mkdir build && cd build
cmake .. OR cmake .. -DCMAKE_INSTALL_PREFIX=/your/custom/path
Expand All @@ -32,18 +32,11 @@ then you can use `find_package(boost_decimal REQUIRED)`

## vcpkg

```sh
git clone https://github.com/cppalliance/decimal
cd decimal
vcpkg install decimal --overlay-ports=ports/decimal
```
Available in official vcpkg sources soon

## Conan

```sh
git clone https://github.com/cppalliance/decimal
conan create decimal/conan --build missing
```
Available in official conan sources soon

# Supported Platforms

Expand Down Expand Up @@ -90,7 +83,7 @@ They have their own implementations of the Standard-Library functions
(e.g. like those found in `<cmath>`, `<charconv>`, `<cstdlib>`, etc.).
The entire library can be conveniently included with `#include <boost/decimal.hpp>`

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

# Full Documentation
Expand Down
7 changes: 2 additions & 5 deletions build.jam
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@

require-b2 5.2 ;

project /boost/decimal
: common-requirements
<include>include
;
project /boost/decimal ;

explicit
[ alias boost_decimal ]
[ alias boost_decimal : : : : <include>include <library>$(boost_dependencies) ]
[ alias all : boost_decimal test ]
;

Expand Down
102 changes: 0 additions & 102 deletions conan/conanfile.py

This file was deleted.

1 change: 0 additions & 1 deletion conan/targets.cmake

This file was deleted.

53 changes: 12 additions & 41 deletions doc/Jamfile.v2
Original file line number Diff line number Diff line change
@@ -1,57 +1,28 @@
import generate ;
import path ;
import property-set ;
import virtual-target ;
# Copyright 2026 Joaquin M Lopez Munoz
# Distributed under 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)

path-constant HERE : . ;
import path ;

make html/index.html : build_antora.sh : @run-script ;
generate files-to-install : html/index.html : <generating-rule>@delayed-glob ;
install install
: files-to-install
: <location>html
<install-source-root>html/decimal
;
explicit html/index.html files-to-install ;
make html_ : build_antora.sh : @run-script ;

# this runs the antora script
actions run-script
{
bash $(>)
}

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

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

# actual globbing happens here
for local file in [ path.glob-tree $(root) : * ]
{
# we have to skip directories, because our match expression accepts anything
if [ CHECK_IF_FILE $(file) ]
{
# we construct a list of targets to copy
files += [ virtual-target.from-file $(file:D=) : $(file:D) : $(project) ] ;
}
}

# we prepend empty usage requirements to the result
return [ property-set.empty ] $(files) ;
actions cleanup-node-modules
{
rm -rf $(.node_modules)
}

###############################################################################
alias boostdoc ;
explicit boostdoc ;
alias boostrelease : install ;
alias boostrelease : html_ cleanup_node_modules_ ;
explicit boostrelease ;
2 changes: 1 addition & 1 deletion doc/antora.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: decimal
name: ROOT
version: ~
title: Boost.Decimal
nav:
Expand Down
9 changes: 0 additions & 9 deletions doc/antora_docs.sh

This file was deleted.

5 changes: 2 additions & 3 deletions doc/decimal-playbook.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
site:
title: Boost.Decimal
start_page: decimal::index.adoc
start_page: ROOT::overview.adoc
content:
sources:
- url: ..
Expand All @@ -11,8 +11,7 @@ output:
ui:
bundle:
url: https://github.com/boostorg/website-v2-docs/releases/download/ui-develop/ui-bundle.zip
output_dir: decimal/_
output_dir: _
antora:
extensions:
- require: '@cppalliance/antora-downloads-extension'
- require: '@antora/lunr-extension'
2 changes: 1 addition & 1 deletion doc/modules/ROOT/pages/basics.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ The entire library can be accessed using the convenience header `<boost/decimal.
A short example of the basic usage:

[#first_example]
.This https://github.com/cppalliance/decimal/blob/develop/examples/first_example.cpp[example] shows the very basics on how to make a complete and working program using the decimal library
.This https://github.com/boostorg/decimal/blob/develop/examples/first_example.cpp[example] shows the very basics on how to make a complete and working program using the decimal library
====
[source, c++]
----
Expand Down
4 changes: 2 additions & 2 deletions doc/modules/ROOT/pages/cfenv.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ IMPORTANT: Much like `std::fesetround`, `boost::decimal::fesetround` is not thre

[#examples_rounding_mode]

.This https://github.com/cppalliance/decimal/blob/develop/examples/rounding_mode.cpp[example] demonstrates how to set, get, and effects of the global rounding mode.
.This https://github.com/boostorg/decimal/blob/develop/examples/rounding_mode.cpp[example] demonstrates how to set, get, and effects of the global rounding mode.
====
[source, c++]
----
Expand Down Expand Up @@ -102,7 +102,7 @@ This same example can be reduced for the cases where:

2. You want to change the compile time rounding mode

.This https://github.com/cppalliance/decimal/blob/develop/examples/rounding_mode.cpp[example] demonstrates how the compile time rounding mode can be set, and it's effects on compile time and run time evaluation.
.This https://github.com/boostorg/decimal/blob/develop/examples/rounding_mode.cpp[example] demonstrates how the compile time rounding mode can be set, and it's effects on compile time and run time evaluation.
====
[source, c++]
----
Expand Down
2 changes: 1 addition & 1 deletion doc/modules/ROOT/pages/cohorts.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Below is an example of how cohorts can be preserved if one so wishes.

== Cohort Preserving `<charconv>` Example

This example can be found in the `examples/` folder as https://github.com/cppalliance/decimal/blob/develop/examples/charconv_cohort_preservation.cpp[charconv_cohort_preservation.cpp].
This example can be found in the `examples/` folder as https://github.com/boostorg/decimal/blob/develop/examples/charconv_cohort_preservation.cpp[charconv_cohort_preservation.cpp].

[source, c++]
----
Expand Down
2 changes: 1 addition & 1 deletion doc/modules/ROOT/pages/conversions.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ constexpr T from_dpd(unsigned __int128 bits) noexcept;

== Bit Conversions Example

The following example is copied and pasted from the examples/ folder of the library and is called https://github.com/cppalliance/decimal/blob/develop/examples/bit_conversions.cpp[bit_conversions.cpp].
The following example is copied and pasted from the examples/ folder of the library and is called https://github.com/boostorg/decimal/blob/develop/examples/bit_conversions.cpp[bit_conversions.cpp].

[source, c++]
----
Expand Down
Loading