diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2015-06-10 17:21:23 -0400 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2015-11-09 10:54:32 -0500 |
commit | 9642b821f2b79df9f44e4124318c23dd8addb82e (patch) | |
tree | 7f0699fe5309b9d5ee2d257d79f97a90377c6132 /travis.sh | |
parent | 64aa954daec2f6f2df460f9bcc1e2ca6ba42b640 (diff) | |
download | protobuf-9642b821f2b79df9f44e4124318c23dd8addb82e.tar.gz protobuf-9642b821f2b79df9f44e4124318c23dd8addb82e.tar.bz2 protobuf-9642b821f2b79df9f44e4124318c23dd8addb82e.zip |
Add ObjC build to travis setup
- Add objc for iOS and OS X builds to travis configs.
- Update handing of python install to deal with newer OS X versions.
Diffstat (limited to 'travis.sh')
-rwxr-xr-x | travis.sh | 22 |
1 files changed, 21 insertions, 1 deletions
@@ -112,7 +112,12 @@ build_javanano_oracle7() { } internal_install_python_deps() { - sudo pip install tox + # Install tox (OS X doesn't have pip). + if [ $(uname -s) == "Darwin" ]; then + sudo easy_install tox + else + sudo pip install tox + fi # Only install Python2.6/3.x on Linux. if [ $(uname -s) == "Linux" ]; then sudo apt-get install -y python-software-properties # for apt-add-repository @@ -124,6 +129,19 @@ internal_install_python_deps() { fi } +build_objectivec_common () { + # Reused the build script that takes care of configure and then Xcode + # builds/tests. + objectivec/DevTools/full_mac_build.sh --core-only "$@" +} + +build_objectivec_ios() { + build_objectivec_common --skip-xcode-osx +} + +build_objectivec_osx() { + build_objectivec_common --skip-xcode-ios +} build_python() { internal_build_cpp @@ -189,6 +207,8 @@ Usage: $0 { cpp | javanano_jdk6 | javanano_jdk7 | javanano_oracle7 | + objectivec_ios | + objectivec_osx | python | python_cpp | ruby_19 | |