diff --git a/etc/Deployment/_deploy.bat b/etc/Deployment/_deploy.bat index 263f64c1..3477d324 100644 --- a/etc/Deployment/_deploy.bat +++ b/etc/Deployment/_deploy.bat @@ -140,12 +140,19 @@ if not "%VER_LAMEXP_TYPE%" == "Final" ( copy "%~dp0\..\..\doc\PRE_RELEASE_INFO.txt" "%TMP_PATH%" ) ) +attrib +R "%TMP_PATH%\*.txt" +attrib +R "%TMP_PATH%\*.html" +attrib +R "%TMP_PATH%\*.exe" REM ------------------------------------------ REM :: CREATE PACKAGES :: REM ------------------------------------------ "%PATH_SEVENZ%\7z.exe" a -tzip -r "%OUT_FILE%.zip" "%TMP_PATH%\*" "%PATH_MKNSIS%\makensis.exe" "/DLAMEXP_UPX_PATH=%PATH_UPXBIN%" "/DLAMEXP_DATE=%ISO_DATE%" "/DLAMEXP_VERSION=%VER_LAMEXP_MAJOR%.%VER_LAMEXP_MINOR_HI%%VER_LAMEXP_MINOR_LO%" "/DLAMEXP_BUILD=%VER_LAMEXP_BUILD%" "/DLAMEXP_INSTTYPE=%VER_LAMEXP_TYPE%" "/DLAMEXP_PATCH=%VER_LAMEXP_PATCH%" "/DLAMEXP_OUTPUT_FILE=%OUT_FILE%.sfx" "/DLAMEXP_SOURCE_PATH=%TMP_PATH%" "%~dp0\..\NSIS\setup.nsi" "%PATH_MKNSIS%\makensis.exe" "/DLAMEXP_UPX_PATH=%PATH_UPXBIN%" "/DLAMEXP_DATE=%ISO_DATE%" "/DLAMEXP_VERSION=%VER_LAMEXP_MAJOR%.%VER_LAMEXP_MINOR_HI%%VER_LAMEXP_MINOR_LO%" "/DLAMEXP_BUILD=%VER_LAMEXP_BUILD%" "/DLAMEXP_INSTTYPE=%VER_LAMEXP_TYPE%" "/DLAMEXP_PATCH=%VER_LAMEXP_PATCH%" "/DLAMEXP_OUTPUT_FILE=%OUT_FILE%.exe" "/DLAMEXP_SOURCE_FILE=%OUT_FILE%.sfx" "%~dp0\..\NSIS\wrapper.nsi" +REM ------------------------------------------ +attrib -R "%TMP_PATH%\*.txt" +attrib -R "%TMP_PATH%\*.html" +attrib -R "%TMP_PATH%\*.exe" rd /S /Q "%TMP_PATH%" REM ------------------------------------------ if not exist "%OUT_FILE%.zip" ( diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi index 1c7f3345..0c41ee17 100644 --- a/etc/NSIS/setup.nsi +++ b/etc/NSIS/setup.nsi @@ -411,15 +411,16 @@ Section "!Install Files" Delete "$INSTDIR\Changelog.htm" Delete "$INSTDIR\Changelog.html" Delete "$INSTDIR\Contributors.txt" + Delete "$INSTDIR\Copying.txt" Delete "$INSTDIR\FAQ.html" Delete "$INSTDIR\Howto.html" Delete "$INSTDIR\LameEnc.sys" Delete "$INSTDIR\LameXP.exe" Delete "$INSTDIR\LameXP.exe.sig" Delete "$INSTDIR\License.txt" - Delete "$INSTDIR\PRE_RELEASE_INFO.txt" Delete "$INSTDIR\Readme.htm" Delete "$INSTDIR\ReadMe.txt" + Delete "$INSTDIR\PRE_RELEASE_INFO.txt" Delete "$INSTDIR\Settings.cfg" Delete "$INSTDIR\Translate.html" Delete "$INSTDIR\Uninstall.exe" @@ -435,9 +436,9 @@ Section "!Install Files" Abort "Could not delete old binary!" ${EndIf} - File `/oname=$R0` `${LAMEXP_SOURCE_PATH}\LameXP.exe` - File `${LAMEXP_SOURCE_PATH}\*.txt` - File `${LAMEXP_SOURCE_PATH}\*.html` + File /a `/oname=$R0` `${LAMEXP_SOURCE_PATH}\LameXP.exe` + File /a `${LAMEXP_SOURCE_PATH}\*.txt` + File /a `${LAMEXP_SOURCE_PATH}\*.html` SectionEnd Section "-Write Uinstaller" @@ -509,17 +510,21 @@ Section "Uninstall" Delete /REBOOTOK "$INSTDIR\LameXP-Portable.exe" Delete /REBOOTOK "$INSTDIR\LameXP.exe.sig" Delete /REBOOTOK "$INSTDIR\LameXP*" - Delete /REBOOTOK "$INSTDIR\Uninstall.exe" + Delete /REBOOTOK "$INSTDIR\Changelog.htm" Delete /REBOOTOK "$INSTDIR\Changelog.html" - Delete /REBOOTOK "$INSTDIR\Translate.html" + Delete /REBOOTOK "$INSTDIR\Contributors.txt" + Delete /REBOOTOK "$INSTDIR\Copying.txt" Delete /REBOOTOK "$INSTDIR\FAQ.html" Delete /REBOOTOK "$INSTDIR\Howto.html" - Delete /REBOOTOK "$INSTDIR\Copying.txt" + Delete /REBOOTOK "$INSTDIR\LameEnc.sys" Delete /REBOOTOK "$INSTDIR\License.txt" - Delete /REBOOTOK "$INSTDIR\Contributors.txt" + Delete /REBOOTOK "$INSTDIR\Readme.htm" Delete /REBOOTOK "$INSTDIR\ReadMe.txt" Delete /REBOOTOK "$INSTDIR\PRE_RELEASE_INFO.txt" + Delete /REBOOTOK "$INSTDIR\Settings.cfg" + Delete /REBOOTOK "$INSTDIR\Translate.html" + Delete /REBOOTOK "$INSTDIR\Uninstall.exe" RMDir "$INSTDIR" diff --git a/src/Config.h b/src/Config.h index 9ff46b26..babc01a3 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 5 #define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_PATCH 5 -#define VER_LAMEXP_BUILD 1046 +#define VER_LAMEXP_BUILD 1047 /////////////////////////////////////////////////////////////////////////////// // Tool versions (minimum expected versions!)