Updated deployment scripts.

diff --git a/etc/Deployment/_build.bat b/etc/Deployment/_build.bat
index 24eab90..f4effdc 100644 (file)
--- a/etc/Deployment/_build.bat
+++ b/etc/Deployment/_build.bat
@@ -7,7 +7,7 @@ echo ----------------------------------------------------------------
 call "%~dp0\_paths.bat"
 if not "%LAMEXP_ERROR%"=="0" GOTO:EOF
 REM -----------------------------------------------------------------
-call "%PATH_MSVC90%\VC\bin\vcvars32.bat" x86
+call "%PATH_MSCDIR%\VC\bin\vcvars32.bat" x86
 if exist "%PATH_QTMSVC%\bin\qtenv2.bat" call "%PATH_QTMSVC%\bin\qtenv2.bat"
 if exist "%PATH_QTMSVC%\bin\qtvars.bat" call "%PATH_QTMSVC%\bin\qtvars.bat"
 REM -----------------------------------------------------------------

diff --git a/etc/Deployment/_lupdate.bat b/etc/Deployment/_lupdate.bat
index 418a071..c9b7eb8 100644 (file)
--- a/etc/Deployment/_lupdate.bat
+++ b/etc/Deployment/_lupdate.bat
@@ -8,7 +8,7 @@ if not "%LAMEXP_ERROR%"=="0" GOTO:EOF
 REM -----------------------------------------------------------------
 set "LAMEXP_ERROR=1"
 REM -----------------------------------------------------------------
-call "%PATH_MSVC90%\VC\bin\vcvars32.bat" x86
+call "%PATH_MSCDIR%\VC\bin\vcvars32.bat" x86
 if exist "%PATH_QTMSVC%\bin\qtenv2.bat" call "%PATH_QTMSVC%\bin\qtenv2.bat"
 if exist "%PATH_QTMSVC%\bin\qtvars.bat" call "%PATH_QTMSVC%\bin\qtvars.bat"
 REM -----------------------------------------------------------------

diff --git a/etc/Deployment/_paths.bat b/etc/Deployment/_paths.bat
index fd6b2f9..948b124 100644 (file)
--- a/etc/Deployment/_paths.bat
+++ b/etc/Deployment/_paths.bat
@@ -2,10 +2,9 @@
 set "LAMEXP_ERROR=1"
 REM ------------------------------------------
 set "PATH_SEVENZ="
-set "PATH_MPRESS="
 set "PATH_UPXBIN="
 set "PATH_MKNSIS="
-set "PATH_MSVC90="
+set "PATH_MSCDIR="
 set "PATH_QTMSVC="
 set "PATH_GNUPG1="
 set "PATH_VCPROJ="
