Some Makefile improvements.

diff --git a/etc/Deployment/_copy.bat b/etc/Deployment/_copy.bat
new file mode 100644 (file)
index 0000000..3de0033
--- /dev/null
+++ b/etc/Deployment/_copy.bat
@@ -0,0 +1,21 @@
+@echo off
+
+:: ---------------------------------------------------------------------------
+:: COPY FILE
+:: ---------------------------------------------------------------------------
+
+set "CP_SRC=%~1"
+set "CP_DST=%~2"
+
+"%~dp0\..\..\..\Prerequisites\CEcho\cecho.exe" white "copy \"%CP_SRC:\=\\%\" to \"%CP_DST:\=\\%\""
+
+if not exist "%~1" (
+       "%~dp0\..\..\..\Prerequisites\CEcho\cecho.exe" red "\nCopy failed: Source file \"%CP_SRC:\=\\%\" not found!\n"
+       pause && exit
+)
+
+copy "%CP_SRC%" "%CP_DST%"
+if not "%ERRORLEVEL%" == "0" (
+       "%~dp0\..\..\..\Prerequisites\CEcho\cecho.exe" red "\nCopy failed: Operation faild with error code %ERRORLEVEL%!\n"
+       pause && exit
+)

diff --git a/etc/Deployment/make.bat b/etc/Deployment/make.bat
index fafba90..941a98f 100644 (file)
--- a/etc/Deployment/make.bat
+++ b/etc/Deployment/make.bat
@@ -102,19 +102,21 @@ for %%i in (exe,sfx,zip,txt) do (
 rd /S /Q "%TMP_PATH%" 2> NUL
 mkdir "%TMP_PATH%"
 
-copy "%BIN_PATH%\LameXP.exe" "%TMP_PATH%"
+call "%~dp0\_copy.bat" "%BIN_PATH%\LameXP.exe" "%TMP_PATH%"
+
 if "%LAMEXP_REDIST%"=="1" (
-       copy "%BIN_PATH%\MUtils32-?.dll" "%TMP_PATH%"
+       call "%~dp0\_copy.bat" "%BIN_PATH%\LameXP.rcc" "%TMP_PATH%"
+       call "%~dp0\_copy.bat" "%BIN_PATH%\MUtils32-?.dll" "%TMP_PATH%"
        mkdir "%TMP_PATH%\imageformats"
        for %%i in (Core,Gui,Network,Xml,Svg) do (
-               copy "%~dp0\..\..\..\Prerequisites\Qt4\v%PATH_VCTOOL%_xp\Shared\bin\Qt%%i4.dll" "%TMP_PATH%"
+               call "%~dp0\_copy.bat" "%~dp0\..\..\..\Prerequisites\Qt4\v%PATH_VCTOOL%_xp\Shared\bin\Qt%%i4.dll" "%TMP_PATH%"
        )
        for %%i in (gif,ico,jpeg,mng,svg,tga,tiff) do (
-               copy "%~dp0\..\..\..\Prerequisites\Qt4\v%PATH_VCTOOL%_xp\Shared\plugins\imageformats\q%%i4.dll" "%TMP_PATH%\imageformats"
+               call "%~dp0\_copy.bat" "%~dp0\..\..\..\Prerequisites\Qt4\v%PATH_VCTOOL%_xp\Shared\plugins\imageformats\q%%i4.dll" "%TMP_PATH%\imageformats"
        )
-       copy "%~dp0\..\..\..\Prerequisites\MSVC\redist\vc\v%PATH_VCTOOL%_xp\x86\*.dll" "%TMP_PATH%"
+       call "%~dp0\_copy.bat" "%~dp0\..\..\..\Prerequisites\MSVC\redist\vc\v%PATH_VCTOOL%_xp\x86\*.dll" "%TMP_PATH%"
        if %PATH_VCTOOL% GEQ 140 (
-               copy "%~dp0\..\..\..\Prerequisites\MSVC\redist\ucrt\DLLs\x86\*.dll" "%TMP_PATH%"
+               call "%~dp0\_copy.bat" "%~dp0\..\..\..\Prerequisites\MSVC\redist\ucrt\DLLs\x86\*.dll" "%TMP_PATH%"
        )
 )
 
@@ -126,20 +128,19 @@ for %%e in (LameXP,Qt,MUtils) do (
        )
 )
 
-copy "%~dp0\..\..\ReadMe.txt"           "%TMP_PATH%"
-copy "%~dp0\..\..\License.txt"          "%TMP_PATH%"
-copy "%~dp0\..\..\Copying.txt"          "%TMP_PATH%"
-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%"
+call "%~dp0\_copy.bat" "%~dp0\..\..\ReadMe.txt"           "%TMP_PATH%"
+call "%~dp0\_copy.bat" "%~dp0\..\..\License.txt"          "%TMP_PATH%"
+call "%~dp0\_copy.bat" "%~dp0\..\..\Copying.txt"          "%TMP_PATH%"
+call "%~dp0\_copy.bat" "%~dp0\..\..\doc\Changelog.html"   "%TMP_PATH%"
+call "%~dp0\_copy.bat" "%~dp0\..\..\doc\Translate.html"   "%TMP_PATH%"
+call "%~dp0\_copy.bat" "%~dp0\..\..\doc\Manual.html"      "%TMP_PATH%"
 
 mkdir "%TMP_PATH%\img\lamexp"
-copy "%~dp0\..\..\doc\img\lamexp\*.png" "%TMP_PATH%\img\lamexp"
+call "%~dp0\_copy.bat" "%~dp0\..\..\doc\img\lamexp\*.png" "%TMP_PATH%\img\lamexp"
 
 if not "%VER_LAMEXP_TYPE%" == "Final" (
        if not "%VER_LAMEXP_TYPE%" == "Hotfix" (
-               copy "%~dp0\..\..\doc\PRE_RELEASE_INFO.txt" "%TMP_PATH%"
+               call "%~dp0\_copy.bat" "%~dp0\..\..\doc\PRE_RELEASE_INFO.txt" "%TMP_PATH%"
        )
 )
 

diff --git a/src/Config.h b/src/Config.h
index 4808489..424af7a 100644 (file)
--- a/src/Config.h
+++ b/src/Config.h
@@ -35,7 +35,7 @@
 #define VER_LAMEXP_MINOR_LO                                    6
 #define VER_LAMEXP_TYPE                                                Alpha
 #define VER_LAMEXP_PATCH                                       3
-#define VER_LAMEXP_BUILD                                       2010
+#define VER_LAMEXP_BUILD                                       2012
 #define VER_LAMEXP_CONFG                                       2002
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/src/Global_Tools.cpp b/src/Global_Tools.cpp
index 3c8756d..db9623e 100644 (file)
--- a/src/Global_Tools.cpp
+++ b/src/Global_Tools.cpp
@@ -208,8 +208,13 @@ void lamexp_initialize_resources(void)
 #endif //!QT_NODLL
 
        //Make sure resources are accessible!
-       if (!QResource(":/images/Logo.png").isValid())
+       static const char *const RESOURCES[] = { ":/images/Logo.png", ":/tools/lame.x86-i686.exe", NULL };
+       for (size_t i = 0U; RESOURCES[i]; ++i)
        {
-               qFatal("Qt resource system initialization has failed!");
+               QResource resourceCheck(QString::fromLatin1(RESOURCES[i]));
+               if ((!resourceCheck.isValid()) || (resourceCheck.size() <= 0))
+               {
+                       qFatal("Qt resource system initialization has failed:\nResource \"%s\" not found!", RESOURCES[i]);
+               }
        }
 }