Codebase list mozc / a0e67d9
Use Qt5 by default on all desktop builds With this CL, Windows build start using Qt5 unless --qtver=4 is explicitly specified. BUG=#327 TEST= REF_BUG=26887740 REF_CL=136967529 REF_TIME=2016-10-23T10:48:40-07:00 REF_TIME_RAW=1477244920 -0700 Yohei Yukawa 7 years ago
4 changed file(s) with 21 addition(s) and 21 deletion(s). Raw diff Collapse all Expand all
+1
-1
appveyor.yml less more
3737 - choco install ninja -version 1.7.1
3838 build_script:
3939 - cd src
40 - python build_mozc.py gyp --qtdir=C:\Qt\5.6\msvc2015 --qtver=5
40 - python build_mozc.py gyp --qtdir=C:\Qt\5.6\msvc2015
4141 - python build_mozc.py build -c Release package
4242 test: off
+18
-11
docs/build_mozc_in_windows.md less more
99 Building Mozc on Windows requires the following software.
1010
1111 * [Visual Studio 2015 Community Edition](http://visualstudio.com/free), or any greater edition.
12 * (optinal) [Qt libraries](http://download.qt.io/archive/qt/)
12 * (optinal) [Qt 5](https://download.qt.io/official_releases/qt/)
1313 * Commercial version and LGPL version are available.
14 * You must download msvs2015 32-bit version of Qt 5 since currently `mozc_tool.exe` needs to be built as a 32-bit executable.
1415
1516 # Get dependent prebuilt binaries
1617
4344
4445 ```
4546 cd c:\work\mozc\src
46 python build_mozc.py gyp --qtdir=c:\Qt\4.8.0
47 ```
48
49 The directory of Qt (`C:\Qt\4.8.0` in this example) differs based on Qt version. If you specify `--noqt` option instead of `--qtdir=<dir to Qt>`, mozc\_tool will be built as a mock version, which does nothing.
47 python build_mozc.py gyp --qtdir=c:\Qt\Qt5.6.2\5.6\msvc2015
48 ```
49
50 The directory of Qt (`c:\Qt\Qt5.6.2\5.6\msvc2015` in this example) differs based on Qt version. If you specify `--noqt` option instead of `--qtdir=<dir to Qt>`, mozc\_tool will be built as a mock version, which does nothing.
5051
5152 You can also specify `--branding=GoogleJapaneseInput` option and `--wix_dir=<dir to WiX binaries>` option here to reproduce official Google Japanese Input binaries and installers.
5253
9394 * `C:\work\mozc\src\out\Release\mozc_server.exe`
9495 * `C:\work\mozc\src\out\Release\mozc_tool.exe` (if you specified `--noqt` option)
9596 * `C:\work\mozc\src\out\ReleaseDynamic\mozc_tool.exe` (if you didn't specify `--noqt` option)
96 * `C:\work\mozc\src\out\ReleaseDynamic\QtCore4.dll` (not required if you specified `--noqt` option)
97 * `C:\work\mozc\src\out\ReleaseDynamic\QtGui4.dll` (not required if you specified `--noqt` option)
98
99 `QtCore4.dll` and `QtGui4.dll` are not required if you specified `--noqt` option into the gyp command.
97 * `C:\work\mozc\src\out\ReleaseDynamic\Qt5Core.dll` (not required if you specified `--noqt` option)
98 * `C:\work\mozc\src\out\ReleaseDynamic\Qt5Gui.dll` (not required if you specified `--noqt` option)
99 * `C:\work\mozc\src\out\ReleaseDynamic\Qt5Widgets.dll` (not required if you specified `--noqt` option)
100 * `C:\work\mozc\src\out\ReleaseDynamic\platforms\qwindows.dll` (not required if you specified `--noqt` option)
101
102 `Qt5Core.dll`, `Qt5Gui.dll`, `Qt5Widgets.dll`, and `qwindows.dll` are not required if you specified `--noqt` option into the gyp command.
100103
101104 ### Register Mozc for IMM32 into 32-bit environment
102105
164167 * `C:\work\mozc\src\out\Release\mozc_server.exe`
165168 * `C:\work\mozc\src\out\Release\mozc_tool.exe` (if you specified `--noqt` option)
166169 * `C:\work\mozc\src\out\ReleaseDynamic\mozc\_tool.exe` (if you didn't specify `--noqt` option)
167 * `C:\work\mozc\src\out\ReleaseDynamic\QtCore4.dll` (not required if you specified `--noqt` option)
168 * `C:\work\mozc\src\out\ReleaseDynamic\QtGui4.dll` (not required if you specified `--noqt` option)
170 * `C:\work\mozc\src\out\ReleaseDynamic\Qt5Core.dll` (not required if you specified `--noqt` option)
171 * `C:\work\mozc\src\out\ReleaseDynamic\Qt5Gui.dll` (not required if you specified `--noqt` option)
172 * `C:\work\mozc\src\out\ReleaseDynamic\Qt5Widgets.dll` (not required if you specified `--noqt` option)
173 * `C:\work\mozc\src\out\ReleaseDynamic\platforms\qwindows.dll` (not required if you specified `--noqt` option)
169174 * `C:\work\mozc\src\out\Release_x64\mozc_broker64.exe`
175
176 `Qt5Core.dll`, `Qt5Gui.dll`, `Qt5Widgets.dll`, and `qwindows.dll` are not required if you specified `--noqt` option into the gyp command.
170177
171178 ### Register Mozc for IMM32 into 64-bit environment
172179
+1
-8
src/build_mozc.py less more
271271 parser.add_option('--gypdir', dest='gypdir',
272272 help='Specifies the location of GYP to be used.')
273273 parser.add_option('--noqt', action='store_true', dest='noqt', default=False)
274
275 default_qtver = '5'
276 # TODO(yukawa): Support Qt5 on Windows
277 if IsWindows():
278 default_qtver = '4'
279 parser.add_option('--qtver', dest='qtver', choices=('4', '5'),
280 default=default_qtver)
281
274 parser.add_option('--qtver', dest='qtver', choices=('4', '5'), default='5')
282275 parser.add_option('--version_file', dest='version_file',
283276 help='use the specified version template file',
284277 default='data/version/mozc_version_template.bzl')
+1
-1
src/data/version/mozc_version_template.bzl less more
2929
3030 MAJOR=2
3131 MINOR=19
32 BUILD=2648
32 BUILD=2649
3333 REVISION=102
3434 # This version represents the version of Mozc IME engine (converter, predictor,
3535 # etc.). This version info is included both in the Mozc server and in the Mozc