From db788a2880e4a3577ee2a6f67918a15276d0c63b Mon Sep 17 00:00:00 2001
From: lordmulder <mulder2@gmx.de>
Date: Thu, 14 Apr 2011 02:21:46 +0200
Subject: [PATCH] Fix installer after recent macro changes.

---
 etc/Deployment/_deploy.bat  |  2 +-
 etc/Deployment/_version.bat | 11 +++++++----
 etc/NSIS/setup.nsi          | 12 +++++++-----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/etc/Deployment/_deploy.bat b/etc/Deployment/_deploy.bat
index 4fb8c3cb..d95dfb0f 100644
--- a/etc/Deployment/_deploy.bat
+++ b/etc/Deployment/_deploy.bat
@@ -114,7 +114,7 @@ REM ------------------------------------------
 REM :: CREATE PACKAGES ::
 REM ------------------------------------------
 "%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%"
 REM ------------------------------------------
 if not exist "%OUT_FILE%.zip" (
diff --git a/etc/Deployment/_version.bat b/etc/Deployment/_version.bat
index bb2add14..5c78a6dd 100644
--- a/etc/Deployment/_version.bat
+++ b/etc/Deployment/_version.bat
@@ -5,14 +5,16 @@ set "VER_LAMEXP_MAJOR="
 set "VER_LAMEXP_MINOR_HI="
 set "VER_LAMEXP_MINOR_LO="
 set "VER_LAMEXP_BUILD="
-set "VER_LAMEXP_SUFFIX="
+set "VER_LAMEXP_TYPE="
+set "VER_LAMEXP_PATCH="
 REM ------------------------------------------
 for /f "tokens=2,*" %%s in (..\..\src\Config.h) do (
 	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_LO" set "VER_LAMEXP_MINOR_LO=%%~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 ------------------------------------------
 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_LO%"=="" 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 ------------------------------------------
 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.
 REM ------------------------------------------
 set "LAMEXP_ERROR=0"
diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi
index 7e661bfe..d52a7b4f 100644
--- a/etc/NSIS/setup.nsi
+++ b/etc/NSIS/setup.nsi
@@ -29,8 +29,11 @@
 !ifndef LAMEXP_BUILD
   !error "LAMEXP_BUILD is not defined !!!"
 !endif
-!ifndef LAMEXP_SUFFIX
-  !error "LAMEXP_SUFFIX is not defined !!!"
+!ifndef LAMEXP_INSTTYPE
+  !error "LAMEXP_INSTTYPE is not defined !!!"
+!endif
+!ifndef LAMEXP_PATCH
+  !error "LAMEXP_PATCH is not defined !!!"
 !endif
 !ifndef LAMEXP_DATE
   !error "LAMEXP_DATE is not defined !!!"
@@ -57,7 +60,6 @@
 ;--------------------------------
 
 !define LAMEXP_IS_PRERELEASE
-!searchparse '${LAMEXP_SUFFIX}' '' LAMEXP_INSTTYPE '-' LAMEXP_IGNORE
 
 !if '${LAMEXP_INSTTYPE}' == 'Final'
   !undef LAMEXP_IS_PRERELEASE
@@ -84,7 +86,7 @@
 RequestExecutionLevel user
 ShowInstDetails 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}"
 BrandingText "Date created: ${LAMEXP_DATE} [Build #${LAMEXP_BUILD}]"
 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 "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 "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 "LegalCopyright" "Copyright 2004-2011 LoRd_MuldeR"
 VIAddVersionKey "LegalTrademarks" "GNU"