Permalink
Browse files

Enable NaCl build on Travis-CI.

This CL enables Nacl build on Travis-CI as well as Linux desktop
build and OS X build.

The one caveat is that $CC and $CXX need to be unset before
running GYP due to #304.
  • Loading branch information...
1 parent cfe9a2a commit 6215113da0c0bb80c001ed9e85a7db61ce94d07d @yukawa yukawa committed Sep 27, 2015
Showing with 28 additions and 7 deletions.
  1. +25 −4 .travis.yml
  2. +3 −3 README.md
View
@@ -47,14 +47,35 @@ addons:
- libqt4-dev
- libxcb-xfixes0-dev
- pkg-config
+ - libc6:i386
+ - libstdc++6:i386
+
+env:
+ - TARGET_PLATFORM=Linux
+ - TARGET_PLATFORM=NaCl
+ - TARGET_PLATFORM=Mac
install:
- if [ $TRAVIS_OS_NAME == linux ]; then git -C src/third_party clone https://chromium.googlesource.com/chromium/tools/depot_tools.git; fi
- if [ $TRAVIS_OS_NAME == linux ]; then export PATH="$PATH":`pwd`/src/third_party/depot_tools; fi
+ - if [ $TRAVIS_OS_NAME == linux ]; then unset CC; fi
+ - if [ $TRAVIS_OS_NAME == linux ]; then unset CXX; fi
+ - if [ $TARGET_PLATFORM == NaCl ]; then cd src/third_party && curl -LO http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/nacl_sdk.zip && unzip nacl_sdk.zip && rm nacl_sdk.zip && cd nacl_sdk && ./naclsdk install pepper_40 && cd ../../../; fi
script:
- cd ./src
- - if [ $TRAVIS_OS_NAME == linux ]; then python build_mozc.py gyp; fi
- - if [ $TRAVIS_OS_NAME == linux ]; then python build_mozc.py build -c Release package; fi
- - if [ $TRAVIS_OS_NAME == osx ]; then GYP_DEFINES="mac_sdk=10.9 mac_deployment_target=10.8" python build_mozc.py gyp --noqt; fi
- - if [ $TRAVIS_OS_NAME == osx ]; then python build_mozc.py build -c Release mac/mac.gyp:GoogleJapaneseInput mac/mac.gyp:gen_launchd_confs; fi
+ - if [ $TARGET_PLATFORM == Linux ]; then python build_mozc.py gyp --target_platform=Linux; fi
+ - if [ $TARGET_PLATFORM == Linux ]; then python build_mozc.py build -c Release package; fi
+ - if [ $TARGET_PLATFORM == NaCl ]; then python build_mozc.py gyp --target_platform=NaCl --nacl_sdk_root=`pwd`/third_party/nacl_sdk/pepper_40; fi
+ - if [ $TARGET_PLATFORM == NaCl ]; then python build_mozc.py build -c Release package; fi
+ - if [ $TARGET_PLATFORM == Mac ]; then GYP_DEFINES="mac_sdk=10.9 mac_deployment_target=10.8" python build_mozc.py gyp --noqt; fi
+ - if [ $TARGET_PLATFORM == Mac ]; then python build_mozc.py build -c Release mac/mac.gyp:GoogleJapaneseInput mac/mac.gyp:gen_launchd_confs; fi
+
+matrix:
+ exclude:
+ - os: linux
+ env: TARGET_PLATFORM=Mac
+ - os: osx
+ env: TARGET_PLATFORM=Linux
+ - os: osx
+ env: TARGET_PLATFORM=NaCl
View
@@ -11,9 +11,9 @@ OpenSource project originates from
Build Status
------------
-|Android |Windows |OS X + Linux |NaCl |
-|:------:|:------:|:-----------:|:---:|
-|N/A |[![Build status](https://ci.appveyor.com/api/projects/status/1rvmtp7f80jv7ehf/branch/master?svg=true)](https://ci.appveyor.com/project/google/mozc/branch/master) |[![Build Status](https://travis-ci.org/google/mozc.svg?branch=master)](https://travis-ci.org/google/mozc) |N/A |
+|Android |Windows |OS X + Linux + NaCl |
+|:------:|:------:|:------------------:|
+|N/A |[![Build status](https://ci.appveyor.com/api/projects/status/1rvmtp7f80jv7ehf/branch/master?svg=true)](https://ci.appveyor.com/project/google/mozc/branch/master) |[![Build Status](https://travis-ci.org/google/mozc.svg?branch=master)](https://travis-ci.org/google/mozc) |
What's Mozc?
------------

0 comments on commit 6215113

Please sign in to comment.