From 35635e27fcea70f82abf1d4f65e9e81c1cb8b834 Mon Sep 17 00:00:00 2001 From: tourettes Date: Wed, 16 Jan 2013 17:59:32 +0200 Subject: [PATCH] Updated build scripts to match the structural changes that have been done to native components --- Build/BuildInit.bat | 3 - .../MSBUILD_Rebuild_All_MediaPortal_Debug.bat | 6 +- ...SBUILD_Rebuild_All_MediaPortal_Release.bat | 10 +- Build/MSBUILD_Rebuild_Release_MediaPortal.bat | 2 +- ...SBUILD_Rebuild_Release_TVServer_Client.bat | 4 +- Build/VS_Build_Debug_DirectShowFilters.bat | 3 + Build/VS_Build_Release_DirectShowFilters.bat | 3 + Build/VS_Rebuild_Debug_AudioRenderer.bat | 3 - Build/VS_Rebuild_Debug_Corecpp.bat | 3 - Build/VS_Rebuild_Debug_DirectShowFilters.bat | 2 +- Build/VS_Rebuild_Debug_MPC_HC_subs.bat | 3 - ...VS_Rebuild_Debug_Win7RefreshRateHelper.bat | 3 - Build/VS_Rebuild_Release_AudioRenderer.bat | 10 - Build/VS_Rebuild_Release_Corecpp.bat | 10 - .../VS_Rebuild_Release_DirectShowFilters.bat | 11 +- Build/VS_Rebuild_Release_MPC_HC_subs.bat | 10 - ..._Rebuild_Release_Win7RefreshRateHelper.bat | 10 - Build/VS_build_DirectShowFilters.bat | 42 ++++ .../include-MP-PreBuild.nsh | 9 +- mediaportal/Setup/setup.nsi | 186 +++++++++--------- 20 files changed, 164 insertions(+), 169 deletions(-) create mode 100644 Build/VS_Build_Debug_DirectShowFilters.bat create mode 100644 Build/VS_Build_Release_DirectShowFilters.bat delete mode 100644 Build/VS_Rebuild_Debug_AudioRenderer.bat delete mode 100644 Build/VS_Rebuild_Debug_Corecpp.bat delete mode 100644 Build/VS_Rebuild_Debug_MPC_HC_subs.bat delete mode 100644 Build/VS_Rebuild_Debug_Win7RefreshRateHelper.bat delete mode 100644 Build/VS_Rebuild_Release_AudioRenderer.bat delete mode 100644 Build/VS_Rebuild_Release_Corecpp.bat delete mode 100644 Build/VS_Rebuild_Release_MPC_HC_subs.bat delete mode 100644 Build/VS_Rebuild_Release_Win7RefreshRateHelper.bat create mode 100644 Build/VS_build_DirectShowFilters.bat diff --git a/Build/BuildInit.bat b/Build/BuildInit.bat index a5b412ddbcd..111f409e04f 100644 --- a/Build/BuildInit.bat +++ b/Build/BuildInit.bat @@ -15,7 +15,6 @@ set progpath=%ProgramFiles% if not "%ProgramFiles(x86)%".=="". set progpath=%ProgramFiles(x86)% REM Select Visual Studio version -set vsver=10.0 REM set other MP related paths set GIT_ROOT=.. @@ -43,7 +42,5 @@ echo. >> %log% echo. >> %log% echo Using following environment variables: >> %log% -echo DSHOW_BASE = %DSHOW_BASE% >> %log% echo DXSDK_DIR = %DXSDK_DIR% >> %log% -echo WINDOWS_SDK = %WINDOWS_SDK% >> %log% echo. >> %log% \ No newline at end of file diff --git a/Build/MSBUILD_Rebuild_All_MediaPortal_Debug.bat b/Build/MSBUILD_Rebuild_All_MediaPortal_Debug.bat index 58100805977..d6cd651fdc2 100644 --- a/Build/MSBUILD_Rebuild_All_MediaPortal_Debug.bat +++ b/Build/MSBUILD_Rebuild_All_MediaPortal_Debug.bat @@ -10,9 +10,13 @@ echo Writing GIT revision assemblies... rem %DeployVersionGIT% /git="%GIT_ROOT%" /path="%MediaPortal%" >> %log% %DeployVersionGIT% /git="%GIT_ROOT%" /path="%CommonMPTV%" >> %log% +echo. +echo Building native components... +call VS_Rebuild_Debug_DirectShowFilters.bat + echo. echo Building MediaPortal... -"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log% +"%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% echo. echo Reverting assemblies... diff --git a/Build/MSBUILD_Rebuild_All_MediaPortal_Release.bat b/Build/MSBUILD_Rebuild_All_MediaPortal_Release.bat index 87e0daa0b35..378710850ca 100644 --- a/Build/MSBUILD_Rebuild_All_MediaPortal_Release.bat +++ b/Build/MSBUILD_Rebuild_All_MediaPortal_Release.bat @@ -10,9 +10,13 @@ echo Writing GIT revision assemblies... rem %DeployVersionGIT% /git="%GIT_ROOT%" /path="%MediaPortal%" >> %log% %DeployVersionGIT% /git="%GIT_ROOT%" /path="%CommonMPTV%" >> %log% +echo. +echo Building native components... +call VS_Rebuild_Release_DirectShowFilters.bat + echo. echo Building MediaPortal... -"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log% +"%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% echo. echo Reverting assemblies... @@ -44,10 +48,10 @@ rem %DeployVersionGIT% /git="%GIT_ROOT%" /path="%TVLibrary%" >> %log% echo. echo Building TV Server... -"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvLibrary.sln" >> %log% +"%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% echo. echo Building TV Client plugin... -"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvPlugin\TvPlugin.sln" >> %log% +"%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% echo. echo Reverting assemblies... diff --git a/Build/MSBUILD_Rebuild_Release_MediaPortal.bat b/Build/MSBUILD_Rebuild_Release_MediaPortal.bat index fc5d2756130..6e37f1c1f89 100644 --- a/Build/MSBUILD_Rebuild_Release_MediaPortal.bat +++ b/Build/MSBUILD_Rebuild_Release_MediaPortal.bat @@ -12,7 +12,7 @@ rem %DeployVersionGIT% /git="%GIT_ROOT%" /path="%MediaPortal%" >> %log% echo. echo Building MediaPortal... -"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log% +"%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% echo. echo Reverting assemblies... diff --git a/Build/MSBUILD_Rebuild_Release_TVServer_Client.bat b/Build/MSBUILD_Rebuild_Release_TVServer_Client.bat index 0f2f36e5c12..36c5b0cda7a 100644 --- a/Build/MSBUILD_Rebuild_Release_TVServer_Client.bat +++ b/Build/MSBUILD_Rebuild_Release_TVServer_Client.bat @@ -12,10 +12,10 @@ rem %DeployVersionGIT% /git="%GIT_ROOT%" /path="%TVLibrary%" >> %log% echo. echo Building TV Server... -"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvLibrary.sln" >> %log% +"%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% echo. echo Building TV Client plugin... -"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvPlugin\TvPlugin.sln" >> %log% +"%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% echo. echo Reverting assemblies... diff --git a/Build/VS_Build_Debug_DirectShowFilters.bat b/Build/VS_Build_Debug_DirectShowFilters.bat new file mode 100644 index 00000000000..037ab7dd2ad --- /dev/null +++ b/Build/VS_Build_Debug_DirectShowFilters.bat @@ -0,0 +1,3 @@ +@echo off + +call "VS_build_DirectShowFilters.bat" debug build diff --git a/Build/VS_Build_Release_DirectShowFilters.bat b/Build/VS_Build_Release_DirectShowFilters.bat new file mode 100644 index 00000000000..3911440f0f0 --- /dev/null +++ b/Build/VS_Build_Release_DirectShowFilters.bat @@ -0,0 +1,3 @@ +@echo off + +call "VS_build_DirectShowFilters.bat" release build diff --git a/Build/VS_Rebuild_Debug_AudioRenderer.bat b/Build/VS_Rebuild_Debug_AudioRenderer.bat deleted file mode 100644 index 04e229899ee..00000000000 --- a/Build/VS_Rebuild_Debug_AudioRenderer.bat +++ /dev/null @@ -1,3 +0,0 @@ -@ECHO OFF - -call "VS_Rebuild_Release_AudioRenderer.bat" Debug diff --git a/Build/VS_Rebuild_Debug_Corecpp.bat b/Build/VS_Rebuild_Debug_Corecpp.bat deleted file mode 100644 index 7fed7239de4..00000000000 --- a/Build/VS_Rebuild_Debug_Corecpp.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off - -call "VS_Rebuild_Release_Corecpp.bat" Debug diff --git a/Build/VS_Rebuild_Debug_DirectShowFilters.bat b/Build/VS_Rebuild_Debug_DirectShowFilters.bat index e690c916537..d38fefa5857 100644 --- a/Build/VS_Rebuild_Debug_DirectShowFilters.bat +++ b/Build/VS_Rebuild_Debug_DirectShowFilters.bat @@ -1,3 +1,3 @@ @echo off -call "VS_Rebuild_Release_DirectShowFilters.bat" Debug +call "VS_build_DirectShowFilters.bat" debug rebuild diff --git a/Build/VS_Rebuild_Debug_MPC_HC_subs.bat b/Build/VS_Rebuild_Debug_MPC_HC_subs.bat deleted file mode 100644 index ccf8620c5d6..00000000000 --- a/Build/VS_Rebuild_Debug_MPC_HC_subs.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off - -call "VS_Rebuild_Release_MPC_HC_subs.bat" Debug diff --git a/Build/VS_Rebuild_Debug_Win7RefreshRateHelper.bat b/Build/VS_Rebuild_Debug_Win7RefreshRateHelper.bat deleted file mode 100644 index c55feb8c17b..00000000000 --- a/Build/VS_Rebuild_Debug_Win7RefreshRateHelper.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off - -call "VS_Rebuild_Release_Win7RefreshRateHelper.bat" Debug diff --git a/Build/VS_Rebuild_Release_AudioRenderer.bat b/Build/VS_Rebuild_Release_AudioRenderer.bat deleted file mode 100644 index 56178b82eec..00000000000 --- a/Build/VS_Rebuild_Release_AudioRenderer.bat +++ /dev/null @@ -1,10 +0,0 @@ -@ECHO OFF - -rem build init -set project=AudioRenderer -call BuildInit.bat %1 - -rem build -echo. -echo Building MPAudioRenderer... -"%progpath%\Microsoft Visual Studio %vsver%\Common7\IDE\devenv.com" "..\DirectShowFilters\MPAudioRenderer\AudioRenderer.sln" /ReBuild "%BUILD_TYPE% unicode" >> %log% diff --git a/Build/VS_Rebuild_Release_Corecpp.bat b/Build/VS_Rebuild_Release_Corecpp.bat deleted file mode 100644 index 94e81c781ed..00000000000 --- a/Build/VS_Rebuild_Release_Corecpp.bat +++ /dev/null @@ -1,10 +0,0 @@ -@ECHO OFF - -rem build init -set project=Corecpp -call BuildInit.bat %1 - -rem build -echo. -echo Building %project% -"%progpath%\Microsoft Visual Studio %vsver%\Common7\IDE\devenv.com" "..\mediaportal\Core.cpp\Core.cpp.sln" /Rebuild "%BUILD_TYPE%" >> %log% diff --git a/Build/VS_Rebuild_Release_DirectShowFilters.bat b/Build/VS_Rebuild_Release_DirectShowFilters.bat index bb70540affa..c6f4243db92 100644 --- a/Build/VS_Rebuild_Release_DirectShowFilters.bat +++ b/Build/VS_Rebuild_Release_DirectShowFilters.bat @@ -1,10 +1,3 @@ -@ECHO OFF +@echo off -rem build init -set project=DirectShowFilters -call BuildInit.bat %1 - -rem build -echo. -echo Building %project% -"%progpath%\Microsoft Visual Studio %vsver%\Common7\IDE\devenv.com" "..\DirectShowFilters\Filters.sln" /Rebuild "%BUILD_TYPE%" >> %log% +call "VS_build_DirectShowFilters.bat" release rebuild diff --git a/Build/VS_Rebuild_Release_MPC_HC_subs.bat b/Build/VS_Rebuild_Release_MPC_HC_subs.bat deleted file mode 100644 index a396ccd0786..00000000000 --- a/Build/VS_Rebuild_Release_MPC_HC_subs.bat +++ /dev/null @@ -1,10 +0,0 @@ -@ECHO OFF - -rem build init -set project=MPC_HC_subs -call BuildInit.bat %1 - -rem build -echo. -echo Building %project% -"%progpath%\Microsoft Visual Studio %vsver%\Common7\IDE\devenv.com" "..\mediaportal\Core.cpp\mpc-hc_subs.sln" /Rebuild "%BUILD_TYPE%" >> %log% diff --git a/Build/VS_Rebuild_Release_Win7RefreshRateHelper.bat b/Build/VS_Rebuild_Release_Win7RefreshRateHelper.bat deleted file mode 100644 index c9860f7e9ed..00000000000 --- a/Build/VS_Rebuild_Release_Win7RefreshRateHelper.bat +++ /dev/null @@ -1,10 +0,0 @@ -@ECHO OFF - -rem build init -set project=Win7RefreshRateHelper -call BuildInit.bat %1 - -rem build -echo. -echo Building %project% -"%progpath%\Microsoft Visual Studio %vsver%\Common7\IDE\devenv.com" "..\mediaportal\Core.cpp\Win7RefreshRateHelper\Win7RefreshRateHelper.sln" /Rebuild "%BUILD_TYPE%" >> %log% diff --git a/Build/VS_build_DirectShowFilters.bat b/Build/VS_build_DirectShowFilters.bat new file mode 100644 index 00000000000..12f5e4db45e --- /dev/null +++ b/Build/VS_build_DirectShowFilters.bat @@ -0,0 +1,42 @@ +@ECHO OFF +REM check parameters + +if /I not %1==debug if /I not %1==rebuild if /I not %1==release if /I not %1==build goto ERROR_IN_PARAMETERS +if /I not %2==debug if /I not %2==rebuild if /I not %2==release if /I not %2==build goto ERROR_IN_PARAMETERS + +set BUILD_TYPE=Release +set BUILD_MODE=build + +if %1==debug set BUILD_TYPE=Debug +if %2==debug set BUILD_TYPE=Debug + +if %1==rebuild set BUILD_MODE=rebuild +if %2==rebuild set BUILD_MODE=rebuild + +if not [%3]==[] set PRJ=/project %3 + +REM build init +set project=DirectShowFilters +call BuildInit.bat %BUILD_TYPE% + +REM build +echo. +echo Building %project% + +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% +goto DONE + +:BUILD +"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /target:%BUILD_MODE% /property:Configuration=%BUILD_TYPE% "..\DirectShowFilters\Filters.sln" >> %log% +goto DONE + +:ERROR_IN_PARAMETERS +echo. +echo "Error in given parameters. Valid options [build|rebuild] [release|debug] and optional [project name]. For example to rebuild release mode binaries use 'rebuild release' or to build only TsReader in debug mode 'build debug TsReader'" +echo. + +:DONE diff --git a/Tools/InstallationScripts/include-MP-PreBuild.nsh b/Tools/InstallationScripts/include-MP-PreBuild.nsh index 98c463c972a..57fa5a940aa 100644 --- a/Tools/InstallationScripts/include-MP-PreBuild.nsh +++ b/Tools/InstallationScripts/include-MP-PreBuild.nsh @@ -41,12 +41,13 @@ !endif !ifdef BUILD_MediaPortal -!system '"$%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=Release;Platform=x86 "${git_MP}\MediaPortal.sln"' = 0 +!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 !endif !ifdef BUILD_TVServer -!system '"$%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=Release;Platform=x86 "${git_TVServer}\TvLibrary.sln"' = 0 -!system '"$%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=Release;Platform=x86 "${git_TVServer}\TvPlugin\TvPlugin.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}\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 !endif !if ${VER_BUILD} != 0 @@ -56,7 +57,7 @@ !endif !ifdef BUILD_DeployTool -!system '"$%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /p:ALToolPath="${ALToolPath}" /target:Rebuild /property:Configuration=Release;Platform=x86 "${git_DeployTool}\MediaPortal.DeployTool.sln"' = 0 +!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 !endif !ifdef BUILD_Installer diff --git a/mediaportal/Setup/setup.nsi b/mediaportal/Setup/setup.nsi index 493a9e13c7f..55aef2e5fef 100644 --- a/mediaportal/Setup/setup.nsi +++ b/mediaportal/Setup/setup.nsi @@ -28,8 +28,8 @@ #--------------------------------------------------------------------------- # SPECIAL BUILDS #--------------------------------------------------------------------------- -##### GIT_BUILD -# This build will be created by git bot only. +##### GIT_BUILD +# This build will be created by git bot only. # Creating such a build, will only include the changed and new files since latest stable release to the installer. ##### HEISE_BUILD @@ -44,24 +44,24 @@ # SKRIPT_NAME is needed to diff between the install scripts in imported headers !define SKRIPT_NAME "MediaPortal" # path definitions, all others are done in MediaPortalScriptInit -!define git_ROOT "..\.." -!define git_InstallScripts "${git_ROOT}\Tools\InstallationScripts" +!define git_ROOT "..\.." +!define git_InstallScripts "${git_ROOT}\Tools\InstallationScripts" # common script init -!include "${git_InstallScripts}\include\MediaPortalScriptInit.nsh" +!include "${git_InstallScripts}\include\MediaPortalScriptInit.nsh" # additional path definitions -!ifdef GIT_BUILD +!ifdef GIT_BUILD !define MEDIAPORTAL.BASE "C:\compile\compare_mp1_test" !else - !define MEDIAPORTAL.BASE "${git_MP}\MediaPortal.Base" + !define MEDIAPORTAL.BASE "${git_MP}\MediaPortal.Base" !endif -!define MEDIAPORTAL.XBMCBIN "${git_MP}\MediaPortal.Application\bin\${BUILD_TYPE}" +!define MEDIAPORTAL.XBMCBIN "${git_MP}\MediaPortal.Application\bin\${BUILD_TYPE}" #--------------------------------------------------------------------------- # pre build commands #--------------------------------------------------------------------------- -!include "${git_MP}\Setup\setup-preBuild.nsh" +!include "${git_MP}\Setup\setup-preBuild.nsh" #--------------------------------------------------------------------------- @@ -114,38 +114,38 @@ Var MPTray_Running !include Memento.nsh !include WinMessages.nsh -!include "${git_InstallScripts}\include\FileAssociation.nsh" -!include "${git_InstallScripts}\include\LanguageMacros.nsh" -!include "${git_InstallScripts}\include\LoggingMacros.nsh" -!include "${git_InstallScripts}\include\MediaPortalDirectories.nsh" -!include "${git_InstallScripts}\include\MediaPortalMacros.nsh" -!include "${git_InstallScripts}\include\ProcessMacros.nsh" +!include "${git_InstallScripts}\include\FileAssociation.nsh" +!include "${git_InstallScripts}\include\LanguageMacros.nsh" +!include "${git_InstallScripts}\include\LoggingMacros.nsh" +!include "${git_InstallScripts}\include\MediaPortalDirectories.nsh" +!include "${git_InstallScripts}\include\MediaPortalMacros.nsh" +!include "${git_InstallScripts}\include\ProcessMacros.nsh" !include "${git_InstallScripts}\include\WinVerEx.nsh" !include "${git_InstallScripts}\include\CPUDesc.nsh" !include "${git_InstallScripts}\include\FontReg.nsh" !include "${git_InstallScripts}\include\FontName.nsh" -!ifndef GIT_BUILD -!include "${git_InstallScripts}\pages\AddRemovePage.nsh" +!ifndef GIT_BUILD +!include "${git_InstallScripts}\pages\AddRemovePage.nsh" !endif -!include "${git_InstallScripts}\pages\UninstallModePage.nsh" +!include "${git_InstallScripts}\pages\UninstallModePage.nsh" #--------------------------------------------------------------------------- # INSTALLER INTERFACE settings #--------------------------------------------------------------------------- !define MUI_ABORTWARNING -!define MUI_ICON "${git_InstallScripts}\Resources\install.ico" -!define MUI_UNICON "${git_InstallScripts}\Resources\install.ico" +!define MUI_ICON "${git_InstallScripts}\Resources\install.ico" +!define MUI_UNICON "${git_InstallScripts}\Resources\install.ico" !define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP "${git_InstallScripts}\Resources\header.bmp" +!define MUI_HEADERIMAGE_BITMAP "${git_InstallScripts}\Resources\header.bmp" !if ${VER_BUILD} == 0 # it's an official release - !define MUI_WELCOMEFINISHPAGE_BITMAP "${git_InstallScripts}\Resources\wizard-mp.bmp" -!else # it's a git release - !define MUI_WELCOMEFINISHPAGE_BITMAP "${git_InstallScripts}\Resources\wizard-mp-snapshot.bmp" + !define MUI_WELCOMEFINISHPAGE_BITMAP "${git_InstallScripts}\Resources\wizard-mp.bmp" +!else # it's a git release + !define MUI_WELCOMEFINISHPAGE_BITMAP "${git_InstallScripts}\Resources\wizard-mp-snapshot.bmp" !endif -!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${git_InstallScripts}\Resources\wizard-mp.bmp" +!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${git_InstallScripts}\Resources\wizard-mp.bmp" !define MUI_HEADERIMAGE_RIGHT !define MUI_COMPONENTSPAGE_SMALLDESC @@ -170,10 +170,10 @@ Var MPTray_Running # INSTALLER INTERFACE #--------------------------------------------------------------------------- !insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "${git_MP}\Docs\MediaPortal License.rtf" -!insertmacro MUI_PAGE_LICENSE "${git_MP}\Docs\BASS License.txt" +!insertmacro MUI_PAGE_LICENSE "${git_MP}\Docs\MediaPortal License.rtf" +!insertmacro MUI_PAGE_LICENSE "${git_MP}\Docs\BASS License.txt" -!ifndef GIT_BUILD +!ifndef GIT_BUILD Page custom PageReinstallMode PageLeaveReinstallMode !endif @@ -213,9 +213,9 @@ UninstPage custom un.UninstallModePage un.UninstallModePageLeave Name "${PRODUCT_NAME}" BrandingText "${PRODUCT_NAME} ${VERSION_DISP} by ${PRODUCT_PUBLISHER}" !if ${VER_BUILD} == 0 # it's an official release - OutFile "${git_OUT}\package-mediaportal.exe" -!else # it's a git release - OutFile "${git_OUT}\Setup-MediaPortal-git-${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}.${VER_BUILD}.exe" + OutFile "${git_OUT}\package-mediaportal.exe" +!else # it's a git release + OutFile "${git_OUT}\Setup-MediaPortal-git-${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}.${VER_BUILD}.exe" !endif InstallDir "" CRCCheck on @@ -280,7 +280,7 @@ ShowUninstDetails show Function RunUninstaller -!ifndef GIT_BUILD +!ifndef GIT_BUILD ${VersionCompare} 1.0.2.22779 $PREVIOUS_VERSION $R0 ; old (un)installers should be called silently ${If} $R0 == 2 ;previous is higher than 22780 @@ -314,7 +314,7 @@ Section "-prepare" SecPrepare ${If} $PREVIOUS_VERSION == "" ${LOG_TEXT} "INFO" "It seems MP is not installed, no update procedure will be done" ${ElseIf} $R3 != 0 - ${LOG_TEXT} "INFO" "A GIT version ($0) of MP is installed. Update is not supported." + ${LOG_TEXT} "INFO" "A GIT version ($0) of MP is installed. Update is not supported." ${Else} ${LOG_TEXT} "INFO" "MediaPortal $0 is installed." ${EndIf} @@ -348,7 +348,7 @@ Section "MediaPortal core files (required)" SecCore SetOverwrite on - #CONFIG FILES ARE ALWAYS INSTALLED by GIT and FINAL releases, BECAUSE of the config dir location + #CONFIG FILES ARE ALWAYS INSTALLED by GIT and FINAL releases, BECAUSE of the config dir location #MediaPortal Paths should not be overwritten !define EXCLUDED_CONFIG_FILES "\ /x 'eHome Infrared Transceiver List XP.xml' \ @@ -366,35 +366,35 @@ Section "MediaPortal core files (required)" SecCore ### AUTO-GENERATED UNINSTALLATION CODE ### # Files which were diffed before including in installer - # means all of them are in full installer, but only the changed and new ones are in git installer + # means all of them are in full installer, but only the changed and new ones are in git installer #We can not use the complete mediaportal.base dir recoursivly , because the plugins, thumbs need to be extracted to their special MPdir location # exluding only the folders does not work because /x plugins won't extract the \plugins AND musicplayer\plugins directory SetOutPath "$MPdir.Base" !ifdef HEISE_BUILD - File /nonfatal /x .git ${EXCLUDED_CONFIG_FILES} ${EXCLUDED_FILES_FOR_HEISE_BUILD} "${MEDIAPORTAL.BASE}\*" + File /nonfatal /x .git ${EXCLUDED_CONFIG_FILES} ${EXCLUDED_FILES_FOR_HEISE_BUILD} "${MEDIAPORTAL.BASE}\*" !else - File /nonfatal /x .git ${EXCLUDED_CONFIG_FILES} "${MEDIAPORTAL.BASE}\*" + File /nonfatal /x .git ${EXCLUDED_CONFIG_FILES} "${MEDIAPORTAL.BASE}\*" !endif SetOutPath "$MPdir.Base\defaults" - File /nonfatal /r /x .git "${MEDIAPORTAL.BASE}\defaults\*" + File /nonfatal /r /x .git "${MEDIAPORTAL.BASE}\defaults\*" SetOutPath "$MPdir.Base\MovieThumbnailer" - File /nonfatal /r /x .git "${MEDIAPORTAL.BASE}\MovieThumbnailer\*" + File /nonfatal /r /x .git "${MEDIAPORTAL.BASE}\MovieThumbnailer\*" SetOutPath "$MPdir.Base\MusicPlayer" - File /nonfatal /r /x .git "${MEDIAPORTAL.BASE}\MusicPlayer\*" + File /nonfatal /r /x .git "${MEDIAPORTAL.BASE}\MusicPlayer\*" SetOutPath "$MPdir.Base\Profiles" - File /nonfatal /r /x .git "${MEDIAPORTAL.BASE}\Profiles\*" + File /nonfatal /r /x .git "${MEDIAPORTAL.BASE}\Profiles\*" SetOutPath "$MPdir.Base\Wizards" - File /nonfatal /r /x .git "${MEDIAPORTAL.BASE}\Wizards\*" + File /nonfatal /r /x .git "${MEDIAPORTAL.BASE}\Wizards\*" # special MP directories SetOutPath "$MPdir.Language" - File /nonfatal /r /x .git "${MEDIAPORTAL.BASE}\language\*" + File /nonfatal /r /x .git "${MEDIAPORTAL.BASE}\language\*" SetOutPath "$MPdir.Plugins" - File /nonfatal /r /x .git "${MEDIAPORTAL.BASE}\plugins\*" + File /nonfatal /r /x .git "${MEDIAPORTAL.BASE}\plugins\*" SetOutPath "$MPdir.Skin" - File /nonfatal /r /x .git "${MEDIAPORTAL.BASE}\skin\*" + File /nonfatal /r /x .git "${MEDIAPORTAL.BASE}\skin\*" SetOutPath "$MPdir.Thumbs" - File /nonfatal /r /x .git "${MEDIAPORTAL.BASE}\thumbs\*" + File /nonfatal /r /x .git "${MEDIAPORTAL.BASE}\thumbs\*" ### AUTO-GENERATED UNINSTALLATION CODE END ### ; create empty folders @@ -422,59 +422,59 @@ Section "MediaPortal core files (required)" SecCore File /nonfatal "${MEDIAPORTAL.BASE}\scripts\VDBParserStrings.xml" SetOutPath "$MPdir.Base" - File "${git_MP}\MediaPortal.Base\MediaPortalDirs.xml" - File "${git_MP}\MediaPortal.Base\BuiltInPlugins.xml" + File "${git_MP}\MediaPortal.Base\MediaPortalDirs.xml" + File "${git_MP}\MediaPortal.Base\BuiltInPlugins.xml" ; MediaPortal.exe - File "${git_MP}\MediaPortal.Application\bin\${BUILD_TYPE}\MediaPortal.exe" - File "${git_MP}\MediaPortal.Application\bin\${BUILD_TYPE}\MediaPortal.exe.config" + File "${git_MP}\MediaPortal.Application\bin\${BUILD_TYPE}\MediaPortal.exe" + File "${git_MP}\MediaPortal.Application\bin\${BUILD_TYPE}\MediaPortal.exe.config" ; Configuration - File "${git_MP}\Configuration\bin\${BUILD_TYPE}\Configuration.exe" - File "${git_MP}\Configuration\bin\${BUILD_TYPE}\Configuration.exe.config" + File "${git_MP}\Configuration\bin\${BUILD_TYPE}\Configuration.exe" + File "${git_MP}\Configuration\bin\${BUILD_TYPE}\Configuration.exe.config" File "${git_MP}\Configuration\bin\${BUILD_TYPE}\WinCustomControls.dll" ; Core - File "${git_MP}\core\bin\${BUILD_TYPE}\Core.dll" - File "${git_Common_MP_TVE3}\DirectShowLib\bin\${BUILD_TYPE}\DirectShowLib.dll" - File "${git_MP}\core.cpp\fontEngine\bin\${BUILD_TYPE}\fontengine.dll" - File "${git_MP}\core.cpp\DirectShowHelper\bin\${BUILD_TYPE}\dshowhelper.dll" - File "${git_MP}\core.cpp\Win7RefreshRateHelper\bin\${BUILD_TYPE}\Win7RefreshRateHelper.dll" - File "${git_MP}\core.cpp\DxUtil\bin\${BUILD_TYPE}\dxutil.dll" - File "${git_MP}\core.cpp\mpc-hc_subs\bin\${BUILD_TYPE}\mpcSubs.dll" - File "${git_DirectShowFilters}\DXErr9\bin\${BUILD_TYPE}\Dxerr9.dll" - File "${git_MP}\MiniDisplayLibrary\bin\${BUILD_TYPE}\MiniDisplayLibrary.dll" + File "${git_MP}\core\bin\${BUILD_TYPE}\Core.dll" + File "${git_Common_MP_TVE3}\DirectShowLib\bin\${BUILD_TYPE}\DirectShowLib.dll" + File "${git_DirectShowFilters}\fontEngine\bin\${BUILD_TYPE}\fontengine.dll" + File "${git_DirectShowFilters}\DirectShowHelper\bin\${BUILD_TYPE}\dshowhelper.dll" + File "${git_DirectShowFilters}\Win7RefreshRateHelper\bin\${BUILD_TYPE}\Win7RefreshRateHelper.dll" + File "${git_DirectShowFilters}\DxUtil\bin\${BUILD_TYPE}\dxutil.dll" + File "${git_DirectShowFilters}\mpc-hc_subs\bin\${BUILD_TYPE}\mpcSubs.dll" + File "${git_DirectShowFilters}\DXErr9\bin\${BUILD_TYPE}\Dxerr9.dll" + File "${git_MP}\MiniDisplayLibrary\bin\${BUILD_TYPE}\MiniDisplayLibrary.dll" ; Utils - File "${git_MP}\Utils\bin\${BUILD_TYPE}\Utils.dll" + File "${git_MP}\Utils\bin\${BUILD_TYPE}\Utils.dll" ; Common Utils - File "${git_Common_MP_TVE3}\Common.Utils\bin\${BUILD_TYPE}\Common.Utils.dll" + File "${git_Common_MP_TVE3}\Common.Utils\bin\${BUILD_TYPE}\Common.Utils.dll" ; Support - File "${git_MP}\MediaPortal.Support\bin\${BUILD_TYPE}\MediaPortal.Support.dll" + File "${git_MP}\MediaPortal.Support\bin\${BUILD_TYPE}\MediaPortal.Support.dll" ; Databases - File "${git_MP}\databases\bin\${BUILD_TYPE}\Databases.dll" + File "${git_MP}\databases\bin\${BUILD_TYPE}\Databases.dll" ; MusicShareWatcher - File "${git_MP}\ProcessPlugins\MusicShareWatcher\MusicShareWatcher\bin\${BUILD_TYPE}\MusicShareWatcher.exe" - File "${git_MP}\ProcessPlugins\MusicShareWatcher\MusicShareWatcherHelper\bin\${BUILD_TYPE}\MusicShareWatcherHelper.dll" + File "${git_MP}\ProcessPlugins\MusicShareWatcher\MusicShareWatcher\bin\${BUILD_TYPE}\MusicShareWatcher.exe" + File "${git_MP}\ProcessPlugins\MusicShareWatcher\MusicShareWatcherHelper\bin\${BUILD_TYPE}\MusicShareWatcherHelper.dll" ; WatchDog - File "${git_MP}\WatchDog\bin\${BUILD_TYPE}\WatchDog.exe" - File "${git_MP}\WatchDog\bin\${BUILD_TYPE}\DaggerLib.dll" - File "${git_MP}\WatchDog\bin\${BUILD_TYPE}\DaggerLib.DSGraphEdit.dll" - File "${git_MP}\WatchDog\bin\${BUILD_TYPE}\DirectShowLib-2005.dll" - File "${git_MP}\WatchDog\bin\${BUILD_TYPE}\MediaFoundation.dll" + File "${git_MP}\WatchDog\bin\${BUILD_TYPE}\WatchDog.exe" + File "${git_MP}\WatchDog\bin\${BUILD_TYPE}\DaggerLib.dll" + File "${git_MP}\WatchDog\bin\${BUILD_TYPE}\DaggerLib.DSGraphEdit.dll" + File "${git_MP}\WatchDog\bin\${BUILD_TYPE}\DirectShowLib-2005.dll" + File "${git_MP}\WatchDog\bin\${BUILD_TYPE}\MediaFoundation.dll" ; MP Tray - File "${git_MP}\MPTray\bin\${BUILD_TYPE}\MPTray.exe" + File "${git_MP}\MPTray\bin\${BUILD_TYPE}\MPTray.exe" ; Plugins - File "${git_MP}\RemotePlugins\bin\${BUILD_TYPE}\RemotePlugins.dll" - File "${git_MP}\RemotePlugins\Remotes\HcwRemote\HCWHelper\bin\${BUILD_TYPE}\HcwHelper.exe" - File "${git_MP}\RemotePlugins\Remotes\X10Remote\Interop.X10.dll" + File "${git_MP}\RemotePlugins\bin\${BUILD_TYPE}\RemotePlugins.dll" + File "${git_MP}\RemotePlugins\Remotes\HcwRemote\HCWHelper\bin\${BUILD_TYPE}\HcwHelper.exe" + File "${git_MP}\RemotePlugins\Remotes\X10Remote\Interop.X10.dll" SetOutPath "$MPdir.Plugins\ExternalPlayers" - File "${git_MP}\ExternalPlayers\bin\${BUILD_TYPE}\ExternalPlayers.dll" + File "${git_MP}\ExternalPlayers\bin\${BUILD_TYPE}\ExternalPlayers.dll" SetOutPath "$MPdir.Plugins\process" - File "${git_MP}\ProcessPlugins\bin\${BUILD_TYPE}\ProcessPlugins.dll" + File "${git_MP}\ProcessPlugins\bin\${BUILD_TYPE}\ProcessPlugins.dll" SetOutPath "$MPdir.Plugins\subtitle" - File "${git_MP}\SubtitlePlugins\bin\${BUILD_TYPE}\SubtitlePlugins.dll" + File "${git_MP}\SubtitlePlugins\bin\${BUILD_TYPE}\SubtitlePlugins.dll" SetOutPath "$MPdir.Plugins\Windows" - File "${git_MP}\Dialogs\bin\${BUILD_TYPE}\Dialogs.dll" - File "${git_MP}\WindowPlugins\bin\${BUILD_TYPE}\WindowPlugins.dll" + File "${git_MP}\Dialogs\bin\${BUILD_TYPE}\Dialogs.dll" + File "${git_MP}\WindowPlugins\bin\${BUILD_TYPE}\WindowPlugins.dll" ; Doc SetOutPath "$MPdir.Base\Docs" - File "${git_MP}\Docs\BASS License.txt" + File "${git_MP}\Docs\BASS License.txt" File "${git_MP}\Docs\MediaPortal License.rtf" ; libbluray SetOutPath "$MPdir.Base" @@ -482,18 +482,18 @@ Section "MediaPortal core files (required)" SecCore ; TvLibrary for Genre File "${git_TVServer}\TvLibrary.Interfaces\bin\${BUILD_TYPE}\TvLibrary.Interfaces.dll" ; MediaPortal.exe - + #--------------------------------------------------------------------------- # FILTER REGISTRATION # for more information see: http://nsis.sourceforge.net/Docs/AppendixB.html #--------------------------------------------------------------------------- SetOutPath "$MPdir.Base" ;filter used for SVCD and VCD playback - !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "${git_DirectShowFilters}\bin\Release\cdxareader.ax" "$MPdir.Base\cdxareader.ax" "$MPdir.Base" + !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "${git_DirectShowFilters}\bin\Release\cdxareader.ax" "$MPdir.Base\cdxareader.ax" "$MPdir.Base" ; used for channels with two mono languages in one stereo streams - !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "${git_DirectShowFilters}\MPAudioswitcher\bin\${BUILD_TYPE}\MPAudioSwitcher.ax" "$MPdir.Base\MPAudioSwitcher.ax" "$MPdir.Base" + !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "${git_DirectShowFilters}\MPAudioswitcher\bin\${BUILD_TYPE}\MPAudioSwitcher.ax" "$MPdir.Base\MPAudioSwitcher.ax" "$MPdir.Base" ; used for digital tv - !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "${git_DirectShowFilters}\TsReader\bin\${BUILD_TYPE}\TsReader.ax" "$MPdir.Base\TsReader.ax" "$MPdir.Base" + !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "${git_DirectShowFilters}\TsReader\bin\${BUILD_TYPE}\TsReader.ax" "$MPdir.Base\TsReader.ax" "$MPdir.Base" WriteRegStr HKCR "Media Type\Extensions\.ts" "Source Filter" "{b9559486-e1bb-45d3-a2a2-9a7afe49b23f}" WriteRegStr HKCR "Media Type\Extensions\.tp" "Source Filter" "{b9559486-e1bb-45d3-a2a2-9a7afe49b23f}" WriteRegStr HKCR "Media Type\Extensions\.tsbuffer" "Source Filter" "{b9559486-e1bb-45d3-a2a2-9a7afe49b23f}" @@ -566,7 +566,7 @@ SectionEnd ${EndIf} ### AUTO-GENERATED UNINSTALLATION CODE ### - !include "${git_MP}\Setup\uninstall.nsh" + !include "${git_MP}\Setup\uninstall.nsh" ### AUTO-GENERATED UNINSTALLATION CODE END ### @@ -653,10 +653,10 @@ Section "-Powerscheduler Client plugin" SecPowerScheduler ${LOG_TEXT} "INFO" "Installing Powerscheduler client plugin..." SetOutPath "$MPdir.Base" - File "${git_Common_MP_TVE3}\PowerScheduler.Interfaces\bin\${BUILD_TYPE}\PowerScheduler.Interfaces.dll" + File "${git_Common_MP_TVE3}\PowerScheduler.Interfaces\bin\${BUILD_TYPE}\PowerScheduler.Interfaces.dll" SetOutPath "$MPdir.Plugins\Process" - File "${git_MP}\PowerSchedulerClientPlugin\bin\${BUILD_TYPE}\PowerSchedulerClientPlugin.dll" + File "${git_MP}\PowerSchedulerClientPlugin\bin\${BUILD_TYPE}\PowerSchedulerClientPlugin.dll" SectionEnd !macro Remove_${SecPowerScheduler} ${LOG_TEXT} "INFO" "Uninstalling Powerscheduler client plugin..." @@ -671,9 +671,9 @@ Section "-MediaPortal Extension Installer" SecMpeInstaller ; install files SetOutPath "$MPdir.Base" - File "${git_MP}\MPE\MpeCore\bin\${BUILD_TYPE}\MpeCore.dll" - File "${git_MP}\MPE\MpeInstaller\bin\${BUILD_TYPE}\MpeInstaller.exe" - File "${git_MP}\MPE\MpeMaker\bin\${BUILD_TYPE}\MpeMaker.exe" + File "${git_MP}\MPE\MpeCore\bin\${BUILD_TYPE}\MpeCore.dll" + File "${git_MP}\MPE\MpeInstaller\bin\${BUILD_TYPE}\MpeInstaller.exe" + File "${git_MP}\MPE\MpeMaker\bin\${BUILD_TYPE}\MpeMaker.exe" ; create startmenu shortcuts ${If} $noDesktopSC != 1 @@ -1078,4 +1078,4 @@ FunctionEnd #--------------------------------------------------------------------------- # SECTION DESCRIPTIONS -#--------------------------------------------------------------------------- +#---------------------------------------------------------------------------