Merge pull request #242 from tetengo/v1.6.1-boost_upgrade

Merge pull request #238 from tetengo/boost_upgrade

Author: kaorut

.github/workflows/linux-clang.yml

@@ -18,8 +18,8 @@ env:
   CLANGXX_COMMAND:   clang++-11
   DOXYGEN_VER:       1.9.3
   DOXYGEN_CACHE_REV: 0
-  BOOST_VER:         1_78_0
-  BOOST_VER_DOT:     1.78.0
+  BOOST_VER:         1_79_0
+  BOOST_VER_DOT:     1.79.0
   BOOST_TOOLSET:     clang
   BOOST_CACHE_REV:   0
 

.github/workflows/linux-gcc.yml

@@ -16,8 +16,8 @@ env:
   CONCURRENT_BUILD: 4
   GCC_COMMAND:      gcc-10
   GXX_COMMAND:      g++-10
-  BOOST_VER:        1_78_0
-  BOOST_VER_DOT:    1.78.0
+  BOOST_VER:        1_79_0
+  BOOST_VER_DOT:    1.79.0
   BOOST_TOOLSET:    gcc
   BOOST_CACHE_REV:  0
 

.github/workflows/windows-visualcpp.yml

@@ -15,32 +15,30 @@ on:
 env:
   TETENGO_VER:              1.6.0
   CONCURRENT_BUILD:         4
-  BOOST_VER:                1_78_0
-  BOOST_VER_DOT:            1.78.0
+  BOOST_VER:                1_79_0
+  BOOST_VER_DOT:            1.79.0
   BOOST_TOOLSET:            msvc-14.3
-  BOOST_CACHE_REV:          0
+  BOOST_CACHE_REV:          6
   EMBEDTRANSFORM_CACHE_REV: 0
 
 jobs:
   boost_download:
-    name:    Boost Download and Expansion
+    name:    Boost Download
     runs-on: windows-2022
     steps:
     - name: Cache Boost source
       uses: actions/cache@v2
       with:
-        path: .boost_build\boost_${{ env.BOOST_VER }}
+        path: .boost_build\boost_${{ env.BOOST_VER }}.tar.gz
         key: Windows-VisualCpp-BoostSource-${{ env.BOOST_VER }}-${{ env.BOOST_CACHE_REV }}
 
-    - name: Download and expand Boost
+    - name: Download Boost
       shell: cmd
       run: |
