Fix build break in installer for Windows with --noqt
When --noqt is specified, {Debug,Release}/GoogleIMEJaTool.exe should be
used instead of {Debug,Release}Dynamic/GoogleIMEJaTool.exe to build
the installer for Windows.
BUG=#327
TEST=
REF_BUG=26887740
REF_CL=137113011
REF_TIME=2016-10-24T20:26:36-07:00
REF_TIME_RAW=1477365996 -0700
Yohei Yukawa
7 years ago
| 29 | 29 |
|
| 30 | 30 |
MAJOR=2
|
| 31 | 31 |
MINOR=19
|
| 32 | |
BUILD=2651
|
|
32 |
BUILD=2652
|
| 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
|
| 55 | 55 |
'../custom_action/custom_action.gyp:mozc_custom_action32',
|
| 56 | 56 |
],
|
| 57 | 57 |
}],
|
|
58 |
['use_qt!="YES"', {
|
|
59 |
'dependencies': [
|
|
60 |
'../../gui/gui.gyp:mozc_tool',
|
|
61 |
],
|
|
62 |
}],
|
| 58 | 63 |
],
|
| 59 | 64 |
},
|
| 60 | 65 |
],
|
| 72 | 72 |
'qwindows_dll_path': '',
|
| 73 | 73 |
'qwindowsd_dll_path': '',
|
| 74 | 74 |
'mozc_zinnia_model_data_path': '',
|
|
75 |
'mozc_tool_path': '<(outdir32)/GoogleIMEJaTool.exe',
|
| 75 | 76 |
'conditions': [
|
| 76 | 77 |
['use_qt=="YES"', {
|
| 77 | 78 |
'mozc_zinnia_model_data_path': '<(DEPTH)/third_party/zinnia/tomoe/handwriting-light-ja.model',
|
|
79 |
'mozc_tool_path': '<(outdir32_dynamic)/GoogleIMEJaTool.exe',
|
| 78 | 80 |
}],
|
| 79 | 81 |
['use_qt=="YES" and qt_ver==4', {
|
| 80 | 82 |
'qtcore4_dll_path': '<(qt_dir)/bin/QtCore4.dll',
|
|
| 111 | 113 |
'qwindows_dll_path': '<(qwindows_dll_path)',
|
| 112 | 114 |
'qwindowsd_dll_path': '<(qwindowsd_dll_path)',
|
| 113 | 115 |
'mozc_zinnia_model_data_path': '<(mozc_zinnia_model_data_path)',
|
| 114 | |
'mozc_tool_path': '<(outdir32_dynamic)/GoogleIMEJaTool.exe',
|
|
116 |
'mozc_tool_path': '<(mozc_tool_path)',
|
| 115 | 117 |
'mozc_broker32_path': '<(outdir32)/GoogleIMEJaBroker32.exe',
|
| 116 | 118 |
'mozc_broker64_path': '<(outdir64)/GoogleIMEJaBroker64.exe',
|
| 117 | 119 |
'mozc_ca32_path': '<(outdir32)/GoogleIMEJaInstallerHelper32.dll',
|