[autotools/buildsteps/depends] Update paths

xbmc · Oct 21, 2016 · ea1f1c1 · ea1f1c1
1 parent 411d354
commit ea1f1c1
Show file tree

Hide file tree

Showing 22 changed files with 36 additions and 36 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -573,7 +573,7 @@ endif
 	@install -d $(DESTDIR)$(includedir)/@APP_NAME_LC@
 	@install -m 0644 $(BINDINGS) $(DESTDIR)$(includedir)/@APP_NAME_LC@
 	@install -d $(DESTDIR)$(libdir)/@APP_NAME_LC@
-	@install -m 0644 project/cmake/*.cmake project/cmake/scripts/common/*.cmake $(DESTDIR)$(libdir)/@APP_NAME_LC@
+	@install -m 0644 cmake/*.cmake cmake/scripts/common/*.cmake $(DESTDIR)$(libdir)/@APP_NAME_LC@
 	@cd $(DESTDIR)$(includedir); [ -L xbmc ] || [ -d xbmc ] || ln -s @APP_NAME_LC@ xbmc
 
 uninstall:

diff --git a/configure.ac b/configure.ac
@@ -2220,7 +2220,7 @@ OUTPUT_FILES="Makefile \
     tools/darwin/packaging/migrate_to_kodi_ios.sh \
     xbmc/platform/darwin/osx/Info.plist \
     xbmc/platform/darwin/ios/Info.plist \
-    project/cmake/KodiConfig.cmake \
+    cmake/KodiConfig.cmake \
     tools/android/packaging/xbmc/AndroidManifest.xml \
     tools/android/packaging/Makefile \
     tools/android/packaging/xbmc/src/org/xbmc/kodi/Splash.java \

diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat
@@ -102,7 +102,7 @@ set WORKSPACE=%CD%\..\..\kodi-build
   MKDIR %WORKSPACE%
   PUSHD %WORKSPACE%
 
-  cmake.exe -G "Visual Studio 14" %base_dir%\project\cmake
+  cmake.exe -G "Visual Studio 14" %base_dir%
   IF %errorlevel%==1 (
     set DIETEXT="%APP_NAME%.EXE failed to build!"
     goto DIE

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/tools/depends/target/cmakebuildsys/Makefile b/tools/depends/target/cmakebuildsys/Makefile
@@ -5,7 +5,7 @@ APP_NAME=$(shell awk '/APP_NAME/ {print tolower($$2)}' $(VERSION.TXT))
 
 all:
 	mkdir -p $(CORE_SOURCE_DIR)/build
-	cd $(CORE_SOURCE_DIR)/build; $(CMAKE) -DCMAKE_BUILD_TYPE=$(Configuration) $(CORE_SOURCE_DIR)/project/cmake
+	cd $(CORE_SOURCE_DIR)/build; $(CMAKE) -DCMAKE_BUILD_TYPE=$(Configuration) $(CORE_SOURCE_DIR)
 
 clean:
 	cd $(CORE_SOURCE_DIR)/build; $(MAKE) clean

diff --git a/tools/depends/xbmc-addons.include b/tools/depends/xbmc-addons.include
@@ -1,6 +1,6 @@
 ADDON_DEPS_DIR := $(BUILDDIR)/$(PLATFORM)/build/depends
 TOOLCHAIN_FILE = $(ADDON_DEPS_DIR)/share/Toolchain_binaddons.cmake
-ADDON_PROJECT_DIR = $(BUILDDIR)/../../../../project/cmake/addons
+ADDON_PROJECT_DIR = $(BUILDDIR)/../../cmake/addons
 
 ifeq ($(CROSS_COMPILING),yes)
   DEPS = $(TOOLCHAIN_FILE) $(abs_top_srcdir)/target/config-binaddons.site $(abs_top_srcdir)/target/Toolchain_binaddons.cmake $(CONFIG_SUB) $(CONFIG_GUESS)

diff --git a/tools/windows/prepare-binary-addons-dev.bat b/tools/windows/prepare-binary-addons-dev.bat
@@ -28,7 +28,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