Skip to content

Commit e30526e

Browse files
committed
windows nsis build: use $GPO_VERSION for version
`VIProductVersion` demands version to be four numbers separated by dots. We can use the more descriptive $GPO_VERSION_DESC for other settings that accept a version.
1 parent 93b2933 commit e30526e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

tools/win_installer/_base.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ function build_installer {
481481
(cd $(dirname "$BUILDPY") && build_compileall -d "" -q -f -l .)
482482

483483
cp "${MISC}"/gpodder.ico "${BUILD_ROOT}"
484-
(cd "$BUILD_ROOT" && makensis -V3 -NOCD -DVERSION="$GPO_VERSION_DESC" -DBUILD_VERSION="$BUILD_VERSION" "${MISC}"/win_installer.nsi)
484+
(cd "$BUILD_ROOT" && makensis -V3 -NOCD -DVERSION="$GPO_VERSION" -DVERSION_DESC="$GPO_VERSION_DESC" -DBUILD_VERSION="$BUILD_VERSION" "${MISC}"/win_installer.nsi)
485485

486486
mv "$BUILD_ROOT/gpodder-LATEST.exe" "$DIR/gpodder-$GPO_VERSION_DESC-installer.exe"
487487
}

tools/win_installer/misc/win_installer.nsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${GPO_NAME}"
108108
VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "${GPO_WEBSITE}"
109109
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright gPodder Project GPL-3.0"
110110
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "${GPO_DESC}"
111-
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}"
112-
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${VERSION}"
111+
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION_DESC}"
112+
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${VERSION_DESC}"
113113
# Need to be four numbers separated by dots
114114
VIProductVersion "${VERSION}.${BUILD_VERSION}"
115115

0 commit comments

Comments
 (0)