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

Fix installer after recent macro changes.

Browse Source
This commit is contained in:
LoRd_MuldeR 2011-04-14 02:21:46 +02:00
parent 26fe0b0499
commit db788a2880
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/Deployment/_deploy.bat
View File

@ -114,7 +114,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_SUFFIX=%VER_LAMEXP_SUFFIX%" "..\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=%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%" "..\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" (

11
etc/Deployment/_version.bat
View File

@ -5,14 +5,16 @@ set "VER_LAMEXP_MAJOR="
set "VER_LAMEXP_MINOR_HI=" set "VER_LAMEXP_MINOR_HI="
set "VER_LAMEXP_MINOR_LO=" set "VER_LAMEXP_MINOR_LO="
set "VER_LAMEXP_BUILD=" set "VER_LAMEXP_BUILD="
set "VER_LAMEXP_SUFFIX=" set "VER_LAMEXP_TYPE="
set "VER_LAMEXP_PATCH="
REM ------------------------------------------ REM ------------------------------------------
for /f "tokens=2,*" %%s in (..\..\src\Config.h) do ( for /f "tokens=2,*" %%s in (..\..\src\Config.h) do (
if "%%s"=="VER_LAMEXP_MAJOR" set "VER_LAMEXP_MAJOR=%%~t" if "%%s"=="VER_LAMEXP_MAJOR" set "VER_LAMEXP_MAJOR=%%~t"
if "%%s"=="VER_LAMEXP_MINOR_HI" set "VER_LAMEXP_MINOR_HI=%%~t" if "%%s"=="VER_LAMEXP_MINOR_HI" set "VER_LAMEXP_MINOR_HI=%%~t"
if "%%s"=="VER_LAMEXP_MINOR_LO" set "VER_LAMEXP_MINOR_LO=%%~t" if "%%s"=="VER_LAMEXP_MINOR_LO" set "VER_LAMEXP_MINOR_LO=%%~t"
if "%%s"=="VER_LAMEXP_BUILD" set "VER_LAMEXP_BUILD=%%~t" if "%%s"=="VER_LAMEXP_BUILD" set "VER_LAMEXP_BUILD=%%~t"
if "%%s"=="VER_LAMEXP_SUFFIX" set "VER_LAMEXP_SUFFIX=%%~t" if "%%s"=="VER_LAMEXP_TYPE" set "VER_LAMEXP_TYPE=%%~t"
if "%%s"=="VER_LAMEXP_PATCH" set "VER_LAMEXP_PATCH=%%~t"
) )
REM ------------------------------------------ REM ------------------------------------------
set "LAMEXP_ERROR=1" set "LAMEXP_ERROR=1"
@ -20,10 +22,11 @@ if "%VER_LAMEXP_MAJOR%"=="" GOTO:EOF
if "%VER_LAMEXP_MINOR_HI%"=="" GOTO:EOF if "%VER_LAMEXP_MINOR_HI%"=="" GOTO:EOF
if "%VER_LAMEXP_MINOR_LO%"=="" GOTO:EOF if "%VER_LAMEXP_MINOR_LO%"=="" GOTO:EOF
if "%VER_LAMEXP_BUILD%"=="" GOTO:EOF if "%VER_LAMEXP_BUILD%"=="" GOTO:EOF
if "%VER_LAMEXP_SUFFIX%"=="" GOTO:EOF if "%VER_LAMEXP_TYPE%"=="" GOTO:EOF
if "%VER_LAMEXP_PATCH%"=="" GOTO:EOF
REM ------------------------------------------ REM ------------------------------------------
echo LameXP Version: echo LameXP Version:
echo %VER_LAMEXP_MAJOR%.%VER_LAMEXP_MINOR_HI%%VER_LAMEXP_MINOR_LO%, Build #%VER_LAMEXP_BUILD% (%VER_LAMEXP_SUFFIX%) echo %VER_LAMEXP_MAJOR%.%VER_LAMEXP_MINOR_HI%%VER_LAMEXP_MINOR_LO%, Build #%VER_LAMEXP_BUILD% (%VER_LAMEXP_TYPE%-%VER_LAMEXP_PATCH%)
echo. echo.
REM ------------------------------------------ REM ------------------------------------------
set "LAMEXP_ERROR=0" set "LAMEXP_ERROR=0"