-        if not exist .boost_build\boost_${{ env.BOOST_VER }}\.expansion_finished (
+        if not exist .boost_build\boost_${{ env.BOOST_VER }}.tar.gz (
           mkdir .boost_build
           cd .boost_build
           curl -L -o boost_${{ env.BOOST_VER }}.tar.gz https://boostorg.jfrog.io/artifactory/main/release/${{ env.BOOST_VER_DOT }}/source/boost_${{ env.BOOST_VER }}.tar.gz
-          tar -xf boost_${{ env.BOOST_VER }}.tar.gz
-          echo > boost_${{ env.BOOST_VER }}\.expansion_finished
         )
   
   boost_build_for_release_win32:
@@ -54,7 +52,7 @@ jobs:
     - name: Restore Boost source
       uses: actions/cache@v2
       with:
-        path: .boost_build\boost_${{ env.BOOST_VER }}
+        path: .boost_build\boost_${{ env.BOOST_VER }}.tar.gz
         key: Windows-VisualCpp-BoostSource-${{ env.BOOST_VER }}-${{ env.BOOST_CACHE_REV }}
 
     - name: Cache Boost build
@@ -67,7 +65,9 @@ jobs:
       shell: cmd
       run: |
         if not exist .boost_build\boost_${{ env.BOOST_VER }}\.build_finished (
-          cd .boost_build\boost_${{ env.BOOST_VER }}
+          cd .boost_build
+          tar -xf boost_${{ env.BOOST_VER }}.tar.gz
+          cd boost_${{ env.BOOST_VER }}
           call bootstrap.bat
           b2.exe -j ${{ env.CONCURRENT_BUILD }} toolset=${{ env.BOOST_TOOLSET }} address-model=32 variant=release link=static --stagedir="stage\Win32" stage
           echo > .build_finished
@@ -84,7 +84,7 @@ jobs:
     - name: Restore Boost source
       uses: actions/cache@v2
       with:
-        path: .boost_build\boost_${{ env.BOOST_VER }}
+        path: .boost_build\boost_${{ env.BOOST_VER }}.tar.gz
         key: Windows-VisualCpp-BoostSource-${{ env.BOOST_VER }}-${{ env.BOOST_CACHE_REV }}
 
     - name: Cache Boost build
@@ -97,7 +97,9 @@ jobs:
       shell: cmd
       run: |
         if not exist .boost_build\boost_${{ env.BOOST_VER }}\.build_finished (
-          cd .boost_build\boost_${{ env.BOOST_VER }}
+          cd .boost_build
+          tar -xf boost_${{ env.BOOST_VER }}.tar.gz
+          cd boost_${{ env.BOOST_VER }}
           call bootstrap.bat
           b2.exe -j ${{ env.CONCURRENT_BUILD }} toolset=${{ env.BOOST_TOOLSET }} address-model=32 variant=debug link=static --stagedir="stage\Win32" stage
           echo > .build_finished
@@ -114,7 +116,7 @@ jobs:
     - name: Restore Boost source
       uses: actions/cache@v2
       with:
-        path: .boost_build\boost_${{ env.BOOST_VER }}
+        path: .boost_build\boost_${{ env.BOOST_VER }}.tar.gz
         key: Windows-VisualCpp-BoostSource-${{ env.BOOST_VER }}-${{ env.BOOST_CACHE_REV }}
 
     - name: Cache Boost build
@@ -127,7 +129,9 @@ jobs:
       shell: cmd
       run: |
         if not exist .boost_build\boost_${{ env.BOOST_VER }}\.build_finished (
-          cd .boost_build\boost_${{ env.BOOST_VER }}
+          cd .boost_build
+          tar -xf boost_${{ env.BOOST_VER }}.tar.gz
+          cd boost_${{ env.BOOST_VER }}
           call bootstrap.bat
           b2.exe -j ${{ env.CONCURRENT_BUILD }} toolset=${{ env.BOOST_TOOLSET }} address-model=64 variant=release link=static --stagedir="stage\x64" stage
           echo > .build_finished
@@ -144,7 +148,7 @@ jobs:
     - name: Restore Boost source
       uses: actions/cache@v2
       with:
-        path: .boost_build\boost_${{ env.BOOST_VER }}
+        path: .boost_build\boost_${{ env.BOOST_VER }}.tar.gz
         key: Windows-VisualCpp-BoostSource-${{ env.BOOST_VER }}-${{ env.BOOST_CACHE_REV }}
 
     - name: Cache Boost build
@@ -157,7 +161,9 @@ jobs:
       shell: cmd
       run: |
         if not exist .boost_build\boost_${{ env.BOOST_VER }}\.build_finished (
-          cd .boost_build\boost_${{ env.BOOST_VER }}
+          cd .boost_build
+          tar -xf boost_${{ env.BOOST_VER }}.tar.gz
+          cd boost_${{ env.BOOST_VER }}
           call bootstrap.bat
           b2.exe -j ${{ env.CONCURRENT_BUILD }} toolset=${{ env.BOOST_TOOLSET }} address-model=64 variant=debug link=static --stagedir="stage\x64" stage
           echo > .build_finished

README.md

@@ -82,7 +82,7 @@ How to Build and Install
 #### Requirements
 
 - [Visual Studio 2022](https://visualstudio.microsoft.com/)
-- [Boost C++ libraries 1.78.0](https://www.boost.org/)
+- [Boost C++ libraries 1.79.0](https://www.boost.org/)
 - [Doxygen 1.9.3](https://www.doxygen.nl/)
 - [Graphviz](https://www.graphviz.org/)
 - [WiX toolset 3.11.2](https://wixtoolset.org/)
@@ -140,7 +140,7 @@ Doxygen will output the documents into the directory `doc`.
 
 - [Clang 11](https://clang.llvm.org/) or
   [GCC 10](https://gcc.gnu.org/)
-- [Boost C++ libraries 1.78.0](https://www.boost.org/)
+- [Boost C++ libraries 1.79.0](https://www.boost.org/)
 - [Doxygen 1.9.3](https://www.doxygen.nl/)
 - [Graphviz](https://www.graphviz.org/)
 - [include-what-you-use 0.12](https://include-what-you-use.org/) or

configure.ac

@@ -185,7 +185,7 @@ AC_SUBST([CFLAGS], "${CFLAGS} ${PTHREAD_CFLAGS}")
 AC_SUBST([CXXFLAGS], "${CXXFLAGS} ${PTHREAD_CFLAGS}")
 AC_SUBST([CC], "${PTHREAD_CC}")
 
-AX_BOOST_BASE([1.78.0])
+AX_BOOST_BASE([1.79.0])
 AX_BOOST_UNIT_TEST_FRAMEWORK
 AC_SUBST([LDFLAGS], "${LDFLAGS} ${BOOST_LDFLAGS}")
 AC_SUBST([LIBS], "-lstdc++fs -lstdc++ ${LIBS}")