Skip to content

Commit

Permalink
Built GUI tools for macOS on Travis CI
Browse files Browse the repository at this point in the history
With this CL, continuous build on Travis CI makes sure that GUI tools
can be built with Qt5 on mac.

BUG=#327
TEST=compile
REF_BUG=
REF_CL=
REF_TIME=2016-11-06T22:39:01-08:00
REF_TIME_RAW=1478500741 -0800
  • Loading branch information
yukawa committed Nov 7, 2016
1 parent d3b669a commit 8aa3f56
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Expand Up @@ -64,6 +64,7 @@ install:
- if [ $TRAVIS_OS_NAME == linux ]; then unset CXX; fi
- if [ $TARGET_PLATFORM == Mac ]; then git -C src/third_party clone https://chromium.googlesource.com/chromium/tools/depot_tools.git; fi
- if [ $TARGET_PLATFORM == Mac ]; then export PATH="$PATH":`pwd`/src/third_party/depot_tools; fi
- if [ $TARGET_PLATFORM == Mac ]; then brew update && brew install qt5; 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_49 && cd ../../../; fi
- if [ ${TARGET_PLATFORM:0:7} == Android ]; then jdk_switcher use openjdk7; fi
- if [ ${TARGET_PLATFORM:0:7} == Android ]; then cd src/third_party && curl -LO http://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip && unzip -q android-ndk-r12b-linux-x86_64.zip && rm android-ndk-r12b-linux-x86_64.zip && curl -L http://dl.google.com/android/android-sdk_r24.1.2-linux.tgz | tar -zx && cd ../../; fi
Expand All @@ -84,7 +85,7 @@ script:
- if [ $TARGET_PLATFORM == Linux ]; then python build_mozc.py runtests -c Release; fi
- if [ $TARGET_PLATFORM == NaCl ]; then python build_mozc.py gyp --target_platform=NaCl --nacl_sdk_root=`pwd`/third_party/nacl_sdk/pepper_49; 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.9" python build_mozc.py gyp --noqt; fi
- if [ $TARGET_PLATFORM == Mac ]; then GYP_DEFINES="mac_sdk=10.9 mac_deployment_target=10.9" python build_mozc.py gyp --qtdir=/usr/local/opt/qt5; fi
- if [ $TARGET_PLATFORM == Mac ]; then python build_mozc.py build -c Release mac/mac.gyp:GoogleJapaneseInput mac/mac.gyp:gen_launchd_confs; fi
- if [ $TARGET_PLATFORM == Mac ]; then python build_mozc.py runtests -c Release; fi

Expand Down
2 changes: 1 addition & 1 deletion docs/build_mozc_in_osx.md
Expand Up @@ -11,7 +11,7 @@ Building on Mac requires the following software.

* Xcode
* [Ninja](https://github.com/ninja-build/ninja)
* [Qt4](https://download.qt.io/official_releases/qt/4.8/)
* [Qt 5](https://download.qt.io/official_releases/qt/)

If you don't need to run gui tools like about dialog, config dialog, or dictionary tool, you can omit installing Qt. Candidate window still shows without Qt. See below for the detailed information.

Expand Down
2 changes: 1 addition & 1 deletion src/data/version/mozc_version_template.bzl
Expand Up @@ -30,7 +30,7 @@

MAJOR=2
MINOR=19
BUILD=2661
BUILD=2662
REVISION=102
# This version represents the version of Mozc IME engine (converter, predictor,
# etc.). This version info is included both in the Mozc server and in the Mozc
Expand Down

0 comments on commit 8aa3f56

Please sign in to comment.