Use macOS 11.0 SDK by default
With this CL Mozc starts using macOS 11.0 SDK by default.
This CL also updates build environment on Travis CI as follows.
- Xcode: 6.4 -> 7.3.1
- macOS: 10.10 -> 10.11
BUG=
TEST=compile
REF_BUG=30725799
REF_CL=
REF_TIME=2016-11-13T18:00:26-08:00
REF_TIME_RAW=1479088826 -0800
Yohei Yukawa
7 years ago
| 28 | 28 |
|
| 29 | 29 |
sudo: required
|
| 30 | 30 |
dist: trusty
|
| 31 | |
osx_image: xcode6.4
|
|
31 |
osx_image: xcode7.3
|
| 32 | 32 |
|
| 33 | 33 |
os:
|
| 34 | 34 |
- linux
|
|
| 64 | 64 |
- if [ $TARGET_PLATFORM == Mac ]; then git -C src/third_party clone https://chromium.googlesource.com/chromium/tools/depot_tools.git; fi
|
| 65 | 65 |
- if [ $TARGET_PLATFORM == Mac ]; then export PATH="$PATH":`pwd`/src/third_party/depot_tools; fi
|
| 66 | 66 |
- if [ $TARGET_PLATFORM == Mac ]; then brew update && brew install qt5; fi
|
|
67 |
- if [ $TARGET_PLATFORM == Mac ]; then pip install -U pyobjc-core && pip install -U pyobjc-framework-Cocoa; fi
|
| 67 | 68 |
- 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
|
| 68 | 69 |
- if [ ${TARGET_PLATFORM:0:7} == Android ]; then jdk_switcher use openjdk7; fi
|
| 69 | 70 |
- 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
|
|
| 84 | 85 |
- if [ $TARGET_PLATFORM == Linux ]; then python build_mozc.py runtests -c Release; fi
|
| 85 | 86 |
- if [ $TARGET_PLATFORM == NaCl ]; then python build_mozc.py gyp --target_platform=NaCl --nacl_sdk_root=`pwd`/third_party/nacl_sdk/pepper_49; fi
|
| 86 | 87 |
- if [ $TARGET_PLATFORM == NaCl ]; then python build_mozc.py build -c Release package; fi
|
| 87 | |
- 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
|
|
88 |
- if [ $TARGET_PLATFORM == Mac ]; then python build_mozc.py gyp --qtdir=/usr/local/opt/qt5; fi
|
| 88 | 89 |
- if [ $TARGET_PLATFORM == Mac ]; then python build_mozc.py build -c Release mac/mac.gyp:GoogleJapaneseInput mac/mac.gyp:gen_launchd_confs; fi
|
| 89 | 90 |
- if [ $TARGET_PLATFORM == Mac ]; then python build_mozc.py runtests -c Release; fi
|
| 90 | 91 |
|
| 30 | 30 |
|
| 31 | 31 |
```
|
| 32 | 32 |
cd ~/work/mozc/src
|
| 33 | |
GYP_DEFINES="mac_sdk=10.9 mac_deployment_target=10.9" python build_mozc.py gyp --noqt
|
|
33 |
GYP_DEFINES="mac_sdk=10.11 mac_deployment_target=10.9" python build_mozc.py gyp --noqt
|
| 34 | 34 |
```
|
| 35 | 35 |
|
| 36 | 36 |
You can customize the SDK version and target OS version here. Then, build Mozc.app and necessary files:
|
|
| 48 | 48 |
To build GUI tools, you need to specify --qtdir instead of --noqt.
|
| 49 | 49 |
|
| 50 | 50 |
```
|
| 51 | |
GYP_DEFINES="mac_sdk=10.9 mac_deployment_target=10.9" python build_mozc.py gyp --qtdir ~/myqt
|
|
51 |
GYP_DEFINES="mac_sdk=10.11 mac_deployment_target=10.9" python build_mozc.py gyp --qtdir ~/myqt
|
| 52 | 52 |
```
|
| 53 | 53 |
|
| 54 | 54 |
In the above case, `~/myqt` should contain Qt's sources, headers and libraries built from `configure` and `make`.
|
| 60 | 60 |
def Xcodebuild(projdir, target, arch, outdir):
|
| 61 | 61 |
ProcessCall([
|
| 62 | 62 |
'xcodebuild', '-project', projdir, '-configuration', 'Release',
|
| 63 | |
'-target', target, '-arch', arch, '-sdk', 'macosx10.9',
|
|
63 |
'-target', target, '-arch', arch, '-sdk', 'macosx10.11',
|
| 64 | 64 |
'GCC_VERSION=com.apple.compilers.llvm.clang.1_0',
|
| 65 | 65 |
'CONFIGURATION_BUILD_DIR=%s' % outdir,
|
| 66 | 66 |
])
|
| 29 | 29 |
|
| 30 | 30 |
MAJOR=2
|
| 31 | 31 |
MINOR=19
|
| 32 | |
BUILD=2662
|
|
32 |
BUILD=2663
|
| 33 | 33 |
REVISION=102
|
| 34 | 34 |
# This version represents the version of Mozc IME engine (converter, predictor,
|
| 35 | 35 |
# etc.). This version info is included both in the Mozc server and in the Mozc
|
| 45 | 45 |
'compiler_host_version_int%': '0', # (major_ver) * 100 + (minor_ver)
|
| 46 | 46 |
|
| 47 | 47 |
# Versioning stuff for Mac.
|
| 48 | |
'mac_sdk%': '10.9',
|
|
48 |
'mac_sdk%': '10.11',
|
| 49 | 49 |
'mac_deployment_target%': '10.9',
|
| 50 | 50 |
|
| 51 | 51 |
|