Installer: Moved clean-up code to a separate section.

This commit is contained in:
LoRd_MuldeR 2015-08-11 22:21:26 +02:00
parent 9e5adf34b3
commit 31efcf8e51
8 changed files with 29 additions and 12 deletions

View File

@ -514,9 +514,9 @@ Section "-PreInit"
SetOutPath "$INSTDIR"
SectionEnd
Section "!Install Files"
!insertmacro PrintProgress "$(LAMEXP_LANG_STATUS_INSTFILES)"
Section "!Clean Up Old Cruft"
!insertmacro PrintProgress "$(LAMEXP_LANG_STATUS_CLEANUP)"
Delete "$INSTDIR\Changelog.htm"
Delete "$INSTDIR\Changelog.html"
Delete "$INSTDIR\Contributors.txt"
@ -535,13 +535,23 @@ Section "!Install Files"
Delete "$INSTDIR\Settings.cfg"
Delete "$INSTDIR\Translate.html"
Delete "$INSTDIR\Uninstall.exe"
Delete "$INSTDIR\Qt*.dll"
Delete "$INSTDIR\msvcr*.dll"
Delete "$INSTDIR\msvcp*.dll"
Delete "$INSTDIR\concrt*.dll"
Delete "$INSTDIR\vcruntime*.dll"
Delete "$INSTDIR\vccorlib*.dll"
RMDir /r "$INSTDIR\img"
RMDir /r "$INSTDIR\imageformats"
RMDir /r "$INSTDIR\redist"
SectionEnd
!insertmacro GetExecutableName $R0
Section "!Install Files"
!insertmacro PrintProgress "$(LAMEXP_LANG_STATUS_INSTFILES)"
DeleteOldBinary:
!insertmacro GetExecutableName $R0
ClearErrors
Delete "$INSTDIR\$R0"

View File

@ -1,6 +1,6 @@
; ///////////////////////////////////////////////////////////////////////////////
; // LameXP - Audio Encoder Front-End
; // Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
; // Copyright (C) 2004-2015 LoRd_MuldeR <MuldeR2@GMX.de>
; //
; // 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
@ -19,6 +19,7 @@
; // http://www.gnu.org/licenses/gpl-2.0.txt
; ///////////////////////////////////////////////////////////////////////////////
LangString LAMEXP_LANG_STATUS_CLEANUP ${LANG_ENGLISH} "Cleaning up, please wait..."
LangString LAMEXP_LANG_STATUS_CLOSING ${LANG_ENGLISH} "Closing running instance, please wait..."
LangString LAMEXP_LANG_STATUS_INSTFILES ${LANG_ENGLISH} "Installing program files, please wait..."
LangString LAMEXP_LANG_STATUS_VCREDIST ${LANG_ENGLISH} "Installing runtime libraries, please wait..."

View File

@ -1,6 +1,6 @@
; ///////////////////////////////////////////////////////////////////////////////
; // LameXP - Audio Encoder Front-End
; // Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
; // Copyright (C) 2004-2015 LoRd_MuldeR <MuldeR2@GMX.de>
; //
; // 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
@ -19,6 +19,7 @@
; // http://www.gnu.org/licenses/gpl-2.0.txt
; ///////////////////////////////////////////////////////////////////////////////
LangString LAMEXP_LANG_STATUS_CLEANUP ${LANG_GERMAN} "Aufräumen im Gange, bitte warten..."
LangString LAMEXP_LANG_STATUS_CLOSING ${LANG_GERMAN} "Schließe laufende Instanz, bitte warten..."
LangString LAMEXP_LANG_STATUS_INSTFILES ${LANG_GERMAN} "Installiere Programm-Dateien, bitte warten..."
LangString LAMEXP_LANG_STATUS_VCREDIST ${LANG_GERMAN} "Installiere Laufzeitbibliotheken, bitte warten..."

View File

@ -1,6 +1,6 @@
; ///////////////////////////////////////////////////////////////////////////////
; // LameXP - Audio Encoder Front-End
; // Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
; // Copyright (C) 2004-2015 LoRd_MuldeR <MuldeR2@GMX.de>
; //
; // 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
@ -19,6 +19,7 @@
; // http://www.gnu.org/licenses/gpl-2.0.txt
; ///////////////////////////////////////////////////////////////////////////////
LangString LAMEXP_LANG_STATUS_CLEANUP ${LANG_SPANISH} "Cleaning up, please wait..."
LangString LAMEXP_LANG_STATUS_CLOSING ${LANG_SPANISH} "Cerrando instancias en ejecución, espere por favor..."
LangString LAMEXP_LANG_STATUS_INSTFILES ${LANG_SPANISH} "Instalando archivos de programa, espere por favor..."
LangString LAMEXP_LANG_STATUS_VCREDIST ${LANG_SPANISH} "Installing runtime libraries, please wait..."