@@ -26,10 +25,9 @@ if not exist "%BUILDENV_TXT%" (
 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"
        if "%%s"=="PATH_MKNSIS" set "PATH_MKNSIS=%%~t"
-       if "%%s"=="PATH_MSVC90" set "PATH_MSVC90=%%~t"
+       if "%%s"=="PATH_MSCDIR" set "PATH_MSCDIR=%%~t"
        if "%%s"=="PATH_QTMSVC" set "PATH_QTMSVC=%%~t"
        if "%%s"=="PATH_GNUPG1" set "PATH_GNUPG1=%%~t"
        if "%%s"=="PATH_VCPROJ" set "PATH_VCPROJ=%%~t"
@@ -39,10 +37,9 @@ 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_MSCDIR = "%PATH_MSCDIR%"
 echo PATH_QTMSVC = "%PATH_QTMSVC%"
 echo PATH_GNUPG1 = "%PATH_GNUPG1%"
 echo PATH_VCPROJ = "%PATH_VCPROJ%"
@@ -51,11 +48,10 @@ REM ------------------------------------------
 set "LAMEXP_ERROR=1"
 REM ------------------------------------------
 if not exist "%PATH_SEVENZ%\7z.exe" GOTO:EOF
-if not exist "%PATH_MPRESS%\mpress.exe" GOTO:EOF
 if not exist "%PATH_UPXBIN%\upx.exe" GOTO:EOF
 if not exist "%PATH_MKNSIS%\makensis.exe" GOTO:EOF
-if not exist "%PATH_MSVC90%\VC\vcvarsall.bat" GOTO:EOF
-if not exist "%PATH_MSVC90%\VC\bin\cl.exe" GOTO:EOF
+if not exist "%PATH_MSCDIR%\VC\vcvarsall.bat" GOTO:EOF
+if not exist "%PATH_MSCDIR%\VC\bin\cl.exe" GOTO:EOF
 if not exist "%PATH_QTMSVC%\bin\uic.exe" GOTO:EOF
 if not exist "%PATH_QTMSVC%\bin\moc.exe" GOTO:EOF
 if not exist "%PATH_QTMSVC%\bin\rcc.exe" GOTO:EOF

diff --git a/etc/Deployment/buildenv.template.txt b/etc/Deployment/buildenv.template.txt
index b9bbb21..999b080 100644 (file)
--- a/etc/Deployment/buildenv.template.txt
+++ b/etc/Deployment/buildenv.template.txt
@@ -1,8 +1,7 @@
 #define PATH_SEVENZ "C:\Program Files\7-Zip"
-#define PATH_MPRESS "C:\Program Files\MPress"
 #define PATH_UPXBIN "C:\Program Files\UPX"
 #define PATH_MKNSIS "C:\Program Files\NSIS\Unicode"
-#define PATH_MSVC90 "C:\Program Files\Microsoft Visual Studio 9.0"
-#define PATH_QTMSVC "C:\QtSDK\Desktop\Qt\4.7.3\msvc2008"
+#define PATH_MSCDIR "C:\Program Files\Microsoft Visual Studio 11.0"
+#define PATH_QTMSVC "C:\QtSDK\Desktop\Qt\4.8.5\msvc2012"
 #define PATH_GNUPG1 "C:\Program Files\GNU\GnuPG"
-#define PATH_VCPROJ "LameXP_VS2008.sln"
+#define PATH_VCPROJ "LameXP_VS2012.sln"

diff --git a/etc/Translation/update.bat b/etc/Translation/update.bat
index 2e2f59e..871148d 100644 (file)
--- a/etc/Translation/update.bat
+++ b/etc/Translation/update.bat
@@ -1,33 +1,3 @@
 @echo off
-REM ---------------------------
-call "..\Deployment\_paths.bat"
-if exist "%PATH_QTMSVC%\bin\qtenv2.bat" call "%PATH_QTMSVC%\bin\qtenv2.bat"
-if exist "%PATH_QTMSVC%\bin\qtvars.bat" call "%PATH_QTMSVC%\bin\qtvars.bat"
-REM ---------------------------
-del update.lst > NUL
-REM ---------------------------
-if exist update.lst (
-       echo "Failed to delete old 'update.lst' file!"
-       pause
-       exit
-)
-echo ^<TS version="2.0" sourcelanguage="en"^>^</TS^> > Blank.ts
-REM ---------------------------
-for %%f in (..\..\gui\*.ui) do (
-       echo %%f >> update.lst
-)
-for %%f in (..\..\src\*.cpp) do (
-       echo %%f >> update.lst
-)
-for %%f in (..\..\src\*.h) do (
-       echo %%f >> update.lst
-)
-REM ---------------------------
-for %%f in (*.ts) do (
-       del %%f.bak 2> NUL
-       copy %%f %%f.bak
-       lupdate.exe @update.lst -no-obsolete -ts %%f
-)
-lupdate.exe @update.lst -no-obsolete -pluralonly -ts "LameXP_EN.ts"
-REM ---------------------------
+call "%~dp0..\Deployment\_lupdate.bat"
 pause