diff options
| author | montellese <montellese@xbmc.org> | 2013-06-09 00:12:04 +0200 |
|---|---|---|
| committer | montellese <montellese@xbmc.org> | 2013-06-11 21:48:06 +0200 |
| commit | f107d246ae5e190365b2939a2ddc327375660e79 (patch) | |
| tree | bb5f6bdd151deba097e7c529bea0643a1eda158c /project/Win32BuildSetup | |
| parent | d4bd0952fa3378dd3f6c38d05447a417741ccede (diff) | |
[win32] use MSBuild.exe or devenv.com (if available) in BuildSetup.bat to get verbose console output
Diffstat (limited to 'project/Win32BuildSetup')
| -rw-r--r-- | project/Win32BuildSetup/BuildSetup.bat | 32 | ||||
| -rw-r--r-- | project/Win32BuildSetup/buildpvraddons.bat | 7 |
2 files changed, 30 insertions, 9 deletions
diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat index 9bb23bad56..564fee0b29 100644 --- a/project/Win32BuildSetup/BuildSetup.bat +++ b/project/Win32BuildSetup/BuildSetup.bat @@ -1,4 +1,5 @@ @ECHO OFF +SETLOCAL ENABLEDELAYEDEXPANSION rem ----Usage---- rem BuildSetup [gl|dx] [clean|noclean] rem vs2010 for compiling with visual studio 2010 @@ -41,12 +42,29 @@ SET buildconfig=Release (DirectX) IF %target%==gl SET buildconfig=Release (OpenGL) IF %comp%==vs2010 ( - IF "%VS100COMNTOOLS%"=="" ( - set NET="%ProgramFiles%\Microsoft Visual Studio 10.0\Common7\IDE\VCExpress.exe" - ) ELSE IF EXIST "%VS100COMNTOOLS%\..\IDE\VCExpress.exe" ( - set NET="%VS100COMNTOOLS%\..\IDE\VCExpress.exe" - ) ELSE IF EXIST "%VS100COMNTOOLS%\..\IDE\devenv.exe" ( - set NET="%VS100COMNTOOLS%\..\IDE\devenv.exe" + REM look for MSBuild.exe in .NET Framework 4.x + FOR /F "tokens=3* delims= " %%A IN ('REG QUERY HKLM\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0 /v MSBuildToolsPath') DO SET NET=%%AMSBuild.exe + IF NOT EXIST "!NET!" ( + FOR /F "tokens=3* delims= " %%A IN ('REG QUERY HKLM\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0 /v MSBuildToolsPath') DO SET NET=%%AMSBuild.exe + ) + + IF EXIST "!NET!" ( + set msbuildemitsolution=1 + set OPTS_EXE="..\VS2010Express\XBMC for Windows.sln" /t:Build /p:Configuration="%buildconfig%" + set CLEAN_EXE="..\VS2010Express\XBMC for Windows.sln" /t:Clean /p:Configuration="%buildconfig%" + ) ELSE ( + IF EXIST "%VS100COMNTOOLS%\..\IDE\devenv.com" ( + set NET="%VS100COMNTOOLS%\..\IDE\devenv.com" + ) ELSE IF EXIST "%VS100COMNTOOLS%\..\IDE\devenv.exe" ( + set NET="%VS100COMNTOOLS%\..\IDE\devenv.exe" + ) ELSE IF "%VS100COMNTOOLS%"=="" ( + set NET="%ProgramFiles%\Microsoft Visual Studio 10.0\Common7\IDE\VCExpress.exe" + ) ELSE IF EXIST "%VS100COMNTOOLS%\..\IDE\VCExpress.exe" ( + set NET="%VS100COMNTOOLS%\..\IDE\VCExpress.exe" + ) + + set OPTS_EXE="..\VS2010Express\XBMC for Windows.sln" /build "%buildconfig%" + set CLEAN_EXE="..\VS2010Express\XBMC for Windows.sln" /clean "%buildconfig%" ) ) @@ -55,8 +73,6 @@ IF %comp%==vs2010 ( goto DIE ) - set OPTS_EXE="..\VS2010Express\XBMC for Windows.sln" /build "%buildconfig%" - set CLEAN_EXE="..\VS2010Express\XBMC for Windows.sln" /clean "%buildconfig%" set EXE= "..\VS2010Express\XBMC\%buildconfig%\XBMC.exe" set PDB= "..\VS2010Express\XBMC\%buildconfig%\XBMC.pdb" diff --git a/project/Win32BuildSetup/buildpvraddons.bat b/project/Win32BuildSetup/buildpvraddons.bat index b3a2990b0e..993cf8fbf9 100644 --- a/project/Win32BuildSetup/buildpvraddons.bat +++ b/project/Win32BuildSetup/buildpvraddons.bat @@ -15,7 +15,12 @@ SET GIT_URL=git://github.com/opdenkamp/%LIBNAME%.git SET SOURCE_DIR=%TMP_DIR%\%SOURCE% SET BUILT_ADDONS_DIR=%SOURCE_DIR%\addons -set OPTS_EXE=%SOURCE_DIR%\project\VS2010Express\xbmc-pvr-addons.sln /build Release +REM check if MSBuild.exe is used because it requires different command line switches +IF "%msbuildemitsolution%" == "1" ( + set OPTS_EXE=%SOURCE_DIR%\project\VS2010Express\xbmc-pvr-addons.sln /t:Build /p:Configuration="Release" +) ELSE ( + set OPTS_EXE=%SOURCE_DIR%\project\VS2010Express\xbmc-pvr-addons.sln /build Release +) REM Try wrapped msysgit - must be in the path SET GITEXE=git.cmd |