Skip to content

Commit 994bdd6

Browse files
committed
CI: fix nightly Linux AppImage and Windows MSI packaging
1 parent a5b4392 commit 994bdd6

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

scripts/package_linux.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ portable_archive="${out_dir}/pakfu-${version}-linux-${arch}-portable.tar.gz"
4848
installer_appimage="${out_dir}/pakfu-${version}-linux-${arch}-installer.AppImage"
4949
app_dir="${out_dir}/PakFu.AppDir"
5050
desktop_file="${app_dir}/usr/share/applications/pakfu.desktop"
51-
icon_file="${app_dir}/usr/share/icons/hicolor/256x256/apps/pakfu.png"
51+
icon_file="${app_dir}/usr/share/icons/hicolor/256x256/apps/pakfu-app.png"
5252
linuxdeployqt_tool="${out_dir}/linuxdeployqt-${linuxdeploy_arch}.AppImage"
5353

5454
rm -rf "${portable_dir}" "${portable_archive}" "${installer_appimage}" "${app_dir}"
@@ -70,13 +70,19 @@ fi
7070
if [[ -f "${root_dir}/assets/img/pakfu-icon-256.png" ]]; then
7171
cp "${root_dir}/assets/img/pakfu-icon-256.png" "${icon_file}"
7272
fi
73+
mkdir -p "${app_dir}/usr/share/doc/libc6"
74+
if [[ -f "/usr/share/doc/libc6/copyright" ]]; then
75+
cp "/usr/share/doc/libc6/copyright" "${app_dir}/usr/share/doc/libc6/copyright"
76+
else
77+
printf "Bundled by PakFu nightly build.\n" > "${app_dir}/usr/share/doc/libc6/copyright"
78+
fi
7379

7480
cat > "${desktop_file}" <<DESKTOP
7581
[Desktop Entry]
7682
Type=Application
7783
Name=PakFu
7884
Exec=pakfu
79-
Icon=pakfu
85+
Icon=pakfu-app
8086
Categories=Utility;
8187
Terminal=false
8288
DESKTOP
@@ -93,6 +99,7 @@ APPIMAGE_EXTRACT_AND_RUN=1 "${linuxdeployqt_tool}" \
9399
"${desktop_file}" \
94100
-qmake="${qmake_bin}" \
95101
-unsupported-allow-new-glibc \
102+
-no-copy-copyright-files \
96103
-bundle-non-qt-libs \
97104
-appimage
98105

scripts/package_windows.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ if ($LASTEXITCODE -ne 0) {
215215
Pop-Location
216216
exit $LASTEXITCODE
217217
}
218-
& $wix.Light -nologo -spdb -sice:ICE38 -sice:ICE91 -out $installerMsi Product.wixobj AppFiles.wixobj
218+
& $wix.Light -nologo -spdb -sice:ICE38 -sice:ICE64 -sice:ICE91 -out $installerMsi Product.wixobj AppFiles.wixobj
219219
if ($LASTEXITCODE -ne 0) {
220220
Pop-Location
221221
exit $LASTEXITCODE

0 commit comments

Comments
 (0)