From 5ff45cd49462075c09042637457d2fff8d83bbbd Mon Sep 17 00:00:00 2001 From: lordmulder Date: Fri, 20 Apr 2012 21:11:06 +0200 Subject: [PATCH] Changed temporary installer file name. --- Copying.txt | 8 +++++--- etc/NSIS/wrapper.nsi | 14 +++++++------- src/Config.h | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Copying.txt b/Copying.txt index c5d4f672..37ce62e5 100644 --- a/Copying.txt +++ b/Copying.txt @@ -1,5 +1,7 @@ -LameXP was created from the scratch by LoRd_MuldeR and is distributed under the terms of GNU General Public License (see 'License.txt'). +LameXP was created from the scratch by LoRd_MuldeR and is distributed under the terms of GNU General Public License. Please see the 'License.txt' file for details! -The Qt GUI Toolkit is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies); the Qt GUI Toolkit may be distributed under the terms of GNU General Public License. +The Qt GUI Toolkit is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). You may use, distribute and copy the Qt GUI Toolkit under the terms of GNU General Public License version 3. -The copyright of all third-party tools used in LameXP belongs to the individual software authors. Please see the "About third-party software" dialog for details! +The copyright of all third-party programs included in LameXP belongs to the individual software authors. Please see the "About third-party software" dialog for details! + +The Nero AAC Encoder is Copyright (C) 2009 Nero AG. You may NOT redistribute the Nero AAC Encoder; it is NOT included in LameXP and may be obtained form the Nero web-site as a free download. diff --git a/etc/NSIS/wrapper.nsi b/etc/NSIS/wrapper.nsi index f80347ab..90f7d2e9 100644 --- a/etc/NSIS/wrapper.nsi +++ b/etc/NSIS/wrapper.nsi @@ -117,7 +117,7 @@ VIAddVersionKey "FileDescription" "LameXP v${LAMEXP_VERSION} ${LAMEXP_INSTTYPE}- VIAddVersionKey "FileVersion" "${PRODUCT_VERSION_DATE}.${LAMEXP_BUILD} (${LAMEXP_VERSION})" VIAddVersionKey "LegalCopyright" "Copyright 2004-2012 LoRd_MuldeR" VIAddVersionKey "LegalTrademarks" "GNU" -VIAddVersionKey "OriginalFilename" "LameXP.${LAMEXP_DATE}.exe" +VIAddVersionKey "OriginalFilename" "LameXP.${LAMEXP_DATE}.Build-${LAMEXP_BUILD}.exe" VIAddVersionKey "ProductName" "LameXP - Audio Encoder Frontend" VIAddVersionKey "ProductVersion" "${LAMEXP_VERSION}, Build #${LAMEXP_BUILD} (${LAMEXP_DATE})" VIAddVersionKey "Website" "${MyWebSite}" @@ -134,7 +134,7 @@ Section "-LaunchTheInstaller" InitPluginsDir SetOutPath "$PLUGINSDIR" - File "/oname=$PLUGINSDIR\LameXP-SETUP.${LAMEXP_DATE}.${LAMEXP_BUILD}.exe" "${LAMEXP_SOURCE_FILE}" + File "/oname=$PLUGINSDIR\LameXP-SETUP-r${LAMEXP_BUILD}.exe" "${LAMEXP_SOURCE_FILE}" ; -------- @@ -157,8 +157,8 @@ Section "-LaunchTheInstaller" RunTryAgain: - DetailPrint "ExecShellWait: $PLUGINSDIR\LameXP-SETUP.${LAMEXP_DATE}.${LAMEXP_BUILD}.exe" - ${StdUtils.ExecShellWait} $R1 "$PLUGINSDIR\LameXP-SETUP.${LAMEXP_DATE}.${LAMEXP_BUILD}.exe" "open" '$R9' + DetailPrint "ExecShellWait: $PLUGINSDIR\LameXP-SETUP-r${LAMEXP_BUILD}.exe" + ${StdUtils.ExecShellWait} $R1 "$PLUGINSDIR\LameXP-SETUP-r${LAMEXP_BUILD}.exe" "open" '$R9' DetailPrint "Result: $R1" StrCmp $R1 "error" RunFailed @@ -177,11 +177,11 @@ Section "-LaunchTheInstaller" ; -------- ClearErrors - ExecShell "open" "$PLUGINSDIR\LameXP-SETUP.${LAMEXP_DATE}.${LAMEXP_BUILD}.exe" '$R9' SW_SHOWNORMAL + ExecShell "open" "$PLUGINSDIR\LameXP-SETUP-r${LAMEXP_BUILD}.exe" '$R9' SW_SHOWNORMAL IfErrors 0 RunSuccess ClearErrors - ExecShell "" "$PLUGINSDIR\LameXP-SETUP.${LAMEXP_DATE}.${LAMEXP_BUILD}.exe" '$R9' SW_SHOWNORMAL + ExecShell "" "$PLUGINSDIR\LameXP-SETUP-r${LAMEXP_BUILD}.exe" '$R9' SW_SHOWNORMAL IfErrors 0 RunSuccess ; -------- @@ -196,5 +196,5 @@ Section "-LaunchTheInstaller" RunSuccess: - Delete /REBOOTOK "$PLUGINSDIR\LameXP-SETUP.${LAMEXP_DATE}.${LAMEXP_BUILD}.exe" + Delete /REBOOTOK "$PLUGINSDIR\LameXP-SETUP-r${LAMEXP_BUILD}.exe" SectionEnd diff --git a/src/Config.h b/src/Config.h index 1cba2bc2..61820872 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_TYPE RC #define VER_LAMEXP_PATCH 3 -#define VER_LAMEXP_BUILD 984 +#define VER_LAMEXP_BUILD 985 /////////////////////////////////////////////////////////////////////////////// // Tool versions (minimum expected versions!)