View File

@ -1,6 +1,6 @@
; ///////////////////////////////////////////////////////////////////////////////
; // LameXP - Audio Encoder Front-End
; // Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
; // Copyright (C) 2004-2015 LoRd_MuldeR <MuldeR2@GMX.de>
; //
; // 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
@ -19,6 +19,7 @@
; // http://www.gnu.org/licenses/gpl-2.0.txt
; ///////////////////////////////////////////////////////////////////////////////
LangString LAMEXP_LANG_STATUS_CLEANUP ${LANG_HUNGARIAN} "Cleaning up, please wait..."
LangString LAMEXP_LANG_STATUS_CLOSING ${LANG_HUNGARIAN} "Futó példány bezárása, kis türelmet..."
LangString LAMEXP_LANG_STATUS_INSTFILES ${LANG_HUNGARIAN} "Programfájlok telepítése, kis türelmet..."
LangString LAMEXP_LANG_STATUS_VCREDIST ${LANG_HUNGARIAN} "Installing runtime libraries, please wait..."

View File

@ -1,6 +1,6 @@
; ///////////////////////////////////////////////////////////////////////////////
; // LameXP - Audio Encoder Front-End
; // Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
; // Copyright (C) 2004-2015 LoRd_MuldeR <MuldeR2@GMX.de>
; //
; // 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
@ -19,6 +19,7 @@
; // http://www.gnu.org/licenses/gpl-2.0.txt
; ///////////////////////////////////////////////////////////////////////////////
LangString LAMEXP_LANG_STATUS_CLEANUP ${LANG_POLISH} "Cleaning up, please wait..."
LangString LAMEXP_LANG_STATUS_CLOSING ${LANG_POLISH} "Zamykanie uruchomionych procesów, prosze czekać..."
LangString LAMEXP_LANG_STATUS_INSTFILES ${LANG_POLISH} "Kopiowanie plików programu, prosze czekać..."
LangString LAMEXP_LANG_STATUS_VCREDIST ${LANG_POLISH} "Installing runtime libraries, please wait..."

View File

@ -1,6 +1,6 @@
; ///////////////////////////////////////////////////////////////////////////////
; // LameXP - Audio Encoder Front-End
; // Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
; // Copyright (C) 2004-2015 LoRd_MuldeR <MuldeR2@GMX.de>
; //
; // 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
@ -19,6 +19,7 @@
; // http://www.gnu.org/licenses/gpl-2.0.txt
; ///////////////////////////////////////////////////////////////////////////////
LangString LAMEXP_LANG_STATUS_CLEANUP ${LANG_RUSSIAN} "Cleaning up, please wait..."
LangString LAMEXP_LANG_STATUS_CLOSING ${LANG_RUSSIAN} "Закрываю работающие копии программы; пожалуйста, подождите..."
LangString LAMEXP_LANG_STATUS_INSTFILES ${LANG_RUSSIAN} "Устанавливаю файлы программы; пожалуйста, подождите..."
LangString LAMEXP_LANG_STATUS_VCREDIST ${LANG_RUSSIAN} "Installing runtime libraries, please wait..."

View File

@ -1,6 +1,6 @@
; ///////////////////////////////////////////////////////////////////////////////
; // LameXP - Audio Encoder Front-End
; // Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
; // Copyright (C) 2004-2015 LoRd_MuldeR <MuldeR2@GMX.de>
; //
; // 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
@ -19,6 +19,7 @@
; // http://www.gnu.org/licenses/gpl-2.0.txt
; ///////////////////////////////////////////////////////////////////////////////
LangString LAMEXP_LANG_STATUS_CLEANUP ${LANG_UKRAINIAN} "Cleaning up, please wait..."
LangString LAMEXP_LANG_STATUS_CLOSING ${LANG_UKRAINIAN} "Закриття запущеної копії, будь ласка, зачекайте..."
LangString LAMEXP_LANG_STATUS_INSTFILES ${LANG_UKRAINIAN} "Встановлення програмних файлів, будь ласка, зачекайте..."
LangString LAMEXP_LANG_STATUS_VCREDIST ${LANG_UKRAINIAN} "Installing runtime libraries, please wait..."