Codebase list mozc / 0ebb4ff
Support Qt5 in Windows installer With this CL, Qt5 runtime DLLs should be installed as follows, as described in "Qt for Windows - Deployment" [1]. * Release build - [TargetDir]\Qt5Core.dll - [TargetDir]\Qt5Gui.dll - [TargetDir]\Qt5Widgets.dll - [TargetDir]\platforms\qwindows.dll * Debug build - [TargetDir]\Qt5Cored.dll - [TargetDir]\Qt5Guid.dll - [TargetDir]\Qt5Widgetsd.dll - [TargetDir]\platforms\qwindowsd.dll [1]: http://doc.qt.io/qt-5/windows-deployment.html BUG=#327 TEST=manually done REF_BUG=26887740 REF_CL=135074336,137662866 REF_TIME=2016-10-04T00:25:03-07:00 REF_TIME_RAW=1475565903 -0700 Yohei Yukawa 7 years ago
5 changed file(s) with 318 addition(s) and 2 deletion(s). Raw diff Collapse all Expand all
+1
-1
src/data/version/mozc_version_template.bzl less more
2929
3030 MAJOR=2
3131 MINOR=19
32 BUILD=2626
32 BUILD=2627
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
+29
-1
src/win32/installer/installer.gyp less more
6363 'qtcored4_dll_path': '',
6464 'qtgui4_dll_path': '',
6565 'qtguid4_dll_path': '',
66 'qt5core_dll_path': '',
67 'qt5cored_dll_path': '',
68 'qt5gui_dll_path': '',
69 'qt5guid_dll_path': '',
70 'qt5widgets_dll_path': '',
71 'qt5widgetsd_dll_path': '',
72 'qwindows_dll_path': '',
73 'qwindowsd_dll_path': '',
6674 'mozc_zinnia_model_data_path': '',
6775 'conditions': [
6876 ['use_qt=="YES"', {
77 'mozc_zinnia_model_data_path': '<(DEPTH)/third_party/zinnia/tomoe/handwriting-light-ja.model',
78 }],
79 ['use_qt=="YES" and qt_ver==4', {
6980 'qtcore4_dll_path': '<(qt_dir)/bin/QtCore4.dll',
7081 'qtcored4_dll_path': '<(qt_dir)/bin/QtCored4.dll',
7182 'qtgui4_dll_path': '<(qt_dir)/bin/QtGui4.dll',
7283 'qtguid4_dll_path': '<(qt_dir)/bin/QtGuid4.dll',
73 'mozc_zinnia_model_data_path': '<(DEPTH)/third_party/zinnia/tomoe/handwriting-light-ja.model',
84 }],
85 ['use_qt=="YES" and qt_ver==5', {
86 'qt5core_dll_path': '<(qt_dir)/bin/Qt5Core.dll',
87 'qt5cored_dll_path': '<(qt_dir)/bin/Qt5Cored.dll',
88 'qt5gui_dll_path': '<(qt_dir)/bin/Qt5Gui.dll',
89 'qt5guid_dll_path': '<(qt_dir)/bin/Qt5Guid.dll',
90 'qt5widgets_dll_path': '<(qt_dir)/bin/Qt5Widgets.dll',
91 'qt5widgetsd_dll_path': '<(qt_dir)/bin/Qt5Widgetsd.dll',
92 'qwindows_dll_path': '<(qt_dir)/plugins/platforms/qwindows.dll',
93 'qwindowsd_dll_path': '<(qt_dir)/plugins/platforms/qwindowsd.dll',
7494 }],
7595 ],
7696 },
82102 'qtcored4_dll_path': '<(qtcored4_dll_path)',
83103 'qtgui4_dll_path': '<(qtgui4_dll_path)',
84104 'qtguid4_dll_path': '<(qtguid4_dll_path)',
105 'qt5core_dll_path': '<(qt5core_dll_path)',
106 'qt5cored_dll_path': '<(qt5cored_dll_path)',
107 'qt5gui_dll_path': '<(qt5gui_dll_path)',
108 'qt5guid_dll_path': '<(qt5guid_dll_path)',
109 'qt5widgets_dll_path': '<(qt5widgets_dll_path)',
110 'qt5widgetsd_dll_path': '<(qt5widgetsd_dll_path)',
111 'qwindows_dll_path': '<(qwindows_dll_path)',
112 'qwindowsd_dll_path': '<(qwindowsd_dll_path)',
85113 'mozc_zinnia_model_data_path': '<(mozc_zinnia_model_data_path)',
86114 'mozc_tool_path': '<(outdir32_dynamic)/GoogleIMEJaTool.exe',
87115 'mozc_broker32_path': '<(outdir32)/GoogleIMEJaBroker32.exe',
+124
-0
src/win32/installer/installer_32bit.wxs less more
6666 <?endif?>
6767 <?ifndef QtGuid4DllPath ?>
6868 <?define QtGuid4DllPath="" ?>
69 <?endif?>
70 <?ifndef Qt5CoreDllPath ?>
71 <?define Qt5CoreDllPath="" ?>
72 <?endif?>
73 <?ifndef Qt5CoredDllPath ?>
74 <?define Qt5CoredDllPath="" ?>
75 <?endif?>
76 <?ifndef Qt5GuiDllPath ?>
77 <?define Qt5GuiDllPath="" ?>
78 <?endif?>
79 <?ifndef Qt5GuidDllPath ?>
80 <?define Qt5GuidDllPath="" ?>
81 <?endif?>
82 <?ifndef Qt5WidgetsDllPath ?>
83 <?define Qt5WidgetsDllPath="" ?>
84 <?endif?>
85 <?ifndef Qt5WidgetsdDllPath ?>
86 <?define Qt5WidgetsdDllPath="" ?>
87 <?endif?>
88 <?ifndef QWindowsDllPath ?>
89 <?define QWindowsDllPath="" ?>
90 <?endif?>
91 <?ifndef QWindowsdDllPath ?>
92 <?define QWindowsdDllPath="" ?>
6993 <?endif?>
7094
7195 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
380404 Checksum='yes' Source='$(var.QtGuid4DllPath)' />
381405 </Component>
382406 <?endif?>
407 <?if $(var.Qt5CoredDllPath) != "" ?>
408 <Component Id='Qt5CoredDll' Guid='*'>
409 <!-- Always overwrite: b/31845781 -->
410 <RemoveFile Id='Qt5Cored.dll' Name='Qt5Cored.dll' On="install" />
411 <File Id='Qt5Cored.dll'
412 Name='Qt5Cored.dll' DiskId='1' Vital='yes'
413 Checksum='yes' Source='$(var.Qt5CoredDllPath)' />
414 </Component>
415 <?endif?>
416 <?if $(var.Qt5GuidDllPath) != "" ?>
417 <Component Id='Qt5GuidDll' Guid='*'>
418 <!-- Always overwrite: b/31845781 -->
419 <RemoveFile Id='Qt5Guid.dll' Name='Qt5Guid.dll' On="install" />
420 <File Id='Qt5Guid.dll'
421 Name='Qt5Guid.dll' DiskId='1' Vital='yes'
422 Checksum='yes' Source='$(var.Qt5GuidDllPath)' />
423 </Component>
424 <?endif?>
425 <?if $(var.Qt5WidgetsdDllPath) != "" ?>
426 <Component Id='Qt5WidgetsdDll' Guid='*'>
427 <!-- Always overwrite: b/31845781 -->
428 <RemoveFile Id='Qt5Widgetsd.dll' Name='Qt5Widgetsd.dll' On="install" />
429 <File Id='Qt5Widgetsd.dll'
430 Name='Qt5Widgetsd.dll' DiskId='1' Vital='yes'
431 Checksum='yes' Source='$(var.Qt5WidgetsdDllPath)' />
432 </Component>
433 <?endif?>
383434 <?else?>
384435 <?if $(var.QtCore4DllPath) != "" ?>
385436 <Component Id='QtCore4Dll' Guid='*'>
399450 Checksum='yes' Source='$(var.QtGui4DllPath)' />
400451 </Component>
401452 <?endif?>
453 <?if $(var.Qt5CoreDllPath) != "" ?>
454 <Component Id='Qt5CoreDll' Guid='*'>
455 <!-- Always overwrite: b/31845781 -->
456 <RemoveFile Id='Qt5Core.dll' Name='Qt5Core.dll' On="install" />
457 <File Id='Qt5Core.dll'
458 Name='Qt5Core.dll' DiskId='1' Vital='yes'
459 Checksum='yes' Source='$(var.Qt5CoreDllPath)' />
460 </Component>
461 <?endif?>
462 <?if $(var.Qt5GuiDllPath) != "" ?>
463 <Component Id='Qt5GuiDll' Guid='*'>
464 <!-- Always overwrite: b/31845781 -->
465 <RemoveFile Id='Qt5Gui.dll' Name='Qt5Gui.dll' On="install" />
466 <File Id='Qt5Gui.dll'
467 Name='Qt5Gui.dll' DiskId='1' Vital='yes'
468 Checksum='yes' Source='$(var.Qt5GuiDllPath)' />
469 </Component>
470 <?endif?>
471 <?if $(var.Qt5WidgetsDllPath) != "" ?>
472 <Component Id='Qt5WidgetsDll' Guid='*'>
473 <!-- Always overwrite: b/31845781 -->
474 <RemoveFile Id='Qt5Widgets.dll' Name='Qt5Widgets.dll' On="install" />
475 <File Id='Qt5Widgets.dll'
476 Name='Qt5Widgets.dll' DiskId='1' Vital='yes'
477 Checksum='yes' Source='$(var.Qt5WidgetsDllPath)' />
478 </Component>
479 <?endif?>
402480 <?endif?>
403481 <Directory Id='DocumentsDir' Name='documents'>
404482 <Component Id='CreditsJa' Guid='*'>
412490 Source='$(var.DocumentsDir)/credits_en.html' />
413491 </Component>
414492 </Directory>
493 <?if ($(var.QWindowsdDllPath) != "") or ($(var.QWindowsDllPath) != "") ?>
494 <Directory Id='QtPlatformsPluginDir' Name='platforms'>
495 <?if ($(var.QWindowsdDllPath) != "") and ($(var.VSConfigurationName) = "Debug") ?>
496 <Component Id='QWindowsdDll' Guid='*'>
497 <!-- Always overwrite: b/31845781 -->
498 <RemoveFile Id='qwindowsd.dll' Name='qwindowsd.dll' On="install" />
499 <File Id='qwindowsd.dll'
500 Name='qwindowsd.dll' DiskId='1' Vital='yes'
501 Checksum='yes' Source='$(var.QWindowsdDllPath)' />
502 </Component>
503 <?endif?>
504 <?if ($(var.QWindowsDllPath) != "") and ($(var.VSConfigurationName) != "Debug") ?>
505 <Component Id='QWindowsDll' Guid='*'>
506 <!-- Always overwrite: b/31845781 -->
507 <RemoveFile Id='qwindows.dll' Name='qwindows.dll' On="install" />
508 <File Id='qwindows.dll'
509 Name='qwindows.dll' DiskId='1' Vital='yes'
510 Checksum='yes' Source='$(var.QWindowsDllPath)' />
511 </Component>
512 <?endif?>
513 </Directory>
514 <?endif?>
415515 </Directory>
416516 </Directory>
417517 </Directory>
605705 <?if $(var.QtGuid4DllPath) != "" ?>
606706 <ComponentRef Id='QtGuid4Dll' />
607707 <?endif?>
708 <?if $(var.Qt5CoredDllPath) != "" ?>
709 <ComponentRef Id='Qt5CoredDll' />
710 <?endif?>
711 <?if $(var.Qt5GuidDllPath) != "" ?>
712 <ComponentRef Id='Qt5GuidDll' />
713 <?endif?>
714 <?if $(var.Qt5WidgetsdDllPath) != "" ?>
715 <ComponentRef Id='Qt5WidgetsdDll' />
716 <?endif?>
717 <?if $(var.QWindowsdDllPath) != "" ?>
718 <ComponentRef Id='QWindowsdDll' />
719 <?endif?>
608720 <?else?>
609721 <?if $(var.QtCore4DllPath) != "" ?>
610722 <ComponentRef Id='QtCore4Dll' />
611723 <?endif?>
612724 <?if $(var.QtGui4DllPath) != "" ?>
613725 <ComponentRef Id='QtGui4Dll' />
726 <?endif?>
727 <?if $(var.Qt5CoreDllPath) != "" ?>
728 <ComponentRef Id='Qt5CoreDll' />
729 <?endif?>
730 <?if $(var.Qt5GuiDllPath) != "" ?>
731 <ComponentRef Id='Qt5GuiDll' />
732 <?endif?>
733 <?if $(var.Qt5WidgetsDllPath) != "" ?>
734 <ComponentRef Id='Qt5WidgetsDll' />
735 <?endif?>
736 <?if $(var.QWindowsDllPath) != "" ?>
737 <ComponentRef Id='QWindowsDll' />
614738 <?endif?>
615739 <?endif?>
616740 <ComponentRef Id='OmahaRegister' />
+124
-0
src/win32/installer/installer_64bit.wxs less more
6666 <?endif?>
6767 <?ifndef QtGuid4DllPath ?>
6868 <?define QtGuid4DllPath="" ?>
69 <?endif?>
70 <?ifndef Qt5CoreDllPath ?>
71 <?define Qt5CoreDllPath="" ?>
72 <?endif?>
73 <?ifndef Qt5CoredDllPath ?>
74 <?define Qt5CoredDllPath="" ?>
75 <?endif?>
76 <?ifndef Qt5GuiDllPath ?>
77 <?define Qt5GuiDllPath="" ?>
78 <?endif?>
79 <?ifndef Qt5GuidDllPath ?>
80 <?define Qt5GuidDllPath="" ?>
81 <?endif?>
82 <?ifndef Qt5WidgetsDllPath ?>
83 <?define Qt5WidgetsDllPath="" ?>
84 <?endif?>
85 <?ifndef Qt5WidgetsdDllPath ?>
86 <?define Qt5WidgetsdDllPath="" ?>
87 <?endif?>
88 <?ifndef QWindowsDllPath ?>
89 <?define QWindowsDllPath="" ?>
90 <?endif?>
91 <?ifndef QWindowsdDllPath ?>
92 <?define QWindowsdDllPath="" ?>
6993 <?endif?>
7094
7195 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
397421 Checksum='yes' Source='$(var.QtGuid4DllPath)' />
398422 </Component>
399423 <?endif?>
424 <?if $(var.Qt5CoredDllPath) != "" ?>
425 <Component Id='Qt5CoredDll' Guid='*'>
426 <!-- Always overwrite: b/31845781 -->
427 <RemoveFile Id='Qt5Cored.dll' Name='Qt5Cored.dll' On="install" />
428 <File Id='Qt5Cored.dll'
429 Name='Qt5Cored.dll' DiskId='1' Vital='yes'
430 Checksum='yes' Source='$(var.Qt5CoredDllPath)' />
431 </Component>
432 <?endif?>
433 <?if $(var.Qt5GuidDllPath) != "" ?>
434 <Component Id='Qt5GuidDll' Guid='*'>
435 <!-- Always overwrite: b/31845781 -->
436 <RemoveFile Id='Qt5Guid.dll' Name='Qt5Guid.dll' On="install" />
437 <File Id='Qt5Guid.dll'
438 Name='Qt5Guid.dll' DiskId='1' Vital='yes'
439 Checksum='yes' Source='$(var.Qt5GuidDllPath)' />
440 </Component>
441 <?endif?>
442 <?if $(var.Qt5WidgetsdDllPath) != "" ?>
443 <Component Id='Qt5WidgetsdDll' Guid='*'>
444 <!-- Always overwrite: b/31845781 -->
445 <RemoveFile Id='Qt5Widgetsd.dll' Name='Qt5Widgetsd.dll' On="install" />
446 <File Id='Qt5Widgetsd.dll'
447 Name='Qt5Widgetsd.dll' DiskId='1' Vital='yes'
448 Checksum='yes' Source='$(var.Qt5WidgetsdDllPath)' />
449 </Component>
450 <?endif?>
400451 <?else?>
401452 <?if $(var.QtCore4DllPath) != "" ?>
402453 <Component Id='QtCore4Dll' Guid='*'>
416467 Checksum='yes' Source='$(var.QtGui4DllPath)' />
417468 </Component>
418469 <?endif?>
470 <?if $(var.Qt5CoreDllPath) != "" ?>
471 <Component Id='Qt5CoreDll' Guid='*'>
472 <!-- Always overwrite: b/31845781 -->
473 <RemoveFile Id='Qt5Core.dll' Name='Qt5Core.dll' On="install" />
474 <File Id='Qt5Core.dll'
475 Name='Qt5Core.dll' DiskId='1' Vital='yes'
476 Checksum='yes' Source='$(var.Qt5CoreDllPath)' />
477 </Component>
478 <?endif?>
479 <?if $(var.Qt5GuiDllPath) != "" ?>
480 <Component Id='Qt5GuiDll' Guid='*'>
481 <!-- Always overwrite: b/31845781 -->
482 <RemoveFile Id='Qt5Gui.dll' Name='Qt5Gui.dll' On="install" />
483 <File Id='Qt5Gui.dll'
484 Name='Qt5Gui.dll' DiskId='1' Vital='yes'
485 Checksum='yes' Source='$(var.Qt5GuiDllPath)' />
486 </Component>
487 <?endif?>
488 <?if $(var.Qt5WidgetsDllPath) != "" ?>
489 <Component Id='Qt5WidgetsDll' Guid='*'>
490 <!-- Always overwrite: b/31845781 -->
491 <RemoveFile Id='Qt5Widgets.dll' Name='Qt5Widgets.dll' On="install" />
492 <File Id='Qt5Widgets.dll'
493 Name='Qt5Widgets.dll' DiskId='1' Vital='yes'
494 Checksum='yes' Source='$(var.Qt5WidgetsDllPath)' />
495 </Component>
496 <?endif?>
419497 <?endif?>
420498 <Directory Id='DocumentsDir' Name='documents'>
421499 <Component Id='CreditsJa' Guid='*'>
429507 Source='$(var.DocumentsDir)/credits_en.html' />
430508 </Component>
431509 </Directory>
510 <?if ($(var.QWindowsdDllPath) != "") or ($(var.QWindowsDllPath) != "") ?>
511 <Directory Id='QtPlatformsPluginDir' Name='platforms'>
512 <?if ($(var.QWindowsdDllPath) != "") and ($(var.VSConfigurationName) = "Debug") ?>
513 <Component Id='QWindowsdDll' Guid='*'>
514 <!-- Always overwrite: b/31845781 -->
515 <RemoveFile Id='qwindowsd.dll' Name='qwindowsd.dll' On="install" />
516 <File Id='qwindowsd.dll'
517 Name='qwindowsd.dll' DiskId='1' Vital='yes'
518 Checksum='yes' Source='$(var.QWindowsdDllPath)' />
519 </Component>
520 <?endif?>
521 <?if ($(var.QWindowsDllPath) != "") and ($(var.VSConfigurationName) != "Debug") ?>
522 <Component Id='QWindowsDll' Guid='*'>
523 <!-- Always overwrite: b/31845781 -->
524 <RemoveFile Id='qwindows.dll' Name='qwindows.dll' On="install" />
525 <File Id='qwindows.dll'
526 Name='qwindows.dll' DiskId='1' Vital='yes'
527 Checksum='yes' Source='$(var.QWindowsDllPath)' />
528 </Component>
529 <?endif?>
530 </Directory>
531 <?endif?>
432532 </Directory>
433533 </Directory>
434534 </Directory>
677777 <?if $(var.QtGuid4DllPath) != "" ?>
678778 <ComponentRef Id='QtGuid4Dll' />
679779 <?endif?>
780 <?if $(var.Qt5CoredDllPath) != "" ?>
781 <ComponentRef Id='Qt5CoredDll' />
782 <?endif?>
783 <?if $(var.Qt5GuidDllPath) != "" ?>
784 <ComponentRef Id='Qt5GuidDll' />
785 <?endif?>
786 <?if $(var.Qt5WidgetsdDllPath) != "" ?>
787 <ComponentRef Id='Qt5WidgetsdDll' />
788 <?endif?>
789 <?if $(var.QWindowsdDllPath) != "" ?>
790 <ComponentRef Id='QWindowsdDll' />
791 <?endif?>
680792 <?else?>
681793 <?if $(var.QtCore4DllPath) != "" ?>
682794 <ComponentRef Id='QtCore4Dll' />
683795 <?endif?>
684796 <?if $(var.QtGui4DllPath) != "" ?>
685797 <ComponentRef Id='QtGui4Dll' />
798 <?endif?>
799 <?if $(var.Qt5CoreDllPath) != "" ?>
800 <ComponentRef Id='Qt5CoreDll' />
801 <?endif?>
802 <?if $(var.Qt5GuiDllPath) != "" ?>
803 <ComponentRef Id='Qt5GuiDll' />
804 <?endif?>
805 <?if $(var.Qt5WidgetsDllPath) != "" ?>
806 <ComponentRef Id='Qt5WidgetsDll' />
807 <?endif?>
808 <?if $(var.QWindowsDllPath) != "" ?>
809 <ComponentRef Id='QWindowsDll' />
686810 <?endif?>
687811 <?endif?>
688812 <ComponentRef Id='OmahaRegister' />
+40
-0
src/win32/installer/wix.gypi less more
9393 '-dQtGuid4DllPath=<(qtguid4_dll_path)',
9494 ],
9595 }],
96 ['qt5core_dll_path!=""', {
97 'additional_args': [
98 '-dQt5CoreDllPath=<(qt5core_dll_path)',
99 ],
100 }],
101 ['qt5cored_dll_path!=""', {
102 'additional_args': [
103 '-dQt5CoredDllPath=<(qt5cored_dll_path)',
104 ],
105 }],
106 ['qt5gui_dll_path!=""', {
107 'additional_args': [
108 '-dQt5GuiDllPath=<(qt5gui_dll_path)',
109 ],
110 }],
111 ['qt5guid_dll_path!=""', {
112 'additional_args': [
113 '-dQt5GuidDllPath=<(qt5guid_dll_path)',
114 ],
115 }],
116 ['qt5widgets_dll_path!=""', {
117 'additional_args': [
118 '-dQt5WidgetsDllPath=<(qt5widgets_dll_path)',
119 ],
120 }],
121 ['qt5widgetsd_dll_path!=""', {
122 'additional_args': [
123 '-dQt5WidgetsdDllPath=<(qt5widgetsd_dll_path)',
124 ],
125 }],
126 ['qwindows_dll_path!=""', {
127 'additional_args': [
128 '-dQWindowsDllPath=<(qwindows_dll_path)',
129 ],
130 }],
131 ['qwindowsd_dll_path!=""', {
132 'additional_args': [
133 '-dQWindowsdDllPath=<(qwindowsd_dll_path)',
134 ],
135 }],
96136 ['MSVS_VERSION=="2015" and use_qt=="YES"', {
97137 'additional_args': [
98138 r'-dUCRTDir=C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x86',