Skip to content
Browse files

Merge remote-tracking branch 'remotes/origin/REWORK_4280_BuildReport'

  • Loading branch information...
2 parents 03e4d9c + 5fa4d53 commit c6e28d2e75afd9634fb691e00fc37c51aa35b8c5 @chefkoch chefkoch committed Apr 1, 2013
View
3 .gitmodules
@@ -1,3 +1,6 @@
[submodule "libbluray"]
path = libbluray
url = git://git.1f0.de/libbluray.git
+[submodule "Build/BuildReport"]
+ path = Build/BuildReport
+ url = https://github.com/MediaPortal/BuildReport.git
View
5 Build/BuildInit.bat
@@ -43,4 +43,7 @@ echo. >> %log%
echo. >> %log%
echo Using following environment variables: >> %log%
echo DXSDK_DIR = %DXSDK_DIR% >> %log%
-echo. >> %log%
+echo. >> %log%
+
+REM copy BuildReport resources
+xcopy /I /Y .\BuildReport\_BuildReport_Files .\_BuildReport_Files
1 Build/BuildReport
@@ -0,0 +1 @@
+Subproject commit 2c127b5d836a17dba53f86f73d5c0155d889159d
View
7 Build/MSBUILD_Rebuild_All_MediaPortal_Debug.bat
@@ -16,7 +16,12 @@ call VS_Rebuild_Debug_DirectShowFilters.bat
echo.
echo Building MediaPortal...
-"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log%
+set xml=Build_Report_%BUILD_TYPE%_MediaPortal.xml
+set html=Build_Report_%BUILD_TYPE%_MediaPortal.html
+set logger=/l:XmlFileLogger,"BuildReport\MSBuild.ExtensionPack.Loggers.dll";logfile=%xml%
+
+"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log%
+BuildReport\msxsl %xml% _BuildReport_Files\BuildReport.xslt -o %html%
echo.
echo Reverting assemblies...
View
22 Build/MSBUILD_Rebuild_All_MediaPortal_Release.bat
@@ -16,7 +16,12 @@ call VS_Rebuild_Release_DirectShowFilters.bat
echo.
echo Building MediaPortal...
-"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log%
+set xml=Build_Report_%BUILD_TYPE%_MediaPortal.xml
+set html=Build_Report_%BUILD_TYPE%_MediaPortal.html
+set logger=/l:XmlFileLogger,"BuildReport\MSBuild.ExtensionPack.Loggers.dll";logfile=%xml%
+
+"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log%
+BuildReport\msxsl %xml% _BuildReport_Files\BuildReport.xslt -o %html%
echo.
echo Reverting assemblies...
@@ -48,10 +53,21 @@ rem %DeployVersionGIT% /git="%GIT_ROOT%" /path="%TVLibrary%" >> %log%
echo.
echo Building TV Server...
-"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvLibrary.sln" >> %log%
+set xml=Build_Report_%BUILD_TYPE%_TvLibrary.xml
+set html=Build_Report_%BUILD_TYPE%_TvLibrary.html
+set logger=/l:XmlFileLogger,"BuildReport\MSBuild.ExtensionPack.Loggers.dll";logfile=%xml%
+
+"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvLibrary.sln" >> %log%
+BuildReport\msxsl %xml% _BuildReport_Files\BuildReport.xslt -o %html%
+
echo.
echo Building TV Client plugin...
-"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvPlugin\TvPlugin.sln" >> %log%
+set xml=Build_Report_%BUILD_TYPE%_TvPlugin.xml
+set html=Build_Report_%BUILD_TYPE%_TvPlugin.html
+set logger=/l:XmlFileLogger,"BuildReport\MSBuild.ExtensionPack.Loggers.dll";logfile=%xml%
+
+"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvPlugin\TvPlugin.sln" >> %log%
+BuildReport\msxsl %xml% _BuildReport_Files\BuildReport.xslt -o %html%
echo.
echo Reverting assemblies...
View
7 Build/MSBUILD_Rebuild_Release_MediaPortal.bat
@@ -12,7 +12,12 @@ rem %DeployVersionGIT% /git="%GIT_ROOT%" /path="%MediaPortal%" >> %log%
echo.
echo Building MediaPortal...
-"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log%
+set xml=Build_Report_%BUILD_TYPE%_MediaPortal.xml
+set html=Build_Report_%BUILD_TYPE%_MediaPortal.html
+set logger=/l:XmlFileLogger,"BuildReport\MSBuild.ExtensionPack.Loggers.dll";logfile=%xml%
+
+"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log%
+BuildReport\msxsl %xml% _BuildReport_Files\BuildReport.xslt -o %html%
echo.
echo Reverting assemblies...
View
15 Build/MSBUILD_Rebuild_Release_TVServer_Client.bat
@@ -12,10 +12,21 @@ rem %DeployVersionGIT% /git="%GIT_ROOT%" /path="%TVLibrary%" >> %log%
echo.
echo Building TV Server...
-"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvLibrary.sln" >> %log%
+set xml=Build_Report_%BUILD_TYPE%_TvLibrary.xml
+set html=Build_Report_%BUILD_TYPE%_TvLibrary.html
+set logger=/l:XmlFileLogger,"BuildReport\MSBuild.ExtensionPack.Loggers.dll";logfile=%xml%
+
+"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvLibrary.sln" >> %log%
+BuildReport\msxsl %xml% _BuildReport_Files\BuildReport.xslt -o %html%
+
echo.
echo Building TV Client plugin...
-"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvPlugin\TvPlugin.sln" >> %log%
+set xml=Build_Report_%BUILD_TYPE%_TvPlugin.xml
+set html=Build_Report_%BUILD_TYPE%_TvPlugin.html
+set logger=/l:XmlFileLogger,"BuildReport\MSBuild.ExtensionPack.Loggers.dll";logfile=%xml%
+
+"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvPlugin\TvPlugin.sln" >> %log%
+BuildReport\msxsl %xml% _BuildReport_Files\BuildReport.xslt -o %html%
echo.
echo Reverting assemblies...
View
16 Build/VS_build_DirectShowFilters.bat
@@ -27,11 +27,23 @@ if not [%3]==[] goto BUILD_PRJ
goto BUILD rem full build
:BUILD_PRJ
-"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /target:%BUILD_MODE% /property:Configuration=%BUILD_TYPE% "..\DirectShowFilters\Filters.sln" %PRJ% >> %log%
+set xml=Build_Report_%BUILD_TYPE%_Filters_%PRJ%.xml
+set html=Build_Report_%BUILD_TYPE%_Filters_%PRJ%.html
+set logger=/l:XmlFileLogger,"BuildReport\MSBuild.ExtensionPack.Loggers.dll";logfile=%xml%
+
+"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /p:PlatformToolset=Windows7.1SDK /target:%BUILD_MODE% /property:Configuration=%BUILD_TYPE% "..\DirectShowFilters\Filters.sln" %PRJ% >> %log%
+BuildReport\msxsl %xml% _BuildReport_Files\BuildReport.xslt -o %html%
+
goto DONE
:BUILD
-"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /target:%BUILD_MODE% /property:Configuration=%BUILD_TYPE% "..\DirectShowFilters\Filters.sln" >> %log%
+set xml=Build_Report_%BUILD_TYPE%_Filters.xml
+set html=Build_Report_%BUILD_TYPE%_Filters.html
+set logger=/l:XmlFileLogger,"BuildReport\MSBuild.ExtensionPack.Loggers.dll";logfile=%xml%
+
+"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /p:PlatformToolset=Windows7.1SDK /target:%BUILD_MODE% /property:Configuration=%BUILD_TYPE% "..\DirectShowFilters\Filters.sln" >> %log%
+BuildReport\msxsl %xml% _BuildReport_Files\BuildReport.xslt -o %html%
+
goto DONE
:ERROR_IN_PARAMETERS
View
2 Tools/InstallationScripts/DeployToolUnPacker.nsi
@@ -107,7 +107,7 @@ VIAddVersionKey CompanyName "${PRODUCT_PUBLISHER}"
VIAddVersionKey CompanyWebsite "${PRODUCT_WEB_SITE}"
VIAddVersionKey FileVersion "${VERSION}"
VIAddVersionKey FileDescription "${PRODUCT_NAME} installation ${VERSION_DISP}"
-VIAddVersionKey LegalCopyright "Copyright © 2005-2011 ${PRODUCT_PUBLISHER}"
+VIAddVersionKey LegalCopyright "Copyright © 2005-2013 ${PRODUCT_PUBLISHER}"
;if we want to make it fully silent we can uncomment this
;SilentInstall silent
View
37 Tools/InstallationScripts/include-MP-PreBuild.nsh
@@ -33,6 +33,23 @@
;!define BUILD_DeployTool
;!define BUILD_Installer
+!macro PrepareBuildReport Project
+ !define BuildReport '${git_ROOT}\Build\BuildReport'
+ !define xml '${git_OUT}\Build_Report_${Project}.xml'
+ !define html '${git_OUT}\Build_Report_${Project}.html'
+ !define logger '/l:XmlFileLogger,"${BuildReport}\MSBuild.ExtensionPack.Loggers.dll";logfile=${xml}'
+
+ !system 'xcopy /I /Y "${BuildReport}\_BuildReport_Files" "${git_OUT}\_BuildReport_Files"'
+!macroend
+!macro FinalizeBuildReport
+
+ !system '"${BuildReport}\msxsl.exe" "${xml}" "${BuildReport}\_BuildReport_Files\BuildReport.xslt" -o "${html}"' = 0
+ !undef BuildReport
+ !undef xml
+ !undef html
+ !undef logger
+!macroend
+
!if ${VER_BUILD} != 0
!system '"${git_DeployVersionGIT}\DeployVersionGIT\bin\Release\DeployVersionGIT.exe" /git="${git_ROOT}" /path="${git_MP}"' = 0
@@ -41,13 +58,21 @@
!endif
!ifdef BUILD_MediaPortal
-!system '"$%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /target:rebuild /property:Configuration=Release ${git_DirectShowFilters}\Filters.sln' = 0
-!system '"$%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=Release;Platform=x86 "${git_MP}\MediaPortal.sln"' = 0
+!insertmacro PrepareBuildReport DirectShowFilters
+!system '"$%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" ${logger} /target:rebuild /property:Configuration=Release ${git_DirectShowFilters}\Filters.sln' = 0
+!insertmacro FinalizeBuildReport
+!insertmacro PrepareBuildReport MediaPortal
+!system '"$%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" ${logger} /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=Release;Platform=x86 "${git_MP}\MediaPortal.sln"' = 0
+!insertmacro FinalizeBuildReport
!endif
!ifdef BUILD_TVServer
-!system '"$%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=Release;Platform=x86 "${git_TVServer}\TvLibrary.sln"' = 0
-!system '"$%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=Release;Platform=x86 "${git_TVServer}\TvPlugin\TvPlugin.sln"' = 0
+!insertmacro PrepareBuildReport TvLibrary
+!system '"$%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" ${logger} /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=Release;Platform=x86 "${git_TVServer}\TvLibrary.sln"' = 0
+!insertmacro FinalizeBuildReport
+!insertmacro PrepareBuildReport TvPlugin
+!system '"$%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" ${logger} /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=Release;Platform=x86 "${git_TVServer}\TvPlugin\TvPlugin.sln"' = 0
+!insertmacro FinalizeBuildReport
!endif
!if ${VER_BUILD} != 0
@@ -57,7 +82,9 @@
!endif
!ifdef BUILD_DeployTool
-!system '"$%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /tv:3.5 /p:TargetFrameworkVersion=v3.5 /p:ALToolPath="${ALToolPath}" /target:Rebuild /property:Configuration=Release;Platform=x86 "${git_DeployTool}\MediaPortal.DeployTool.sln"' = 0
+!insertmacro PrepareBuildReport DeployTool
+!system '"$%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" ${logger} /tv:3.5 /p:TargetFrameworkVersion=v3.5 /p:ALToolPath="${ALToolPath}" /target:Rebuild /property:Configuration=Release;Platform=x86 "${git_DeployTool}\MediaPortal.DeployTool.sln"' = 0
+!insertmacro FinalizeBuildReport
!endif
!ifdef BUILD_Installer

0 comments on commit c6e28d2

Please sign in to comment.
Something went wrong with that request. Please try again.