Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Slightly tweak deployment script.

Browse Source
This commit is contained in:
LoRd_MuldeR 2011-04-21 20:35:03 +02:00
parent dd0369cfc0
commit 4b404e1b70
4 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
etc/Deployment/_date.bat
View File

@ -1,6 +1,13 @@
@echo off @echo off
set "DATE_TMP=%TEMP%\~date.%RANDOM%.tmp" set "ISO_DATE="
"%~dp0\_date.exe" +%%Y-%%m-%%d > "%DATE_TMP%" set "LAMEXP_ERROR=1"
set /p OUT_DATE= < "%DATE_TMP%" REM ------------------------------------------
del "%DATE_TMP%" if not exist "%~dp0\_date.exe" GOTO:EOF
set "DATE_TMP=" set "DATE_TEMP_FILE=%TEMP%\~date.%RANDOM%.tmp"
"%~dp0\_date.exe" +%%Y-%%m-%%d > "%DATE_TEMP_FILE%"
set /p "ISO_DATE=" < "%DATE_TEMP_FILE%"
del "%DATE_TEMP_FILE%"
set "DATE_TEMP_FILE="
echo BUILD DATE: %ISO_DATE%
REM ------------------------------------------
set "LAMEXP_ERROR=0"

15
etc/Deployment/_deploy.bat
View File

