diff --git a/doc/PRE_RELEASE_INFO.txt b/doc/PRE_RELEASE_INFO.txt new file mode 100644 index 00000000..a1055908 --- /dev/null +++ b/doc/PRE_RELEASE_INFO.txt @@ -0,0 +1,10 @@ +LameXP Pre-Release Version +-------------------------- + +This pre-release version of LameXP is intended for testing and evaluation only. +We recommend to *not* use this version for production. Use it at your own risk! + +Note: This "test" version of LameXP will expire 30 days after the release date. +LameXP is free/libre software. The "stable" versions of LameXP do *not* expire! + +You have been warned ;-) diff --git a/etc/Deployment/_deploy.bat b/etc/Deployment/_deploy.bat index a6afcaf6..263f64c1 100644 --- a/etc/Deployment/_deploy.bat +++ b/etc/Deployment/_deploy.bat @@ -135,6 +135,11 @@ copy "%~dp0\..\..\doc\Changelog.html" "%TMP_PATH%" copy "%~dp0\..\..\doc\Translate.html" "%TMP_PATH%" copy "%~dp0\..\..\doc\Manual.html" "%TMP_PATH%" copy "%~dp0\..\..\doc\FAQ.html" "%TMP_PATH%" +if not "%VER_LAMEXP_TYPE%" == "Final" ( + if not "%VER_LAMEXP_TYPE%" == "Hotfix" ( + copy "%~dp0\..\..\doc\PRE_RELEASE_INFO.txt" "%TMP_PATH%" + ) +) REM ------------------------------------------ REM :: CREATE PACKAGES :: REM ------------------------------------------ diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi index 6983eeb0..a8671938 100644 --- a/etc/NSIS/setup.nsi +++ b/etc/NSIS/setup.nsi @@ -417,6 +417,7 @@ Section "!Install Files" 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\Settings.cfg" @@ -514,6 +515,7 @@ Section "Uninstall" Delete /REBOOTOK "$INSTDIR\License.txt" Delete /REBOOTOK "$INSTDIR\Contributors.txt" Delete /REBOOTOK "$INSTDIR\ReadMe.txt" + Delete /REBOOTOK "$INSTDIR\PRE_RELEASE_INFO.txt" RMDir "$INSTDIR" diff --git a/src/Config.h b/src/Config.h index e75f1c5f..9ff46b26 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 1044 +#define VER_LAMEXP_BUILD 1046 /////////////////////////////////////////////////////////////////////////////// // Tool versions (minimum expected versions!) diff --git a/src/Global.cpp b/src/Global.cpp index cdef70c8..e1c80164 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -1706,6 +1706,7 @@ const QStringList &lamexp_arguments(void) if(!g_lamexp_argv) { g_lamexp_argv = new QStringList(); + int nArgs = 0; LPWSTR *szArglist = CommandLineToArgvW(GetCommandLineW(), &nArgs); @@ -1719,7 +1720,7 @@ const QStringList &lamexp_arguments(void) } else { - qWarning("CommandLineToArgvW failed !!!"); + qWarning("CommandLineToArgvW() has failed !!!"); } }