[autotools/buildsteps/depends] Update paths

16 files changed, 31 insertions, 31 deletions

diff --git a/tools/buildsteps/android-arm64-v8a/make-binary-addons b/tools/buildsteps/android-arm64-v8a/make-binary-addons
index 19a9d85bac..3d5e0a30f4 100644
--- a/tools/buildsteps/android-arm64-v8a/make-binary-addons
+++ b/tools/buildsteps/android-arm64-v8a/make-binary-addons
@@ -5,7 +5,7 @@ XBMC_PLATFORM_DIR=android
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
 #clear the build failed file
-rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+rm -f $WORKSPACE/cmake/$FAILED_BUILD_FILENAME
 
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons when requested by env/jenkins
@@ -24,8 +24,8 @@ fi
 
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
-  tagSuccessFulBuild $WORKSPACE/project/cmake
+  tagSuccessFulBuild $WORKSPACE/cmake
 else
   #mark the build failure in the filesystem but leave jenkins running
-  tagFailedBuild $WORKSPACE/project/cmake
+  tagFailedBuild $WORKSPACE/cmake
 fi
diff --git a/tools/buildsteps/android-arm64-v8a/prepare-depends b/tools/buildsteps/android-arm64-v8a/prepare-depends
index 933ea4592e..b4d02b7a2e 100644
--- a/tools/buildsteps/android-arm64-v8a/prepare-depends
+++ b/tools/buildsteps/android-arm64-v8a/prepare-depends
@@ -4,7 +4,7 @@ XBMC_PLATFORM_DIR=android
 
 #clean without depends for skipping depends build if possible
 #also skip binary addons (pvr, audioencoder) as long as they are deployed in tree
-cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
+cd $WORKSPACE;git clean -xfd -e "cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
 
 # if depends path has changed - cleanout everything and do a full rebuild
 if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
diff --git a/tools/buildsteps/android/make-binary-addons b/tools/buildsteps/android/make-binary-addons
index 123f55da68..76bba45ec8 100644
--- a/tools/buildsteps/android/make-binary-addons
+++ b/tools/buildsteps/android/make-binary-addons
@@ -5,7 +5,7 @@ XBMC_PLATFORM_DIR=android
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends 
 
 #clear the build failed file
-rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+rm -f $WORKSPACE/cmake/$FAILED_BUILD_FILENAME
 
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons when requested by env/jenkins
@@ -24,8 +24,8 @@ fi
 
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
-  tagSuccessFulBuild $WORKSPACE/project/cmake
+  tagSuccessFulBuild $WORKSPACE/cmake
 else
   #mark the build failure in the filesystem but leave jenkins running
-  tagFailedBuild $WORKSPACE/project/cmake
+  tagFailedBuild $WORKSPACE/cmake
 fi
diff --git a/tools/buildsteps/android/prepare-depends b/tools/buildsteps/android/prepare-depends
index 933ea4592e..b4d02b7a2e 100644
--- a/tools/buildsteps/android/prepare-depends
+++ b/tools/buildsteps/android/prepare-depends
@@ -4,7 +4,7 @@ XBMC_PLATFORM_DIR=android
 
 #clean without depends for skipping depends build if possible
 #also skip binary addons (pvr, audioencoder) as long as they are deployed in tree
-cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
+cd $WORKSPACE;git clean -xfd -e "cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
 
 # if depends path has changed - cleanout everything and do a full rebuild
 if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
diff --git a/tools/buildsteps/androidx86/make-binary-addons b/tools/buildsteps/androidx86/make-binary-addons
index 19a9d85bac..3d5e0a30f4 100644
--- a/tools/buildsteps/androidx86/make-binary-addons
+++ b/tools/buildsteps/androidx86/make-binary-addons
@@ -5,7 +5,7 @@ XBMC_PLATFORM_DIR=android
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
 #clear the build failed file
-rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+rm -f $WORKSPACE/cmake/$FAILED_BUILD_FILENAME
 
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons when requested by env/jenkins
@@ -24,8 +24,8 @@ fi
 
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
-  tagSuccessFulBuild $WORKSPACE/project/cmake
+  tagSuccessFulBuild $WORKSPACE/cmake
 else
   #mark the build failure in the filesystem but leave jenkins running
-  tagFailedBuild $WORKSPACE/project/cmake
+  tagFailedBuild $WORKSPACE/cmake
 fi
diff --git a/tools/buildsteps/androidx86/prepare-depends b/tools/buildsteps/androidx86/prepare-depends
index 933ea4592e..b4d02b7a2e 100644
--- a/tools/buildsteps/androidx86/prepare-depends
+++ b/tools/buildsteps/androidx86/prepare-depends
@@ -4,7 +4,7 @@ XBMC_PLATFORM_DIR=android
 
 #clean without depends for skipping depends build if possible
 #also skip binary addons (pvr, audioencoder) as long as they are deployed in tree
-cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
+cd $WORKSPACE;git clean -xfd -e "cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
 
 # if depends path has changed - cleanout everything and do a full rebuild
 if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
diff --git a/tools/buildsteps/ios/make-binary-addons b/tools/buildsteps/ios/make-binary-addons
index c0651fc413..3f5bd0299b 100755
--- a/tools/buildsteps/ios/make-binary-addons
+++ b/tools/buildsteps/ios/make-binary-addons
@@ -5,7 +5,7 @@ XBMC_PLATFORM_DIR=ios
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
 #clear the build failed file
-rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+rm -f $WORKSPACE/cmake/$FAILED_BUILD_FILENAME
 
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons when requested by env/jenkins
@@ -23,8 +23,8 @@ fi
 
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
-  tagSuccessFulBuild $WORKSPACE/project/cmake
+  tagSuccessFulBuild $WORKSPACE/cmake
 else
   #mark the build failure in the filesystem but leave jenkins running
-  tagFailedBuild $WORKSPACE/project/cmake
+  tagFailedBuild $WORKSPACE/cmake
 fi
diff --git a/tools/buildsteps/ios/prepare-depends b/tools/buildsteps/ios/prepare-depends
index 01aa9ed766..3b6a893605 100755
--- a/tools/buildsteps/ios/prepare-depends
+++ b/tools/buildsteps/ios/prepare-depends
@@ -4,7 +4,7 @@ XBMC_PLATFORM_DIR=ios
 
 #clean without depends for skipping depends build if possible
 #also skip binary addons (pvr, audioencoder) as long as they are deployed in tree
-cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
+cd $WORKSPACE;git clean -xfd -e "cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
 
 # if depends path has changed - cleanout everything and do a full rebuild
 if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
diff --git a/tools/buildsteps/linux64/make-binary-addons b/tools/buildsteps/linux64/make-binary-addons
index beda7297f0..5c58675ee7 100755
--- a/tools/buildsteps/linux64/make-binary-addons
+++ b/tools/buildsteps/linux64/make-binary-addons
@@ -5,7 +5,7 @@ XBMC_PLATFORM_DIR=linux64
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
 #clear the build failed file
-rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+rm -f $WORKSPACE/cmake/$FAILED_BUILD_FILENAME
 
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons when requested by env/jenkins
@@ -21,8 +21,8 @@ fi
 
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
-  tagSuccessFulBuild $WORKSPACE/project/cmake
+  tagSuccessFulBuild $WORKSPACE/cmake
 else
   #mark the build failure in the filesystem but leave jenkins running
-  tagFailedBuild $WORKSPACE/project/cmake
+  tagFailedBuild $WORKSPACE/cmake
 fi
diff --git a/tools/buildsteps/linux64/prepare-depends b/tools/buildsteps/linux64/prepare-depends
index ae0a027a06..6064a17f79 100755
--- a/tools/buildsteps/linux64/prepare-depends
+++ b/tools/buildsteps/linux64/prepare-depends
@@ -4,7 +4,7 @@ XBMC_PLATFORM_DIR=linux64
 
 #clean without depends for skipping depends build if possible
 #also skip binary addons (pvr, audioencoder) as long as they are deployed in tree
-cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
+cd $WORKSPACE;git clean -xfd -e "cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
 
 # if depends path has changed - cleanout everything and do a full rebuild
 if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
diff --git a/tools/buildsteps/osx64/make-binary-addons b/tools/buildsteps/osx64/make-binary-addons
index c12a42ac20..fd0bd7a66e 100755
--- a/tools/buildsteps/osx64/make-binary-addons
+++ b/tools/buildsteps/osx64/make-binary-addons
@@ -5,7 +5,7 @@ XBMC_PLATFORM_DIR=osx64
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
 #clear the build failed file
-rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+rm -f $WORKSPACE/cmake/$FAILED_BUILD_FILENAME
 
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons when requested by env/jenkins
@@ -23,8 +23,8 @@ fi
 
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
-  tagSuccessFulBuild $WORKSPACE/project/cmake
+  tagSuccessFulBuild $WORKSPACE/cmake
 else
   #mark the build failure in the filesystem but leave jenkins running
-  tagFailedBuild $WORKSPACE/project/cmake
+  tagFailedBuild $WORKSPACE/cmake
 fi
