From d17329dace366da7d05f33f8d0cdd59de20d2cf6 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 11 Jul 2019 18:30:22 -0700 Subject: [PATCH 1/4] Update boost-for-android for Android NDK r20. --- Build_android/configure.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Build_android/configure.sh b/Build_android/configure.sh index b4e3e1748d..1a7689a5c4 100755 --- a/Build_android/configure.sh +++ b/Build_android/configure.sh @@ -25,7 +25,7 @@ DO_OPENSSL=1 DO_CMAKE=1 DO_CPPRESTSDK=1 -BOOSTVER=1.69.0 +BOOSTVER=1.70.0 OPENSSLVER=1.1.0j CMAKEVER=3.14.0 @@ -155,7 +155,7 @@ if [ "${DO_OPENSSL}" == "1" ]; then ( if [ "${DO_BOOST}" == "1" ]; then ( if [ ! -d 'Boost-for-Android' ]; then git clone https://github.com/moritz-wundke/Boost-for-Android; fi cd Boost-for-Android - git checkout b1e2cb397d3ec573f1cfdf4f4d965766204c53f1 + git checkout aed656a97fb3af7322fd2c3da5995a2d09d87d4b PATH="$PATH:$NDK_DIR" \ CXXFLAGS="-std=gnu++11" \ ./build-android.sh \ From c81367133c585f046b11858e07a8536b7e0611d4 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 11 Jul 2019 19:14:19 -0700 Subject: [PATCH 2/4] Also disable homebrew. --- azure-pipelines.yml | 75 +++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 48d30a1ab8..f671912780 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -265,43 +265,44 @@ jobs: cd build.release.static ninja displayName: 'Run ninja, release static' - - job: MacOS_Vcpkg - pool: - vmImage: 'macOS-10.14' - steps: - - script: | - brew install gcc ninja - ./vcpkg/bootstrap-vcpkg.sh - ./vcpkg/vcpkg install zlib openssl boost-system boost-date-time boost-regex websocketpp boost-thread boost-filesystem boost-random boost-chrono boost-interprocess brotli --vcpkg-root ./vcpkg - displayName: Vcpkg install dependencies - - script: | - mkdir build.debug - mkdir build.release - displayName: Make Build Directories - - task: CMake@1 - inputs: - workingDirectory: 'build.debug' - cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..' - - task: CMake@1 - inputs: - workingDirectory: 'build.release' - cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..' - - script: | - cd build.debug - ninja - displayName: 'Run ninja debug' - - script: | - cd build.debug/Release/Binaries - ./test_runner *test.dylib - displayName: 'Run Tests debug' - - script: | - cd build.release - ninja - displayName: 'Run ninja, release' - - script: | - cd build.release/Release/Binaries - ./test_runner *test.dylib - displayName: 'Run tests, release' + # Homebrew is disabled for now because it apparently is deploying a Boost version that the version of xcode deployed in Pipelines cannot build. + # - job: MacOS_Vcpkg + # pool: + # vmImage: 'macOS-10.14' + # steps: + # - script: | + # brew install gcc ninja + # ./vcpkg/bootstrap-vcpkg.sh + # ./vcpkg/vcpkg install zlib openssl boost-system boost-date-time boost-regex websocketpp boost-thread boost-filesystem boost-random boost-chrono boost-interprocess brotli --vcpkg-root ./vcpkg + # displayName: Vcpkg install dependencies + # - script: | + # mkdir build.debug + # mkdir build.release + # displayName: Make Build Directories + # - task: CMake@1 + # inputs: + # workingDirectory: 'build.debug' + # cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..' + # - task: CMake@1 + # inputs: + # workingDirectory: 'build.release' + # cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..' + # - script: | + # cd build.debug + # ninja + # displayName: 'Run ninja debug' + # - script: | + # cd build.debug/Release/Binaries + # ./test_runner *test.dylib + # displayName: 'Run Tests debug' + # - script: | + # cd build.release + # ninja + # displayName: 'Run ninja, release' + # - script: | + # cd build.release/Release/Binaries + # ./test_runner *test.dylib + # displayName: 'Run tests, release' # iOS is disabled for now because the dependency Apple-Boost-BuildScript appears to be broken with the version of XCode in use in Pipelines. # - job: MacOS_iOS # pool: From a02e69c20679472d6121e0e346f4314a1803da09 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 11 Jul 2019 19:51:57 -0700 Subject: [PATCH 3/4] I mean homebrew I said! --- azure-pipelines.yml | 106 ++++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f671912780..8c878f0901 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -222,79 +222,38 @@ jobs: export NCPU=2 ../configure.sh --ndk /usr/local/lib/android/sdk/ndk-bundle displayName: 'Build for Android' - - job: MacOS_Homebrew - pool: - vmImage: 'macOS-10.14' - steps: - - script: brew install boost openssl ninja - displayName: Brew install dependencies - - script: | - mkdir build.debug - mkdir build.release - mkdir build.release.static - displayName: Make Build Directories - - task: CMake@1 - inputs: - workingDirectory: 'build.debug' - cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug ..' - - task: CMake@1 - inputs: - workingDirectory: 'build.release' - cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release ..' - - task: CMake@1 - inputs: - workingDirectory: 'build.release.static' - cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ..' - - script: | - cd build.debug - ninja - displayName: 'Run ninja, debug' - - script: | - cd build.debug/Release/Binaries - ./test_runner *test.dylib - displayName: 'Run tests, debug' - - script: | - cd build.release - ninja - displayName: 'Run ninja, release' - - script: | - cd build.release/Release/Binaries - ./test_runner *test.dylib - displayName: 'Run tests, release' - - script: | - cd build.release.static - ninja - displayName: 'Run ninja, release static' # Homebrew is disabled for now because it apparently is deploying a Boost version that the version of xcode deployed in Pipelines cannot build. - # - job: MacOS_Vcpkg + # - job: MacOS_Homebrew # pool: # vmImage: 'macOS-10.14' # steps: - # - script: | - # brew install gcc ninja - # ./vcpkg/bootstrap-vcpkg.sh - # ./vcpkg/vcpkg install zlib openssl boost-system boost-date-time boost-regex websocketpp boost-thread boost-filesystem boost-random boost-chrono boost-interprocess brotli --vcpkg-root ./vcpkg - # displayName: Vcpkg install dependencies + # - script: brew install boost openssl ninja + # displayName: Brew install dependencies # - script: | # mkdir build.debug # mkdir build.release + # mkdir build.release.static # displayName: Make Build Directories # - task: CMake@1 # inputs: # workingDirectory: 'build.debug' - # cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..' + # cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug ..' # - task: CMake@1 # inputs: # workingDirectory: 'build.release' - # cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..' + # cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release ..' + # - task: CMake@1 + # inputs: + # workingDirectory: 'build.release.static' + # cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ..' # - script: | # cd build.debug # ninja - # displayName: 'Run ninja debug' + # displayName: 'Run ninja, debug' # - script: | # cd build.debug/Release/Binaries # ./test_runner *test.dylib - # displayName: 'Run Tests debug' + # displayName: 'Run tests, debug' # - script: | # cd build.release # ninja @@ -303,6 +262,47 @@ jobs: # cd build.release/Release/Binaries # ./test_runner *test.dylib # displayName: 'Run tests, release' + # - script: | + # cd build.release.static + # ninja + # displayName: 'Run ninja, release static' + - job: MacOS_Vcpkg + pool: + vmImage: 'macOS-10.14' + steps: + - script: | + brew install gcc ninja + ./vcpkg/bootstrap-vcpkg.sh + ./vcpkg/vcpkg install zlib openssl boost-system boost-date-time boost-regex websocketpp boost-thread boost-filesystem boost-random boost-chrono boost-interprocess brotli --vcpkg-root ./vcpkg + displayName: Vcpkg install dependencies + - script: | + mkdir build.debug + mkdir build.release + displayName: Make Build Directories + - task: CMake@1 + inputs: + workingDirectory: 'build.debug' + cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..' + - task: CMake@1 + inputs: + workingDirectory: 'build.release' + cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..' + - script: | + cd build.debug + ninja + displayName: 'Run ninja debug' + - script: | + cd build.debug/Release/Binaries + ./test_runner *test.dylib + displayName: 'Run Tests debug' + - script: | + cd build.release + ninja + displayName: 'Run ninja, release' + - script: | + cd build.release/Release/Binaries + ./test_runner *test.dylib + displayName: 'Run tests, release' # iOS is disabled for now because the dependency Apple-Boost-BuildScript appears to be broken with the version of XCode in use in Pipelines. # - job: MacOS_iOS # pool: From 8555d25e372a8278a01caef32dd47f051a1f5544 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 11 Jul 2019 20:05:22 -0700 Subject: [PATCH 4/4] Apparently Android isn't ready for Boost 1.70 yet. --- Build_android/configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Build_android/configure.sh b/Build_android/configure.sh index 1a7689a5c4..5088f44d8f 100755 --- a/Build_android/configure.sh +++ b/Build_android/configure.sh @@ -25,7 +25,7 @@ DO_OPENSSL=1 DO_CMAKE=1 DO_CPPRESTSDK=1 -BOOSTVER=1.70.0 +BOOSTVER=1.69.0 OPENSSLVER=1.1.0j CMAKEVER=3.14.0