Skip to content
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

Update boost-for-android for Android NDK r20 and disable macOS Homebrew. #1185

Merged
merged 4 commits into from
Jul 12, 2019
Merged

Update boost-for-android for Android NDK r20 and disable macOS Homebrew. #1185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d17329d
Update boost-for-android for Android NDK r20.
BillyONeal Jul 12, 2019
c813671
Also disable homebrew.
BillyONeal Jul 12, 2019
a02e69c
I mean homebrew I said!
BillyONeal Jul 12, 2019
8555d25
Apparently Android isn't ready for Boost 1.70 yet.
BillyONeal Jul 12, 2019
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
2 changes: 1 addition & 1 deletion Build_android/configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
87 changes: 44 additions & 43 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,49 +222,50 @@ 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_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'
- job: MacOS_Vcpkg
pool:
vmImage: 'macOS-10.14'
Expand Down