From 21059516268e5e5ea60987d62b1c928359f052fb Mon Sep 17 00:00:00 2001 From: lordmulder Date: Mon, 29 Nov 2010 22:06:54 +0100 Subject: [PATCH] Fix installer version info. --- etc/NSIS/setup.nsi | 25 ++++++++++++++----------- src/Config.h | 2 +- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi index b2abd59a..d2a7a1c3 100644 --- a/etc/NSIS/setup.nsi +++ b/etc/NSIS/setup.nsi @@ -35,17 +35,20 @@ ShowInstDetails show !define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\orange.bmp" !define MUI_PAGE_CUSTOMFUNCTION_SHOW CheckForUpdate -VIAddVersionKey /LANG=${LANG_ENGLISH} "Author" "LoRd_MuldeR " -VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version." -VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "Free Software Foundation" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "LameXP v${LAMEXP_VERSION} ${LAMEXP_SUFFIX} [Build #${LAMEXP_BUILD}]" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${LAMEXP_DATE}.${LAMEXP_BUILD} (${LAMEXP_VERSION})" -VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright 2004-2010 LoRd_MuldeR" -VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" "GNU" -VIAddVersionKey /LANG=${LANG_ENGLISH} "OriginalFilename" "LameXP.${LAMEXP_DATE}.exe" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "LameXP - Audio Encoder Frontend" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${LAMEXP_VERSION}, Build #${LAMEXP_BUILD} (${LAMEXP_DATE})" -VIAddVersionKey /LANG=${LANG_ENGLISH} "Website" "http://mulder.at.gg/" +!searchreplace PRODUCT_VERSION_DATE "${LAMEXP_DATE}" "-" "." +VIProductVersion "${PRODUCT_VERSION_DATE}.${LAMEXP_BUILD}" + +VIAddVersionKey "Author" "LoRd_MuldeR " +VIAddVersionKey "Comments" "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version." +VIAddVersionKey "CompanyName" "Free Software Foundation" +VIAddVersionKey "FileDescription" "LameXP v${LAMEXP_VERSION} ${LAMEXP_SUFFIX} [Build #${LAMEXP_BUILD}]" +VIAddVersionKey "FileVersion" "${PRODUCT_VERSION_DATE}.${LAMEXP_BUILD} (${LAMEXP_VERSION})" +VIAddVersionKey "LegalCopyright" "Copyright 2004-2010 LoRd_MuldeR" +VIAddVersionKey "LegalTrademarks" "GNU" +VIAddVersionKey "OriginalFilename" "LameXP.${LAMEXP_DATE}.exe" +VIAddVersionKey "ProductName" "LameXP - Audio Encoder Frontend" +VIAddVersionKey "ProductVersion" "${LAMEXP_VERSION}, Build #${LAMEXP_BUILD} (${LAMEXP_DATE})" +VIAddVersionKey "Website" "http://mulder.at.gg/" !include `UAC.nsh` !include `parameters.nsh` diff --git a/src/Config.h b/src/Config.h index 84d1d0fc..29771e05 100644 --- a/src/Config.h +++ b/src/Config.h @@ -25,7 +25,7 @@ #define VER_LAMEXP_MAJOR 4 #define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_LO 0 -#define VER_LAMEXP_BUILD 103 +#define VER_LAMEXP_BUILD 104 #define VER_LAMEXP_SUFFIX TechPreview /*