Skip to content

Commit 749c3f4

Browse files
authored
Merge pull request #347 from tetengo/boost_upgrade
Upgrade the Boost version to 1.88.0 #345
2 parents dce590a + 581ac6f commit 749c3f4

File tree

5 files changed

+21
-16
lines changed

5 files changed

+21
-16
lines changed

.github/workflows/linux-clang.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ env:
1818
CLANGXX_COMMAND: clang++-14
1919
DOXYGEN_VER: 1.13.2
2020
DOXYGEN_CACHE_REV: 0
21-
BOOST_VER: 1_87_0
22-
BOOST_VER_DOT: 1.87.0
21+
BOOST_VER: 1_88_0
22+
BOOST_VER_DOT: 1.88.0
2323
BOOST_BOOTSTRAP_TOOLSET: clang
2424
BOOST_TOOLSET: clang-14
2525
BOOST_CACHE_REV: 0
@@ -87,8 +87,10 @@ jobs:
8787
then
8888
mkdir -p .boost_build
8989
cd .boost_build
90-
curl -L -o boost_${{ env.BOOST_VER }}.tar.bz2 https://archives.boost.io/release/${{ env.BOOST_VER_DOT }}/source/boost_${{ env.BOOST_VER }}.tar.bz2
91-
tar -xf boost_${{ env.BOOST_VER }}.tar.bz2
90+
curl -L -o boost_${{ env.BOOST_VER }}.tar.gz https://archives.boost.io/release/${{ env.BOOST_VER_DOT }}/source/boost_${{ env.BOOST_VER }}.tar.gz
91+
tar -xf boost_${{ env.BOOST_VER }}.tar.gz
92+
#curl -L -o boost_${{ env.BOOST_VER }}.tar.bz2 https://archives.boost.io/release/${{ env.BOOST_VER_DOT }}/source/boost_${{ env.BOOST_VER }}.tar.bz2
93+
#tar -xf boost_${{ env.BOOST_VER }}.tar.bz2
9294
cd boost_${{ env.BOOST_VER }}
9395
./bootstrap.sh --with-toolset=${{ env.BOOST_BOOTSTRAP_TOOLSET }}
9496
(./b2 -j ${{ env.CONCURRENT_BUILD }} toolset=${{ env.BOOST_TOOLSET }} variant=release link=static || :)

.github/workflows/linux-gcc.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ env:
1616
CONCURRENT_BUILD: 4
1717
GCC_COMMAND: gcc-12
1818
GXX_COMMAND: g++-12
19-
BOOST_VER: 1_87_0
20-
BOOST_VER_DOT: 1.87.0
19+
BOOST_VER: 1_88_0
20+
BOOST_VER_DOT: 1.88.0
2121
BOOST_BOOTSTRAP_TOOLSET: gcc
2222
BOOST_TOOLSET: gcc-12
2323
BOOST_CACHE_REV: 0
@@ -48,8 +48,10 @@ jobs:
4848
then
4949
mkdir -p .boost_build
5050
cd .boost_build
51-
curl -L -o boost_${{ env.BOOST_VER }}.tar.bz2 https://archives.boost.io/release/${{ env.BOOST_VER_DOT }}/source/boost_${{ env.BOOST_VER }}.tar.bz2
52-
tar xvf boost_${{ env.BOOST_VER }}.tar.bz2
51+
curl -L -o boost_${{ env.BOOST_VER }}.tar.gz https://archives.boost.io/release/${{ env.BOOST_VER_DOT }}/source/boost_${{ env.BOOST_VER }}.tar.gz
52+
tar -xf boost_${{ env.BOOST_VER }}.tar.gz
53+
#curl -L -o boost_${{ env.BOOST_VER }}.tar.bz2 https://archives.boost.io/release/${{ env.BOOST_VER_DOT }}/source/boost_${{ env.BOOST_VER }}.tar.bz2
54+
#tar -xf boost_${{ env.BOOST_VER }}.tar.bz2
5355
cd boost_${{ env.BOOST_VER }}
5456
./bootstrap.sh --with-toolset=${{ env.BOOST_BOOTSTRAP_TOOLSET }}
5557
(./b2 -j ${{ env.CONCURRENT_BUILD }} toolset=${{ env.BOOST_TOOLSET }} variant=release link=static || :)

