diff --git a/etc/Deployment/_date.bat b/etc/Deployment/_date.bat index 44ca5f59..15e7d472 100644 --- a/etc/Deployment/_date.bat +++ b/etc/Deployment/_date.bat @@ -3,7 +3,7 @@ set "ISO_DATE=" set "LAMEXP_ERROR=1" REM ------------------------------------------ if not exist "%~dp0\_date.exe" GOTO:EOF -set "DATE_TEMP_FILE=%TEMP%\~date.%RANDOM%.tmp" +set "DATE_TEMP_FILE=%TEMP%\~date.%RANDOM%%RANDOM%.tmp" "%~dp0\_date.exe" +%%Y-%%m-%%d > "%DATE_TEMP_FILE%" set /p "ISO_DATE=" < "%DATE_TEMP_FILE%" del "%DATE_TEMP_FILE%" diff --git a/etc/Deployment/_deploy.bat b/etc/Deployment/_deploy.bat index 8e966e7d..6ab6da2c 100644 --- a/etc/Deployment/_deploy.bat +++ b/etc/Deployment/_deploy.bat @@ -27,7 +27,7 @@ REM ------------------------------------------ REM :: SETUP PATHS :: REM ------------------------------------------ set "OUT_PATH=%~dp0\..\..\bin\%LAMEXP_CONFIG%" -set "TMP_PATH=%TEMP%\~LameXP.%LAMEXP_CONFIG%.%ISO_DATE%.tmp" +set "TMP_PATH=%TEMP%\~LameXP.%LAMEXP_CONFIG%.%ISO_DATE%.%RANDOM%.tmp" set "OBJ_PATH=%~dp0\..\..\obj\%LAMEXP_CONFIG%" set "MOC_PATH=%~dp0\..\..\tmp" set "IPC_PATH=%~dp0\..\..\ipch" diff --git a/etc/Deployment/_lupdate.bat b/etc/Deployment/_lupdate.bat index a564d9fa..e35755f1 100644 --- a/etc/Deployment/_lupdate.bat +++ b/etc/Deployment/_lupdate.bat @@ -5,8 +5,6 @@ echo Updating Translation files echo ---------------------------------------------------------------- call "%~dp0\_paths.bat" if not "%LAMEXP_ERROR%"=="0" GOTO:EOF -call "%~dp0\_date.bat" -if not "%LAMEXP_ERROR%"=="0" GOTO:EOF REM ----------------------------------------------------------------- set "LAMEXP_ERROR=1" REM ----------------------------------------------------------------- @@ -14,7 +12,7 @@ call "%PATH_MSVC90%\VC\bin\vcvars32.bat" x86 call "%PATH_QTMSVC%\bin\qtenv2.bat" REM ----------------------------------------------------------------- set "LAMEXP_ERROR=1" -set "LST_FILE=%TEMP%\~list.%ISO_DATE%.lst" +set "LST_FILE=%TEMP%\~list.%RANDOM%%RANDOM%.tmp" echo %LST_FILE% REM ----------------------------------------------------------------- del "%LST_FILE%" 2> NUL diff --git a/etc/Deployment/_paths.bat b/etc/Deployment/_paths.bat index 63d46979..7ef0898f 100644 --- a/etc/Deployment/_paths.bat +++ b/etc/Deployment/_paths.bat @@ -38,14 +38,14 @@ REM ------------------------------------------ set "BUILDENV_TXT=" REM ------------------------------------------ echo === BEGIN PATHS === -echo PATH_SEVENZ ="%PATH_SEVENZ%" -echo PATH_MPRESS ="%PATH_MPRESS%" -echo PATH_UPXBIN ="%PATH_UPXBIN%" -echo PATH_MKNSIS ="%PATH_MKNSIS%" -echo PATH_MSVC90 ="%PATH_MSVC90%" -echo PATH_QTMSVC ="%PATH_QTMSVC%" -echo PATH_GNUPG1 ="%PATH_GNUPG1%" -echo PATH_VCPROJ ="%PATH_VCPROJ%" +echo PATH_SEVENZ = "%PATH_SEVENZ%" +echo PATH_MPRESS = "%PATH_MPRESS%" +echo PATH_UPXBIN = "%PATH_UPXBIN%" +echo PATH_MKNSIS = "%PATH_MKNSIS%" +echo PATH_MSVC90 = "%PATH_MSVC90%" +echo PATH_QTMSVC = "%PATH_QTMSVC%" +echo PATH_GNUPG1 = "%PATH_GNUPG1%" +echo PATH_VCPROJ = "%PATH_VCPROJ%" echo === END PATHS === REM ------------------------------------------ set "LAMEXP_ERROR=1" diff --git a/src/Config.h b/src/Config.h index 610d91a9..ddc0e10e 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 2 #define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_PATCH 6 -#define VER_LAMEXP_BUILD 455 +#define VER_LAMEXP_BUILD 457 /////////////////////////////////////////////////////////////////////////////// // Tools versions