diff --git a/src/win32/installer/build_installer.py b/src/win32/installer/build_installer.py index 513696e04..69d51b941 100644 --- a/src/win32/installer/build_installer.py +++ b/src/win32/installer/build_installer.py @@ -88,6 +88,7 @@ def run_wix4(args) -> None: icon_path = pathlib.Path(args.icon_path).resolve() mozc_tip32 = pathlib.Path(args.mozc_tip32).resolve() mozc_tip64 = pathlib.Path(args.mozc_tip64).resolve() + mozc_tip64_pdb = mozc_tip64.with_suffix('.pdb') mozc_broker = pathlib.Path(args.mozc_broker).resolve() mozc_server = pathlib.Path(args.mozc_server).resolve() mozc_cache_service = pathlib.Path(args.mozc_cache_service).resolve() @@ -131,6 +132,7 @@ def run_wix4(args) -> None: '-define', f'AddRemoveProgramIconPath={icon_path}', '-define', f'MozcTIP32Path={mozc_tip32}', '-define', f'MozcTIP64Path={mozc_tip64}', + '-define', f'MozcTIP64PdbPath={mozc_tip64_pdb}', '-define', f'MozcBroker64Path={mozc_broker}', '-define', f'MozcServer64Path={mozc_server}', '-define', f'MozcCacheService64Path={mozc_cache_service}', diff --git a/src/win32/installer/installer.gyp b/src/win32/installer/installer.gyp index 612c6888c..c956d6bfa 100644 --- a/src/win32/installer/installer.gyp +++ b/src/win32/installer/installer.gyp @@ -58,6 +58,7 @@ 'mozc_server64_path': '<(outdir64_dynamic)/GoogleIMEJaConverter.exe', 'mozc_tip32_path': '<(outdir32)/GoogleIMEJaTIP32.dll', 'mozc_tip64_path': '<(outdir64)/GoogleIMEJaTIP64.dll', + 'mozc_tip64_pdb_path': '<(outdir64)/GoogleIMEJaTIP64.dll.stripped.pdb', 'mozc_tool_path': '<(outdir64_dynamic)/GoogleIMEJaTool.exe', }, { # branding!="GoogleJapaneseInput" 'upgrade_code': 'DD94B570-B5E2-4100-9D42-61930C611D8A', @@ -73,6 +74,7 @@ 'mozc_server64_path': '<(outdir64_dynamic)/mozc_server.exe', 'mozc_tip32_path': '<(outdir32)/mozc_tip32.dll', 'mozc_tip64_path': '<(outdir64)/mozc_tip64.dll', + 'mozc_tip64_pdb_path': '<(outdir64)/mozc_tip64.dll.stripped.pdb', 'mozc_tool_path': '<(outdir64_dynamic)/mozc_tool.exe', }], ], @@ -87,6 +89,7 @@ 'mozc_server64_path': '<(mozc_server64_path)', 'mozc_tip32_path': '<(mozc_tip32_path)', 'mozc_tip64_path': '<(mozc_tip64_path)', + 'mozc_tip64_pdb_path': '<(mozc_tip64_pdb_path)', 'mozc_tool_path': '<(mozc_tool_path)', 'mozc_broker64_path': '<(mozc_broker64_path)', 'mozc_ca64_path': '<(mozc_ca64_path)', @@ -101,6 +104,7 @@ '<(mozc_server64_path)', '<(mozc_tip32_path)', '<(mozc_tip64_path)', + '<(mozc_tip64_pdb_path)', '<(mozc_tool_path)', ], }, @@ -156,6 +160,7 @@ '-define', 'AddRemoveProgramIconPath=<(icon_path)', '-define', 'MozcTIP32Path=<(mozc_tip32_path)', '-define', 'MozcTIP64Path=<(mozc_tip64_path)', + '-define', 'MozcTIP64PdbPath=<(mozc_tip64_pdb_path)', '-define', 'MozcBroker64Path=<(mozc_broker64_path)', '-define', 'MozcServer64Path=<(mozc_server64_path)', '-define', 'MozcCacheService64Path=<(mozc_cache_service64_path)', diff --git a/src/win32/installer/installer_64bit.wxs b/src/win32/installer/installer_64bit.wxs index f2f0248f6..6b2023105 100644 --- a/src/win32/installer/installer_64bit.wxs +++ b/src/win32/installer/installer_64bit.wxs @@ -104,6 +104,7 @@ + @@ -245,6 +246,9 @@ + + + diff --git a/src/win32/installer/installer_oss_64bit.wxs b/src/win32/installer/installer_oss_64bit.wxs index fd36905b2..ab27a9f79 100644 --- a/src/win32/installer/installer_oss_64bit.wxs +++ b/src/win32/installer/installer_oss_64bit.wxs @@ -88,6 +88,7 @@ + @@ -220,6 +221,9 @@ + + + diff --git a/src/win32/tip/BUILD.bazel b/src/win32/tip/BUILD.bazel index abcbc8755..01941ff61 100644 --- a/src/win32/tip/BUILD.bazel +++ b/src/win32/tip/BUILD.bazel @@ -50,6 +50,8 @@ mozc_cc_binary( target_compatible_with = ["@platforms//os:windows"], visibility = ["//win32/installer:__subpackages__"], # Scheuklappen: keep win_def_file = "mozc_tip.def", + linkopts = ["/DEBUG:FULL", "/PDBALTPATH:%_PDB%"], + features = ["generate_pdb_file"], deps = [ ":mozc_tip_resource", ":tip_class_factory", diff --git a/src/win32/tip/tip.gyp b/src/win32/tip/tip.gyp index 4825400dd..6fd20cc81 100644 --- a/src/win32/tip/tip.gyp +++ b/src/win32/tip/tip.gyp @@ -170,6 +170,10 @@ 'VCManifestTool': { 'EmbedManifest': 'true', }, + 'VCLinkerTool': { + # Generate stripped symbol. + 'AdditionalOptions': ['/PDBSTRIPPED:<(tipfile_product_name_win)64.dll.stripped.pdb'], + }, }, }, ],