.github/workflows/windows-visualcpp.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ on:
1515
env:
1616
TETENGO_VER: 1.9.0
1717
CONCURRENT_BUILD: 4
18-
BOOST_VER: 1_87_0
19-
BOOST_VER_DOT: 1.87.0
18+
BOOST_VER: 1_88_0
19+
BOOST_VER_DOT: 1.88.0
2020
BOOST_TOOLSET: msvc-14.3
2121
BOOST_CACHE_REV: 0
2222
EMBEDTRANSFORM_CACHE_REV: 0
@@ -338,7 +338,8 @@ jobs:
338338
{
339339
New-Item -Path . -Name .EmbedTransform -ItemType directory
340340
Set-Location .EmbedTransform
341-
Invoke-WebRequest -Uri https://www.firegiant.com/system/files/samples/EmbedTransform.zip -OutFile EmbedTransform.zip
341+
Invoke-WebRequest -Uri https://www.tetengo.org/archives/EmbedTransform.zip -OutFile EmbedTransform.zip
342+
#Invoke-WebRequest -Uri https://www.firegiant.com/system/files/samples/EmbedTransform.zip -OutFile EmbedTransform.zip
342343
Expand-Archive -Path EmbedTransform.zip -DestinationPath EmbedTransform
343344
New-Item -Path . -Name .download_finished -ItemType file
344345
}
@@ -355,7 +356,7 @@ jobs:
355356
shell: cmd
356357
run: |
357358
dotnet tool install --global wix --version 5.0.1
358-
wix extension add --global WixToolset.UI.wixext
359+
wix extension add --global WixToolset.UI.wixext/5.0.1
359360
360361
- name: Checkout
361362
uses: actions/checkout@v4
@@ -429,7 +430,7 @@ jobs:
429430
shell: cmd
430431
run: |
431432
dotnet tool install --global wix --version 5.0.1
432-
wix extension add --global WixToolset.UI.wixext
433+
wix extension add --global WixToolset.UI.wixext/5.0.1
433434
434435
- name: Checkout
435436
uses: actions/checkout@v4

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ How to Build and Install
8282
#### Requirements
8383

8484
- [Visual Studio 2022](https://visualstudio.microsoft.com/)
85-
- [Boost C++ libraries 1.87.0](https://www.boost.org/)
85+
- [Boost C++ libraries 1.88.0](https://www.boost.org/)
8686
- [Doxygen 1.13.2](https://www.doxygen.nl/)
8787
- [Graphviz](https://www.graphviz.org/)
8888
- [WiX toolset 5.0.1](https://wixtoolset.org/)
@@ -142,7 +142,7 @@ Doxygen will output the documents into the directory `doc`.
142142
[Clang 14](https://clang.llvm.org/),
143143
[GCC 10](https://gcc.gnu.org/) or
144144
[GCC 12](https://gcc.gnu.org/)
145-
- [Boost C++ libraries 1.87.0](https://www.boost.org/)
145+
- [Boost C++ libraries 1.88.0](https://www.boost.org/)
146146
- [Doxygen 1.13.2](https://www.doxygen.nl/)
147147
- [Graphviz](https://www.graphviz.org/)
148148
- [include-what-you-use 0.15](https://include-what-you-use.org/) or

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ AC_SUBST([CFLAGS], "${CFLAGS} ${PTHREAD_CFLAGS}")
189189
AC_SUBST([CXXFLAGS], "${CXXFLAGS} ${PTHREAD_CFLAGS}")
190190
AC_SUBST([CC], "${PTHREAD_CC}")
191191

192-
AX_BOOST_BASE([1.87.0])
192+
AX_BOOST_BASE([1.88.0])
193193
AX_BOOST_UNIT_TEST_FRAMEWORK
194194
AC_SUBST([LDFLAGS], "${LDFLAGS} ${BOOST_LDFLAGS}")
195195
AC_SUBST([LIBS], "-lstdc++fs -lstdc++ ${LIBS}")

0 commit comments

Comments
 (0)