@ -19,12 +19,15 @@ REM ------------------------------------------
REM :: SETUP BUILD DATE :: REM :: SETUP BUILD DATE ::
REM ------------------------------------------ REM ------------------------------------------
call "%~dp0\_date.bat" call "%~dp0\_date.bat"
echo BUILD DATE: %OUT_DATE% if not "%LAMEXP_ERROR%"=="0" (
call "%~dp0\_error.bat" "FAILD TO SETUP BUILD-DATE"
GOTO:EOF
)
REM ------------------------------------------ REM ------------------------------------------
REM :: SETUP PATHS :: REM :: SETUP PATHS ::
REM ------------------------------------------ REM ------------------------------------------
set "OUT_PATH=%~dp0\..\..\bin\%LAMEXP_CONFIG%" set "OUT_PATH=%~dp0\..\..\bin\%LAMEXP_CONFIG%"
set "TMP_PATH=%TEMP%\~LameXP.%LAMEXP_CONFIG%.%OUT_DATE%.tmp" set "TMP_PATH=%TEMP%\~LameXP.%LAMEXP_CONFIG%.%ISO_DATE%.tmp"
set "OBJ_PATH=%~dp0\..\..\obj\%LAMEXP_CONFIG%" set "OBJ_PATH=%~dp0\..\..\obj\%LAMEXP_CONFIG%"
set "MOC_PATH=%~dp0\..\..\tmp" set "MOC_PATH=%~dp0\..\..\tmp"
set "IPC_PATH=%~dp0\..\..\ipch" set "IPC_PATH=%~dp0\..\..\ipch"
@ -69,10 +72,10 @@ if not "%LAMEXP_ERROR%"=="0" (
GOTO:EOF GOTO:EOF
) )
REM ------------------------------------------ REM ------------------------------------------
set "OUT_FILE=%OUT_PATH%\..\LameXP.%OUT_DATE%.%LAMEXP_CONFIG:_=-%.Build-%VER_LAMEXP_BUILD%" set "OUT_FILE=%OUT_PATH%\..\LameXP.%ISO_DATE%.%LAMEXP_CONFIG:_=-%.Build-%VER_LAMEXP_BUILD%"
for /L %%n in (1, 1, 99) do ( for /L %%n in (1, 1, 99) do (
if exist "!OUT_FILE!.exe" set "OUT_FILE=%OUT_PATH%\..\LameXP.%OUT_DATE%.%LAMEXP_CONFIG:_=-%.Build-%VER_LAMEXP_BUILD%.Update-%%n" if exist "!OUT_FILE!.exe" set "OUT_FILE=%OUT_PATH%\..\LameXP.%ISO_DATE%.%LAMEXP_CONFIG:_=-%.Build-%VER_LAMEXP_BUILD%.Update-%%n"
if exist "!OUT_FILE!.zip" set "OUT_FILE=%OUT_PATH%\..\LameXP.%OUT_DATE%.%LAMEXP_CONFIG:_=-%.Build-%VER_LAMEXP_BUILD%.Update-%%n" if exist "!OUT_FILE!.zip" set "OUT_FILE=%OUT_PATH%\..\LameXP.%ISO_DATE%.%LAMEXP_CONFIG:_=-%.Build-%VER_LAMEXP_BUILD%.Update-%%n"
) )
REM ------------------------------------------ REM ------------------------------------------
REM :: DELETE OLD OUTPUT FILE :: REM :: DELETE OLD OUTPUT FILE ::
@ -127,7 +130,7 @@ REM ------------------------------------------
REM :: CREATE PACKAGES :: REM :: CREATE PACKAGES ::
REM ------------------------------------------ REM ------------------------------------------
"%PATH_SEVENZ%\7z.exe" a -tzip -r "%OUT_FILE%.zip" "%TMP_PATH%\*" "%PATH_SEVENZ%\7z.exe" a -tzip -r "%OUT_FILE%.zip" "%TMP_PATH%\*"
"%PATH_MKNSIS%\makensis.exe" "/DLAMEXP_SOURCE_PATH=%TMP_PATH%" "/DLAMEXP_OUTPUT_FILE=%OUT_FILE%.exe" "/DLAMEXP_UPX_PATH=%PATH_UPXBIN%" "/DLAMEXP_DATE=%OUT_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%" "%~dp0\..\NSIS\setup.nsi" "%PATH_MKNSIS%\makensis.exe" "/DLAMEXP_SOURCE_PATH=%TMP_PATH%" "/DLAMEXP_OUTPUT_FILE=%OUT_FILE%.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%" "%~dp0\..\NSIS\setup.nsi"
rd /S /Q "%TMP_PATH%" rd /S /Q "%TMP_PATH%"
REM ------------------------------------------ REM ------------------------------------------
if not exist "%OUT_FILE%.zip" ( if not exist "%OUT_FILE%.zip" (

6
etc/Deployment/_lupdate.bat
View File

@ -5,12 +5,16 @@ echo Updating Translation files
echo ---------------------------------------------------------------- echo ----------------------------------------------------------------
call "%~dp0\_paths.bat" call "%~dp0\_paths.bat"
if not "%LAMEXP_ERROR%"=="0" GOTO:EOF if not "%LAMEXP_ERROR%"=="0" GOTO:EOF
call "%~dp0\_date.bat"
if not "%LAMEXP_ERROR%"=="0" GOTO:EOF
REM -----------------------------------------------------------------
set "LAMEXP_ERROR=1"
REM ----------------------------------------------------------------- REM -----------------------------------------------------------------
call "%PATH_MSVC90%\VC\bin\vcvars32.bat" x86 call "%PATH_MSVC90%\VC\bin\vcvars32.bat" x86
call "%PATH_QTMSVC%\bin\qtenv2.bat" call "%PATH_QTMSVC%\bin\qtenv2.bat"
REM ----------------------------------------------------------------- REM -----------------------------------------------------------------
set "LAMEXP_ERROR=1" set "LAMEXP_ERROR=1"
set "LST_FILE=%TEMP%\~list.%DATE:~6,4%-%DATE:~3,2%-%DATE:~0,2%.lst" set "LST_FILE=%TEMP%\~list.%ISO_DATE%.lst"
echo %LST_FILE% echo %LST_FILE%
REM ----------------------------------------------------------------- REM -----------------------------------------------------------------
del "%LST_FILE%" 2> NUL del "%LST_FILE%" 2> NUL

2
src/Config.h
View File

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 2 #define VER_LAMEXP_MINOR_LO 2
#define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 6 #define VER_LAMEXP_PATCH 6
#define VER_LAMEXP_BUILD 453 #define VER_LAMEXP_BUILD 455
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Tools versions // Tools versions