From acadc2f0fe43a5e39bb21e38ae36de34bcc3fb81 Mon Sep 17 00:00:00 2001 From: AchimTuran Date: Mon, 11 Jul 2016 18:49:21 +0200 Subject: [PATCH] [windows][buildtools] Add option to install add-ons into a seperate path --- tools/windows/buildtools/build_addon.cmd | 9 ++++++++- tools/windows/buildtools/package_addon.cmd | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/tools/windows/buildtools/build_addon.cmd b/tools/windows/buildtools/build_addon.cmd index 1ac566d4c6ca0..788fedeb985f9 100644 --- a/tools/windows/buildtools/build_addon.cmd +++ b/tools/windows/buildtools/build_addon.cmd @@ -6,6 +6,12 @@ if "%kodi_src%" EQU "" ( set kodi_src=%1% ) +if not "%2%" EQU "" ( +set addon_install=%2% +) else ( +set addon_install=%kodi_src%\addons +) + set addon_folder=%cd% echo using %kodi_src% to build workspace for add-on: %addon_id% @@ -20,8 +26,9 @@ cd %addon_folder%\build :: use / delimiter for paths to make CMake happy set cmake_addon_folder=%addon_folder:\=/% set cmake_kodi_src=%kodi_src:\=/% +set cmake_addon_install=%addon_install:\=/% -cmake -G "Visual Studio 14 2015" -DADDONS_TO_BUILD="%addon_id%" -DADDON_SRC_PREFIX="%cmake_addon_folder%\.." -DADDONS_DEFINITION_DIR="%cmake_addon_folder%\..\repo-binary-addons" -DCMAKE_INSTALL_PREFIX="%cmake_kodi_src%/addons" -DCMAKE_VERBOSE_MAKEFILE=ON -DPACKAGE_ZIP=ON "%cmake_kodi_src%\project\cmake\addons" +cmake -G "Visual Studio 14 2015" -DADDONS_TO_BUILD="%addon_id%" -DADDON_SRC_PREFIX="%cmake_addon_folder%/.." -DADDONS_DEFINITION_DIR="%cmake_addon_folder%/../repo-binary-addons" -DCMAKE_INSTALL_PREFIX="%cmake_addon_install%" -DCMAKE_VERBOSE_MAKEFILE=ON -DPACKAGE_ZIP=ON "%cmake_kodi_src%/project/cmake/addons" msbuild package-%addon_id%.vcxproj /p:Configuration=Debug diff --git a/tools/windows/buildtools/package_addon.cmd b/tools/windows/buildtools/package_addon.cmd index eac7333037aee..a219fee83236d 100644 --- a/tools/windows/buildtools/package_addon.cmd +++ b/tools/windows/buildtools/package_addon.cmd @@ -6,6 +6,12 @@ if "%kodi_src%" EQU "" ( set kodi_src=%1% ) +if not "%2%" EQU "" ( +set addon_install=%2% +) else ( +set addon_install=%kodi_src%\addons +) + set addon_folder=%cd% echo using %kodi_src% to package add-on: %addon_id% @@ -20,8 +26,9 @@ cd %addon_folder%\package\build :: use / delimiter for paths to make CMake happy set cmake_addon_folder=%addon_folder:\=/% set cmake_kodi_src=%kodi_src:\=/% +set cmake_addon_install=%addon_install:\=/% -cmake -G "NMake Makefiles" -DADDONS_TO_BUILD="%addon_id%" -DADDON_SRC_PREFIX="%cmake_addon_folder%/.." -DADDONS_DEFINITION_DIR="%cmake_addon_folder%/../../repo-binary-addons" -DCMAKE_INSTALL_PREFIX="%cmake_kodi_src%/addons" -DCMAKE_VERBOSE_MAKEFILE=ON -DPACKAGE_ZIP=ON -DPACKAGE_DIR=%cmake_addon_folder%/package -DCMAKE_BUILD_TYPE=Release "%cmake_kodi_src%/project/cmake/addons" +cmake -G "NMake Makefiles" -DADDONS_TO_BUILD="%addon_id%" -DADDON_SRC_PREFIX="%cmake_addon_folder%/.." -DADDONS_DEFINITION_DIR="%cmake_addon_folder%/../repo-binary-addons" -DCMAKE_INSTALL_PREFIX="%cmake_addon_install%" -DCMAKE_VERBOSE_MAKEFILE=ON -DPACKAGE_ZIP=ON -DPACKAGE_DIR=%cmake_addon_folder%/package -DCMAKE_BUILD_TYPE=Release "%cmake_kodi_src%/project/cmake/addons" %cmake_kodi_src%/tools/windows/buildtools/jom.exe -j8 %addon_id% %cmake_kodi_src%/tools/windows/buildtools/jom.exe -j8 package-%addon_id%