From 1a7b25f8cedd1b21f8fa637d83839f4384d1a6a2 Mon Sep 17 00:00:00 2001
From: lordmulder <mulder2@gmx.de>
Date: Sun, 10 Apr 2011 01:10:41 +0200
Subject: [PATCH] Make "buildenv.txt" file more portable.

---
 etc/Deployment/_paths.bat                      | 18 +++++++++++++++++-
 .../{buildenv.txt => buildenv.template.txt}    |  0
 etc/Translation/release.bat                    |  5 ++---
 etc/Translation/update.bat                     |  4 ++--
 4 files changed, 21 insertions(+), 6 deletions(-)
 rename etc/Deployment/{buildenv.txt => buildenv.template.txt} (100%)

diff --git a/etc/Deployment/_paths.bat b/etc/Deployment/_paths.bat
index 9169b468..8d90a7dd 100644
--- a/etc/Deployment/_paths.bat
+++ b/etc/Deployment/_paths.bat
@@ -10,7 +10,21 @@ set "PATH_QTMSVC="
 set "PATH_GNUPG1="
 set "PATH_VCPROJ="
 REM ------------------------------------------
-for /f "tokens=2,*" %%s in (buildenv.txt) do (
+set "BUILDENV_TXT=buildenv.txt"
+if not "%~1"=="" (
+	set "BUILDENV_TXT=%~1"
+)
+REM ------------------------------------------
+if not exist "%BUILDENV_TXT%" (
+	echo.
+	echo Could not find 'buildenv.txt' in current directory^!
+	echo Please create your 'buildenv.txt' file from 'buildenv.template.txt' first.
+	echo.
+	pause
+	exit
+)
+REM ------------------------------------------
+for /f "tokens=2,*" %%s in (%BUILDENV_TXT%) do (
 	if "%%s"=="PATH_SEVENZ" set "PATH_SEVENZ=%%~t"
 	if "%%s"=="PATH_MPRESS" set "PATH_MPRESS=%%~t"
 	if "%%s"=="PATH_UPXBIN" set "PATH_UPXBIN=%%~t"
@@ -21,6 +35,8 @@ for /f "tokens=2,*" %%s in (buildenv.txt) do (
 	if "%%s"=="PATH_VCPROJ" set "PATH_VCPROJ=%%~t"
 )
 REM ------------------------------------------
+set "BUILDENV_TXT="
+REM ------------------------------------------
 echo PATH_SEVENZ ="%PATH_SEVENZ%"
 echo PATH_MPRESS ="%PATH_MPRESS%"
 echo PATH_UPXBIN ="%PATH_UPXBIN%"
diff --git a/etc/Deployment/buildenv.txt b/etc/Deployment/buildenv.template.txt
similarity index 100%
rename from etc/Deployment/buildenv.txt
rename to etc/Deployment/buildenv.template.txt
diff --git a/etc/Translation/release.bat b/etc/Translation/release.bat
index 7dd9a0cc..b6bb3344 100644
--- a/etc/Translation/release.bat
+++ b/etc/Translation/release.bat
@@ -1,8 +1,7 @@
 @echo off
 REM ---------------------------
-set "QTVARS=E:\Qt\4.7.2\bin\qtvars.bat"
-REM ---------------------------
-call "%QTVARS%"
+call "..\Deployment\_paths.bat" "..\Deployment\buildenv.txt"
+call "%PATH_QTMSVC%\bin\qtvars.bat"
 REM ---------------------------
 for %%f in (LameXP_??.ts) do (
 	lrelease.exe %%f -qm ..\..\res\localization\%%~nf.qm
diff --git a/etc/Translation/update.bat b/etc/Translation/update.bat
index 39978477..0eae3fa7 100644
--- a/etc/Translation/update.bat
+++ b/etc/Translation/update.bat
@@ -1,8 +1,8 @@
 @echo off
 REM ---------------------------
-set "QTVARS=E:\Qt\4.7.2\bin\qtvars.bat"
+call "..\Deployment\_paths.bat" "..\Deployment\buildenv.txt"
+call "%PATH_QTMSVC%\bin\qtvars.bat"
 REM ---------------------------
-call "%QTVARS%"
 del update.lst > NUL
 REM ---------------------------
 if exist update.lst (