OSDN Git Service

Slightly tweak deployment script.
authorlordmulder <mulder2@gmx.de>
Fri, 22 Apr 2011 20:10:55 +0000 (22:10 +0200)
committerlordmulder <mulder2@gmx.de>
Fri, 22 Apr 2011 20:10:55 +0000 (22:10 +0200)
etc/Deployment/_date.bat
etc/Deployment/_deploy.bat
etc/Deployment/_lupdate.bat
etc/Deployment/_paths.bat
src/Config.h

index 44ca5f5..15e7d47 100644 (file)
@@ -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%"
index 8e966e7..6ab6da2 100644 (file)
@@ -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"
index a564d9f..e35755f 100644 (file)
@@ -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
index 63d4697..7ef0898 100644 (file)
@@ -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"
index 610d91a..ddc0e10 100644 (file)
@@ -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