AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

fix macos build for High Sierra (#5780)

Browse Source 
* fix macos build by changing xcode version

* add comments

* fix benchmark build for mac

* fix for gem option and install npm

* add test for node and npm

* fix node

* fix for node

* another attempts to fix node

* another attempts

* clean up
This commit is contained in:
Yilun Chong 2019-02-26 12:52:06 -08:00 committed by Yilun Chong
parent 0aad5339ca
commit 400845ae17
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
benchmarks/Makefile.am
View File

@ -90,8 +90,8 @@ $(benchmarks_protoc_outputs_proto2_header): protoc_middleman2
initialize_submodule: initialize_submodule:
oldpwd=`pwd` oldpwd=`pwd`
cd $(top_srcdir) && git submodule update --init -r third_party/benchmark cd $(top_srcdir) && git submodule update --init -r third_party/benchmark && \
cd $(top_srcdir)/third_party/benchmark && cmake -DCMAKE_BUILD_TYPE=Release && make cd third_party/benchmark && cmake -DCMAKE_BUILD_TYPE=Release && make
cd $$oldpwd cd $$oldpwd
touch initialize_submodule touch initialize_submodule

12
kokoro/macos/prepare_build_macos_rc
View File

@ -5,7 +5,10 @@
## ##
# Select Xcode version # Select Xcode version
export DEVELOPER_DIR=/Applications/Xcode_9.1.app/Contents/Developer # Remember to udpate the Xcode version when xcode_9.4.1 is not available.
# If xcode is not available, it will probaly encounter the failure for
# "autom4te: need GNU m4 1.4 or later: /usr/bin/m4""
export DEVELOPER_DIR=/Applications/Xcode_9.4.1.app/Contents/Developer
## ##
# Select C/C++ compilers # Select C/C++ compilers
@ -18,8 +21,11 @@ export CXX=g++
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
source $HOME/.rvm/scripts/rvm source $HOME/.rvm/scripts/rvm
brew uninstall node icu4c brew uninstall node icu4c cmake
brew install gflags gpg gpg2 node pcre ruby brew prune
brew install gflags gpg gpg2 node pcre ruby cmake
sudo chown -R $(whoami) /usr/local
brew postinstall node
## ##
# Install Tox # Install Tox

2
tests.sh
View File

@ -226,7 +226,7 @@ build_objectivec_tvos_release() {
build_objectivec_cocoapods_integration() { build_objectivec_cocoapods_integration() {
# Update pod to the latest version. # Update pod to the latest version.
gem install cocoapods --no-ri --no-rdoc gem install cocoapods --no_document
objectivec/Tests/CocoaPods/run_tests.sh objectivec/Tests/CocoaPods/run_tests.sh
} }