erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-11-03 09:37:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

maint(windows): replace use of wzzip with add_zip_files

Browse source 
This makes use of the new functionality refactored in the previous
commit by replacing the use of the `wzzip` function with `add_zip_files`.

Test-bot: skip
This commit is contained in:
Eberhard Beilharz 2025-07-11 08:52:11 +02:00
parent 501c666d7d
commit 4a2cf53fbc
No known key found for this signature in database
GPG key ID: E9140597606020D3
4 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
developer/src/inst/build.sh
View file

@ -22,7 +22,6 @@ builder_parse "$@"
. "${KEYMAN_ROOT}/resources/build/win/environment.inc.sh"
. "${KEYMAN_ROOT}/resources/build/win/wix.inc.sh"
. "${KEYMAN_ROOT}/resources/build/win/zip.inc.sh"
. "${KEYMAN_ROOT}/resources/build/zip.inc.sh"
# In dev environments, we'll hack the tier to alpha; CI sets this for us in real builds.
@ -234,7 +233,7 @@ function make-installer() {
echo "Version=$KEYMAN_VERSION" >> setup.inf
echo "MSIFileName=keymandeveloper.msi" >> setup.inf
echo "Title=Keyman Developer ${KEYMAN_VERSION_WITH_TAG}" >>setup.inf
wzzip setup.zip keymandeveloper.msi setup.inf
add_zip_files setup.zip keymandeveloper.msi setup.inf
cat "$DEVELOPER_PROGRAM/setup.exe" setup.zip > "keymandeveloper-$KEYMAN_VERSION.exe"
wrap-signcode //d "Keyman Developer" "keymandeveloper-$KEYMAN_VERSION.exe"

4
oem/firstvoices/windows/src/inst/build.sh
View file

@ -22,7 +22,7 @@ builder_parse "$@"
. "$KEYMAN_ROOT/resources/build/win/environment.inc.sh"
. "$KEYMAN_ROOT/resources/build/win/wix.inc.sh"
. "$KEYMAN_ROOT/resources/build/win/zip.inc.sh"
. "$KEYMAN_ROOT/resources/build/zip.inc.sh"
# In dev environments, we'll hack the tier to alpha; CI sets this for us in real builds.
if [[ -z ${KEYMAN_TIER+x} ]]; then
@ -85,7 +85,7 @@ function do_publish() {
# Build self-extracting archive
#
create-setup-inf
wzzip firstvoices.zip firstvoices.msi license.html setup.inf setuptitle.png fv_all.kmp
add_zip_files firstvoices.zip firstvoices.msi license.html setup.inf setuptitle.png fv_all.kmp
rm -f setup.inf
cat "$WINDOWS_PROGRAM_APP/setup-redist.exe" firstvoices.zip > firstvoices.exe
rm -f firstvoices.zip

14
resources/build/win/zip.inc.sh
View file

@ -1,14 +0,0 @@
WZZIPPATH="$ProgramFiles/7-zip/7z.exe"
wzzip() {
if [[ $GO_FAST == 1 ]]; then
"$WZZIPPATH" a -mx1 "$@"
else
"$WZZIPPATH" a -mx9 "$@"
fi
}
wzunzip() {
"$WZZIPPATH" e "$@"
}

6
windows/src/desktop/inst/build.sh
View file

@ -21,7 +21,7 @@ builder_parse "$@"
. "$KEYMAN_ROOT/resources/build/win/environment.inc.sh"
. "$KEYMAN_ROOT/resources/build/win/wix.inc.sh"
. "$KEYMAN_ROOT/resources/build/win/zip.inc.sh"
. "$KEYMAN_ROOT/resources/build/zip.inc.sh"
# In dev environments, we'll hack the tier to alpha; CI sets this for us in real builds.
if [[ -z ${KEYMAN_TIER+x} ]]; then
@ -86,7 +86,7 @@ function do_publish() {
# Build self-extracting archive
#
create-setup-inf
wzzip keymandesktop.zip keymandesktop.msi license.html setup.inf
add_zip_files keymandesktop.zip keymandesktop.msi license.html setup.inf
rm -f setup.inf
cat "$WINDOWS_PROGRAM_APP/setup-redist.exe" keymandesktop.zip > keymandesktop.exe
rm -f keymandesktop.zip
@ -110,7 +110,7 @@ function copy-installer() {
builder_if_release_build_level verify-installer-signatures
# Copy the unsigned setup.exe for use in bundling scenarios; zip it up for clarity
wzzip "$KEYMAN_ROOT/windows/release/${KEYMAN_VERSION}/setup-redist.zip" "$WINDOWS_PROGRAM_APP/setup-redist.exe"
add_zip_files "${KEYMAN_ROOT}/windows/release/${KEYMAN_VERSION}/setup-redist.zip" "${WINDOWS_PROGRAM_APP}/setup-redist.exe"
}
function verify-program-signatures() {