Skip to content

Error build if ICU or IConv support was requested but is not available. #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Flamefire wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Error build if ICU or IConv support was requested but is not available. #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5098741
Error build if ICU or IConv support was requested but is not available.
Flamefire Dec 8, 2024
6dc0fb4
DEBUG ICU search
Flamefire Dec 10, 2024
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
19 changes: 19 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,10 +360,17 @@ jobs:
if: matrix.coverage
run: ci/codecov.sh "collect" && mv coverage.info coverage.iconv.info

- name: Check ICU
if: '!matrix.coverity'
run: 'ci/build.sh || true'
env:
B2_FLAGS: -a boost.locale.icu=on boost.locale.iconv=off --debug-configuration
B2_TARGETS: libs/locale/build//has_icu
- name: Run tests with ICU only
if: '!matrix.coverity'
run: ci/build.sh
env: {B2_FLAGS: -a boost.locale.icu=on boost.locale.iconv=off}

- name: Collect coverage
if: matrix.coverage
run: ci/codecov.sh "collect" && mv coverage.info coverage.icu.info
Expand Down Expand Up @@ -452,6 +459,18 @@ jobs:
B2_CXXSTD: ${{matrix.cxxstd}}
B2_ADDRESS_MODEL: ${{matrix.addrmd}}

- name: Check ICU
if: '!matrix.coverage'
run: |
set B2_FLAGS=boost.locale.icu=on boost.locale.iconv=off boost.locale.std=off boost.locale.winapi=off --debug-configuration
ci\build.bat
rmdir /s /q bin.v2
env:
B2_TOOLSET: ${{matrix.toolset}}
B2_CXXSTD: ${{matrix.cxxstd}}
B2_ADDRESS_MODEL: ${{matrix.addrmd}}
B2_TARGETS: libs/locale/build//has_icu

- name: Run tests (ICU, without coverage)
if: '!matrix.coverage'
run: |
Expand Down
6 changes: 6 additions & 0 deletions build/Jamfile.v2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,9 @@ rule configure-full ( properties * : flags-only )
# ICU might introduce an own iconv, so check for that.
internal_iconv_target = has_iconv_with_icu ;
external_iconv_target = has_external_iconv_with_icu ;
} else if <boost.locale.icu>on in $(properties)
{
errors.user-error : "ICU support was requested but not found" ;
}
}

Expand All @@ -259,6 +262,9 @@ rule configure-full ( properties * : flags-only )
{
found-iconv = true ;
result += <library>iconv ;
} else if <boost.locale.iconv>on in $(properties)
{
errors.user-error : "Iconv support was requested but not found" ;
}
}
if $(found-iconv)
Expand Down
Loading