sync with upstream

1 files changed, 11 insertions, 10 deletions

diff --git a/scripts/sync_buildenv.sh b/scripts/sync_buildenv.sh
index e22d052..7b032db 100755
--- a/scripts/sync_buildenv.sh
+++ b/scripts/sync_buildenv.sh
@@ -3,9 +3,10 @@
 rbase="/root/kodi/xbmc.git"
 
 for p in \
-  "project/cmake" \
+  "cmake" \
   "version.txt" \
-  "xbmc/addons/addon-bindings.mk"
+  "xbmc/addons/addon-bindings.mk" \
+  "xbmc/addons/kodi-addon-dev-kit"
 do
   d="$p"
   [ -d "$p" ] && d=$(dirname "$p")/
@@ -15,7 +16,7 @@ do
   git add $d
 done
 
-for f in $(cat xbmc/addons/addon-bindings.mk | grep BINDINGS | sed -e 's/BINDINGS[+ ]=//')
+for f in $(cat xbmc/addons/addon-bindings.mk | grep '^[^#]')
 do
   d=$(dirname "$f")/
 
@@ -26,17 +27,17 @@ do
 done
 
 branch=$(git rev-parse --abbrev-ref HEAD)
-mkdir -p project/cmake/addons/addons/pvr.dvbviewer
-echo -n "pvr.dvbviewer https://github.com/manuelm/pvr.dvbviewer $branch" > project/cmake/addons/addons/pvr.dvbviewer/pvr.dvbviewer.txt
-echo -n "all" > project/cmake/addons/addons/pvr.dvbviewer/platforms.txt
-git add project/cmake/addons/addons/
+mkdir -p cmake/addons/addons/pvr.dvbviewer
+echo -n "pvr.dvbviewer https://github.com/manuelm/pvr.dvbviewer $branch" > cmake/addons/addons/pvr.dvbviewer/pvr.dvbviewer.txt
+echo -n "all" > cmake/addons/addons/pvr.dvbviewer/platforms.txt
+git add cmake/addons/addons/pvr.dvbviewer
 
 # fix build bugs
-for f in project/cmake/scripts/windows/CFlagOverrides.cmake project/cmake/scripts/windows/CXXFlagOverrides.cmake
+for f in cmake/scripts/windows/CFlagOverrides.cmake cmake/scripts/windows/CXXFlagOverrides.cmake
 do
   sed -i -re 's#CMAKE_C(XX)?_FLAGS(_(DEBUG|RELEASE))? #CMAKE_C\1_FLAGS\2_INIT #' $f
   git add $f
 done
 
-sed -i -e 's#${LIBRARY_DIR}/${target}.pdb#$<TARGET_PDB_FILE:${target}>#' project/cmake/scripts/common/AddonHelpers.cmake
-git add project/cmake/scripts/common/AddonHelpers.cmake
+sed -i -e 's#${LIBRARY_DIR}/${target}.pdb#$<TARGET_PDB_FILE:${target}>#' cmake/scripts/common/AddonHelpers.cmake
+git add cmake/scripts/common/AddonHelpers.cmake