Skip to content

Commit

Permalink
[buildsteps/depends] Update paths
Browse files Browse the repository at this point in the history
  • Loading branch information
@hudokkow
hudokkow committed Sep 16, 2016
1 parent ad8c0af commit cbd69e8
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 25 deletions.
6 changes: 3 additions & 3 deletions tools/buildsteps/android/make-binary-addons
View file
Expand Up @@ -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
Expand All @@ -28,8 +28,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
2 changes: 1 addition & 1 deletion tools/buildsteps/android/prepare-depends
View file
Expand Up @@ -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" ]
Expand Down
6 changes: 3 additions & 3 deletions tools/buildsteps/androidx86/make-binary-addons
View file
Expand Up @@ -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
Expand All @@ -28,8 +28,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
2 changes: 1 addition & 1 deletion tools/buildsteps/androidx86/prepare-depends
View file
Expand Up @@ -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" ]
Expand Down
6 changes: 3 additions & 3 deletions tools/buildsteps/ios/make-binary-addons
View file
Expand Up @@ -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
Expand All @@ -27,8 +27,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
2 changes: 1 addition & 1 deletion tools/buildsteps/ios/prepare-depends
View file
Expand Up @@ -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" ]
Expand Down
6 changes: 3 additions & 3 deletions tools/buildsteps/linux64/make-binary-addons
View file
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion tools/buildsteps/linux64/prepare-depends
View file
Expand Up @@ -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" ]
Expand Down
6 changes: 3 additions & 3 deletions tools/buildsteps/osx64/make-binary-addons
View file
Expand Up @@ -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
Expand All @@ -27,8 +27,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
2 changes: 1 addition & 1 deletion tools/buildsteps/osx64/prepare-depends
View file
Expand Up @@ -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" ]
Expand Down
6 changes: 3 additions & 3 deletions tools/buildsteps/rbpi/make-binary-addons
View file
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion tools/buildsteps/rbpi/prepare-depends
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/depends/xbmc-addons.include
View file
@@ -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)
Expand Down

0 comments on commit cbd69e8

Please sign in to comment.