Some more updates of the deployment scripts.

diff --git a/etc/Deployment/_build.bat b/etc/Deployment/_build.bat
index 70d34cd..1f2c270 100644 (file)
--- a/etc/Deployment/_build.bat
+++ b/etc/Deployment/_build.bat
@@ -26,19 +26,19 @@ if exist "%PATH_QTMSVC%\bin\qtvars.bat" (
 :: BUILD THE PROJECT
 :: ---------------------------------------------------------------------------
 
-msbuild.exe /property:Configuration=%2 /property:Platform=Win32 /target:Clean   /verbosity:normal %1
+msbuild.exe /property:Configuration=%3 /property:Platform=%2 /target:Clean   /verbosity:normal "%~1"
 if not "%ERRORLEVEL%"=="0" (
        echo. && echo Build process has failed!
        echo. && pause && exit
 )
 
-msbuild.exe /property:Configuration=%2 /property:Platform=Win32 /target:Rebuild /verbosity:normal %1
+msbuild.exe /property:Configuration=%3 /property:Platform=%2 /target:Rebuild /verbosity:normal "%~1"
 if not "%ERRORLEVEL%"=="0" (
        echo. && echo Build process has failed!
        echo. && pause && exit
 )
 
-msbuild.exe /property:Configuration=%2 /property:Platform=Win32 /target:Build   /verbosity:normal %1
+msbuild.exe /property:Configuration=%3 /property:Platform=%2 /target:Build   /verbosity:normal "%~1"
 if not "%ERRORLEVEL%"=="0" (
        echo. && echo Build process has failed!
        echo. && pause && exit

diff --git a/etc/Deployment/_deploy.bat b/etc/Deployment/_deploy.bat
index 800636d..7e1212d 100644 (file)
--- a/etc/Deployment/_deploy.bat
+++ b/etc/Deployment/_deploy.bat
@@ -14,6 +14,10 @@ if "%LAMEXP_CONFIG%"=="" (
        set "LAMEXP_CONFIG=Release"
 )
 
+if "%LAMEXP_PLATFORM%"=="" (
+       set "LAMEXP_PLATFORM=Win32"
+)
+
 if not "%LAMEXP_REDIST%"=="0" (
        set "LAMEXP_REDIST=1"
 )
@@ -22,11 +26,8 @@ if not "%LAMEXP_REDIST%"=="0" (
 :: SETUP PATHS
 :: ---------------------------------------------------------------------------
 
-set "OUT_PATH=%~dp0\..\..\bin\%LAMEXP_CONFIG%"
+set "BIN_PATH=%~dp0\..\..\bin\%LAMEXP_PLATFORM%\%LAMEXP_CONFIG%"
 set "TMP_PATH=%TEMP%\~LameXP.%LAMEXP_CONFIG%.%ISO_DATE%.%RANDOM%.tmp"
-set "OBJ_PATH=%~dp0\..\..\obj\%LAMEXP_CONFIG%"
-set "MOC_PATH=%~dp0\..\..\tmp"
-set "IPC_PATH=%~dp0\..\..\ipch"
 
 if "%LAMEXP_SKIP_BUILD%"=="YES" (
        goto SkipBuildThisTime
@@ -36,20 +37,15 @@ if "%LAMEXP_SKIP_BUILD%"=="YES" (
 :: CLEAN UP
 :: ---------------------------------------------------------------------------
 
-del /Q "%OUT_PATH%\*.exe"
-del /Q "%OUT_PATH%\*.dll"
-del /Q "%OBJ_PATH%\*.obj"
-del /Q "%OBJ_PATH%\*.res"
-del /Q "%OBJ_PATH%\*.bat"
-del /Q "%OBJ_PATH%\*.idb"
-del /Q "%OBJ_PATH%\*.log"
-del /Q "%OBJ_PATH%\*.manifest"
-del /Q "%OBJ_PATH%\*.lastbuildstate"
-del /Q "%OBJ_PATH%\*.htm"
-del /Q "%OBJ_PATH%\*.dep"
-del /Q "%MOC_PATH%\*.cpp"
-del /Q "%MOC_PATH%\*.h"
-del /Q /S "%IPC_PATH%\*.*"
+echo.
+echo ----------------------------------------------------------------
+echo Cleaning up
+echo ----------------------------------------------------------------
+echo.
+
+for %%i in (bin,obj,tmp,ipch) do (
+       del /Q /S /F "%~dp0\..\..\%%i\*.*"
+)
 
 :: ---------------------------------------------------------------------------
 :: UPDATE LANGUAGE FILES AND DCOS
@@ -62,7 +58,7 @@ call "%~dp0\_lupdate.bat"
 :: BUILD THE BINARIES
 :: ---------------------------------------------------------------------------
 
-call "%~dp0\_build.bat" "%~dp0\..\..\%PATH_VCPROJ%" "%LAMEXP_CONFIG%"
+call "%~dp0\_build.bat" "%~dp0\..\..\%PATH_VCPROJ%" "%LAMEXP_PLATFORM%" "%LAMEXP_CONFIG%"
 
 :SkipBuildThisTime
 
@@ -96,14 +92,14 @@ for %%i in (exe,sfx,zip,txt) do (
 )
 
 :: ---------------------------------------------------------------------------
-:: POST BUILD OPERATIONS
+:: COPY BINARY FILES AND REDIST
 :: ---------------------------------------------------------------------------
 
 rd /S /Q "%TMP_PATH%"
 mkdir "%TMP_PATH%"
 
 for %%i in (exe,dll) do (
-       copy "%OUT_PATH%\*.%%i" "%TMP_PATH%"
+       copy "%BIN_PATH%\*.%%i" "%TMP_PATH%"
 )
 
 if "%LAMEXP_REDIST%"=="1" (
@@ -113,7 +109,7 @@ if "%LAMEXP_REDIST%"=="1" (
        )
        copy "%QTDIR%\plugins\imageformats\q???4.dll" "%TMP_PATH%\imageformats"
        for %%i in (100,110,120) do (
-               if exist %PATH_MSCDIR%\VC\redist\x86\Microsoft.VC%%i.CRT\*.dll" (
+               if exist "%PATH_MSCDIR%\VC\redist\x86\Microsoft.VC%%i.CRT\*.dll" (
                        copy "%PATH_MSCDIR%\VC\redist\x86\Microsoft.VC%%i.CRT\*.dll" "%TMP_PATH%"
                )
        )

diff --git a/etc/Deployment/_mkdocs.bat b/etc/Deployment/_mkdocs.bat
index 302d44f..b6426cb 100644 (file)
--- a/etc/Deployment/_mkdocs.bat
+++ b/etc/Deployment/_mkdocs.bat
@@ -21,7 +21,7 @@ for %%i in ("%~dp0\..\..\doc\*.md") do (
        echo PANDOC: %%~nxi
        "%PATH_PANDOC%\pandoc.exe" --from markdown_github+pandoc_title_block --to html5 --toc -N --standalone -H "%~dp0\..\Style\style.css" "%%~i" --output "%%~dpni.html"
        echo.
-       if "!ERRORLEVEL!"=="0" (
+       if not "!ERRORLEVEL!"=="0" (
                echo. && echo Creating the document has failed^^!
                echo. && pause && exit
        )

diff --git a/etc/Deployment/buildenv.template.txt b/etc/Deployment/buildenv.template.txt
index a0c8628..934599d 100644 (file)
--- a/etc/Deployment/buildenv.template.txt
+++ b/etc/Deployment/buildenv.template.txt
@@ -3,5 +3,5 @@
 #define PATH_MSCDIR "C:\Program Files\Microsoft Visual Studio 12.0"
 #define PATH_QTMSVC "C:\QtSDK\Desktop\Qt\4.8.5\msvc2012"
 #define PATH_GNUPG1 "C:\Program Files\GNU\GnuPG"
-#define PATH_GNUPG1 "C:\Program Files\Pandoc"
+#define PATH_PANDOC "C:\Program Files\Pandoc"
 #define PATH_VCPROJ "LameXP_VS2013.sln"

diff --git a/src/Config.h b/src/Config.h
index 70c505b..ef4f6b0 100644 (file)
--- a/src/Config.h
+++ b/src/Config.h
@@ -33,9 +33,9 @@
 #define VER_LAMEXP_MAJOR                                       4
 #define VER_LAMEXP_MINOR_HI                                    1
 #define VER_LAMEXP_MINOR_LO                                    1
-#define VER_LAMEXP_TYPE                                                Hotfix
-#define VER_LAMEXP_PATCH                                       10
-#define VER_LAMEXP_BUILD                                       1649
+#define VER_LAMEXP_TYPE                                                Beta
+#define VER_LAMEXP_PATCH                                       11
+#define VER_LAMEXP_BUILD                                       1650
 #define VER_LAMEXP_CONFG                                       1558
 
 ///////////////////////////////////////////////////////////////////////////////