diff --git a/tools/buildsteps/osx64/prepare-depends b/tools/buildsteps/osx64/prepare-depends
index 60df95379d..8aba95ec02 100755
--- a/tools/buildsteps/osx64/prepare-depends
+++ b/tools/buildsteps/osx64/prepare-depends
@@ -4,7 +4,7 @@ XBMC_PLATFORM_DIR=osx64
 
 #clean without depends for skipping depends build if possible
 #also skip binary addons (pvr, audioencoder) as long as they are deployed in tree
-cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
+cd $WORKSPACE;git clean -xfd -e "cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
 
 # if depends path has changed - cleanout everything and do a full rebuild
 if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
diff --git a/tools/buildsteps/rbpi/make-binary-addons b/tools/buildsteps/rbpi/make-binary-addons
index d55f79aba1..862e7d79e9 100755
--- a/tools/buildsteps/rbpi/make-binary-addons
+++ b/tools/buildsteps/rbpi/make-binary-addons
@@ -5,7 +5,7 @@ XBMC_PLATFORM_DIR=rbpi
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
 #clear the build failed file
-rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+rm -f $WORKSPACE/cmake/$FAILED_BUILD_FILENAME
 
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons when requested by env/jenkins
@@ -21,8 +21,8 @@ fi
 
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
-  tagSuccessFulBuild $WORKSPACE/project/cmake
+  tagSuccessFulBuild $WORKSPACE/cmake
 else
   #mark the build failure in the filesystem but leave jenkins running
-  tagFailedBuild $WORKSPACE/project/cmake
+  tagFailedBuild $WORKSPACE/cmake
 fi
diff --git a/tools/buildsteps/rbpi/prepare-depends b/tools/buildsteps/rbpi/prepare-depends
index 8205432d65..c38eb77901 100755
--- a/tools/buildsteps/rbpi/prepare-depends
+++ b/tools/buildsteps/rbpi/prepare-depends
@@ -4,7 +4,7 @@ XBMC_PLATFORM_DIR=rbpi
 
 #clean without depends for skipping depends build if possible
 #also skip binary addons (pvr, audioencoder) as long as they are deployed in tree
-cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
+cd $WORKSPACE;git clean -xfd -e "cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
 
 if [ -d $JENKINS_RBPI_DEVENV/firmware ]
 then
diff --git a/tools/buildsteps/win32/bootstrap-addons.bat b/tools/buildsteps/win32/bootstrap-addons.bat
index 1e1d59ae3b..912c6bdc1f 100644
--- a/tools/buildsteps/win32/bootstrap-addons.bat
+++ b/tools/buildsteps/win32/bootstrap-addons.bat
@@ -33,7 +33,7 @@ IF "%WORKDIR%" == "" (
 
 rem setup some paths that we need later
 SET CUR_PATH=%CD%
-SET BASE_PATH=%WORKDIR%\project\cmake
+SET BASE_PATH=%WORKDIR%\cmake
 SET ADDONS_PATH=%BASE_PATH%\addons
 SET ADDONS_BOOTSTRAP_PATH=%ADDONS_PATH%\bootstrap
 SET BOOTSTRAP_BUILD_PATH=%ADDONS_PATH%\build\bootstrap
diff --git a/tools/buildsteps/win32/make-addons.bat b/tools/buildsteps/win32/make-addons.bat
index 04ef0de25b..6329dcae36 100644
--- a/tools/buildsteps/win32/make-addons.bat
+++ b/tools/buildsteps/win32/make-addons.bat
@@ -39,7 +39,7 @@ IF "%WORKDIR%" == "" (
 
 rem setup some paths that we need later
 SET CUR_PATH=%CD%
-SET BASE_PATH=%WORKDIR%\project\cmake
+SET BASE_PATH=%WORKDIR%\cmake
 SET SCRIPTS_PATH=%BASE_PATH%\scripts\windows
 SET ADDONS_PATH=%BASE_PATH%\addons
 SET ADDON_DEPENDS_PATH=%ADDONS_PATH%\output
@@ -108,7 +108,7 @@ cmake "%ADDONS_PATH%" -G "NMake Makefiles" ^
       -DCMAKE_USER_MAKE_RULES_OVERRIDE="%SCRIPTS_PATH%/CFlagOverrides.cmake" ^
       -DCMAKE_USER_MAKE_RULES_OVERRIDE_CXX="%SCRIPTS_PATH%/CXXFlagOverrides.cmake" ^
       -DCMAKE_INSTALL_PREFIX=%ADDONS_INSTALL_PATH% ^
-      -DCORE_SOURCE_DIR=%WORKDIR% ^
+      -DCMAKE_SOURCE_DIR=%WORKDIR% ^
       -DBUILD_DIR=%ADDONS_BUILD_PATH% ^
       -DADDON_DEPENDS_PATH=%ADDON_DEPENDS_PATH% ^
       -DPACKAGE_ZIP=ON ^