From c8b11be511a5a67778868287a5ad43f593b54154 Mon Sep 17 00:00:00 2001 From: yenru0 Date: Wed, 23 Sep 2026 23:14:41 +0900 Subject: [PATCH] gwen: Ship pdfium license notices in bundles --- crates/zed/resources/windows/gwen.iss | 1 + script/bundle-linux | 6 +++++- script/bundle-windows.ps1 | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/crates/zed/resources/windows/gwen.iss b/crates/zed/resources/windows/gwen.iss index d7dd0adf75..b37c18d845 100644 --- a/crates/zed/resources/windows/gwen.iss +++ b/crates/zed/resources/windows/gwen.iss @@ -67,6 +67,7 @@ Name: "{app}"; AfterInstall: DisableAppDirInheritance [Files] Source: "{#ResourcesDir}\Gwen.exe"; DestDir: "{code:GetInstallDir}"; Flags: ignoreversion Source: "{#ResourcesDir}\pdfium.dll"; DestDir: "{code:GetInstallDir}"; Flags: ignoreversion +Source: "{#ResourcesDir}\pdfium-licenses\*"; DestDir: "{code:GetInstallDir}\licenses\pdfium"; Flags: ignoreversion Source: "{#ResourcesDir}\bin\*"; DestDir: "{code:GetInstallDir}\bin"; Flags: ignoreversion Source: "{#ResourcesDir}\tools\*"; DestDir: "{app}\tools"; Flags: ignoreversion Source: "{#ResourcesDir}\appx\*"; DestDir: "{app}\appx"; BeforeInstall: RemoveAppxPackage; AfterInstall: AddAppxPackage; Flags: ignoreversion; Check: IsWindows11OrLater diff --git a/script/bundle-linux b/script/bundle-linux index 26620634e8..a46ca0932f 100755 --- a/script/bundle-linux +++ b/script/bundle-linux @@ -189,8 +189,12 @@ if ! echo "${pdfium_sha256} ${pdfium_tgz}" | sha256sum --check --status 2>/dev/ echo "${pdfium_sha256} ${pdfium_tgz}" | sha256sum --check - fi pdfium_tmp=$(mktemp -d) -tar -xzf "${pdfium_tgz}" -C "${pdfium_tmp}" "lib/libpdfium.so" +tar -xzf "${pdfium_tgz}" -C "${pdfium_tmp}" "lib/libpdfium.so" "LICENSE" "licenses" cp "${pdfium_tmp}/lib/libpdfium.so" "${zed_dir}/lib/libpdfium.so" +# BSD-3 of the toolset and its bundled third parties requires retaining the +# license notices on redistribution. +mkdir -p "${zed_dir}/share/licenses/pdfium" +cp "${pdfium_tmp}/LICENSE" "${pdfium_tmp}/licenses/"* "${zed_dir}/share/licenses/pdfium/" rm -rf "${pdfium_tmp}" # Icons diff --git a/script/bundle-windows.ps1 b/script/bundle-windows.ps1 index 6c255a2338..609f78d1d0 100644 --- a/script/bundle-windows.ps1 +++ b/script/bundle-windows.ps1 @@ -254,7 +254,7 @@ function DownloadPdfium { throw "pdfium-win-x64.tgz checksum mismatch" } New-Item -Path ".\pdfium" -ItemType Directory -Force - tar -xzf $tgzPath -C ".\pdfium" "bin/pdfium.dll" + tar -xzf $tgzPath -C ".\pdfium" "bin/pdfium.dll" "LICENSE" "licenses" } function CollectFiles { @@ -264,6 +264,9 @@ function CollectFiles { Move-Item -Path "$innoDir\gwen.sh" -Destination "$innoDir\bin\gwen" -Force Move-Item -Path "$innoDir\auto_update_helper.exe" -Destination "$innoDir\tools\auto_update_helper.exe" -Force Move-Item -Path ".\pdfium\bin\pdfium.dll" -Destination "$innoDir\pdfium.dll" -Force + New-Item -Path "$innoDir\pdfium-licenses" -ItemType Directory -Force + Move-Item -Path ".\pdfium\licenses\*" -Destination "$innoDir\pdfium-licenses\" -Force + Move-Item -Path ".\pdfium\LICENSE" -Destination "$innoDir\pdfium-licenses\packaging-MIT" -Force if($Architecture -eq "aarch64") { New-Item -Type Directory -Path "$innoDir\arm64" -Force Move-Item -Path ".\conpty\build\native\runtimes\arm64\OpenConsole.exe" -Destination "$innoDir\arm64\OpenConsole.exe" -Force