12
etc/NSIS/setup.nsi
View File

@ -29,8 +29,11 @@
!ifndef LAMEXP_BUILD !ifndef LAMEXP_BUILD
!error "LAMEXP_BUILD is not defined !!!" !error "LAMEXP_BUILD is not defined !!!"
!endif !endif
!ifndef LAMEXP_SUFFIX !ifndef LAMEXP_INSTTYPE
!error "LAMEXP_SUFFIX is not defined !!!" !error "LAMEXP_INSTTYPE is not defined !!!"
!endif
!ifndef LAMEXP_PATCH
!error "LAMEXP_PATCH is not defined !!!"
!endif !endif
!ifndef LAMEXP_DATE !ifndef LAMEXP_DATE
!error "LAMEXP_DATE is not defined !!!" !error "LAMEXP_DATE is not defined !!!"
@ -57,7 +60,6 @@
;-------------------------------- ;--------------------------------
!define LAMEXP_IS_PRERELEASE !define LAMEXP_IS_PRERELEASE
!searchparse '${LAMEXP_SUFFIX}' '' LAMEXP_INSTTYPE '-' LAMEXP_IGNORE
!if '${LAMEXP_INSTTYPE}' == 'Final' !if '${LAMEXP_INSTTYPE}' == 'Final'
!undef LAMEXP_IS_PRERELEASE !undef LAMEXP_IS_PRERELEASE
@ -84,7 +86,7 @@
RequestExecutionLevel user RequestExecutionLevel user
ShowInstDetails show ShowInstDetails show
ShowUninstDetails show ShowUninstDetails show
Name "LameXP v${LAMEXP_VERSION} ${LAMEXP_SUFFIX} [Build #${LAMEXP_BUILD}]" Name "LameXP v${LAMEXP_VERSION} ${LAMEXP_INSTTYPE}-${LAMEXP_PATCH} [Build #${LAMEXP_BUILD}]"
OutFile "${LAMEXP_OUTPUT_FILE}" OutFile "${LAMEXP_OUTPUT_FILE}"
BrandingText "Date created: ${LAMEXP_DATE} [Build #${LAMEXP_BUILD}]" BrandingText "Date created: ${LAMEXP_DATE} [Build #${LAMEXP_BUILD}]"
InstallDir "$PROGRAMFILES\MuldeR\LameXP v${LAMEXP_VERSION}" InstallDir "$PROGRAMFILES\MuldeR\LameXP v${LAMEXP_VERSION}"
@ -129,7 +131,7 @@ VIProductVersion "${PRODUCT_VERSION_DATE}.${LAMEXP_BUILD}"
VIAddVersionKey "Author" "LoRd_MuldeR <mulder2@gmx.de>" VIAddVersionKey "Author" "LoRd_MuldeR <mulder2@gmx.de>"
VIAddVersionKey "Comments" "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version." VIAddVersionKey "Comments" "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
VIAddVersionKey "CompanyName" "Free Software Foundation" VIAddVersionKey "CompanyName" "Free Software Foundation"
VIAddVersionKey "FileDescription" "LameXP v${LAMEXP_VERSION} ${LAMEXP_SUFFIX} [Build #${LAMEXP_BUILD}]" VIAddVersionKey "FileDescription" "LameXP v${LAMEXP_VERSION} ${LAMEXP_INSTTYPE}-${LAMEXP_PATCH} [Build #${LAMEXP_BUILD}]"
VIAddVersionKey "FileVersion" "${PRODUCT_VERSION_DATE}.${LAMEXP_BUILD} (${LAMEXP_VERSION})" VIAddVersionKey "FileVersion" "${PRODUCT_VERSION_DATE}.${LAMEXP_BUILD} (${LAMEXP_VERSION})"
VIAddVersionKey "LegalCopyright" "Copyright 2004-2011 LoRd_MuldeR" VIAddVersionKey "LegalCopyright" "Copyright 2004-2011 LoRd_MuldeR"
VIAddVersionKey "LegalTrademarks" "GNU" VIAddVersionKey "LegalTrademarks" "GNU"