Skip to content

Commit

Permalink
[jenkins/buildsteps] disable debug in depends in Release builds
Browse files Browse the repository at this point in the history
  • Loading branch information
wsnipex committed Oct 19, 2016
1 parent ee0c9f1 commit d493b1c
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion tools/buildsteps/android-arm64-v8a/configure-depends
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ then
$(if [ "$SDK_VERSION" != "Default" ]; then echo --with-sdk=android-$SDK_VERSION;fi) \
--with-toolchain=$TOOLCHAIN \
--prefix=$XBMC_DEPENDS_ROOT \
--enable-neon
--enable-neon $DEBUG_SWITCH
fi
2 changes: 1 addition & 1 deletion tools/buildsteps/android/configure-depends
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ then
$(if [ "$SDK_VERSION" != "Default" ]; then echo --with-sdk=android-$SDK_VERSION;fi) \
--with-toolchain=$TOOLCHAIN \
--prefix=$XBMC_DEPENDS_ROOT \
--enable-neon
--enable-neon $DEBUG_SWITCH
fi
2 changes: 1 addition & 1 deletion tools/buildsteps/androidx86/configure-depends
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ then
--with-ndk=$NDK_PATH \
$(if [ "$SDK_VERSION" != "Default" ]; then echo --with-sdk=android-$SDK_VERSION;fi) \
--with-toolchain=$TOOLCHAIN \
--prefix=$XBMC_DEPENDS_ROOT
--prefix=$XBMC_DEPENDS_ROOT $DEBUG_SWITCH
fi
5 changes: 5 additions & 0 deletions tools/buildsteps/defaultenv
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ then
Configuration=$DEFAULT_CONFIGURATION
fi

if [ "$Configuration" == "Release" ]
then
DEBUG_SWITCH='--disable-debug'
fi

#helper functions

#hash a dir based on the git revision, SDK_PATH, NDK_PATH, NDK_VERSION, SDK_VERSION, TOOLCHAIN and XBMC_DEPENDS_ROOT
Expand Down
2 changes: 1 addition & 1 deletion tools/buildsteps/ios/configure-depends
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ then
--host=arm-apple-darwin \
--with-sdk=$SDK_VERSION \
--with-cpu=$DARWIN_ARM_CPU \
--prefix=$XBMC_DEPENDS_ROOT
--prefix=$XBMC_DEPENDS_ROOT $DEBUG_SWITCH
fi
2 changes: 1 addition & 1 deletion tools/buildsteps/linux64/configure-depends
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ XBMC_PLATFORM_DIR=linux64
if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
then
cd $WORKSPACE/tools/depends;./configure \
--with-toolchain=/usr --prefix=$XBMC_DEPENDS_ROOT --host=x86_64-linux-gnu --with-tarballs=$TARBALLS
--with-toolchain=/usr --prefix=$XBMC_DEPENDS_ROOT --host=x86_64-linux-gnu --with-tarballs=$TARBALLS $DEBUG_SWITCH
fi
2 changes: 1 addition & 1 deletion tools/buildsteps/osx64/configure-depends
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ then
--with-tarballs=/Users/Shared/xbmc-depends/tarballs \
--host=x86_64-apple-darwin \
--with-sdk=$SDK_VERSION \
--prefix=$XBMC_DEPENDS_ROOT
--prefix=$XBMC_DEPENDS_ROOT $DEBUG_SWITCH
fi
2 changes: 1 addition & 1 deletion tools/buildsteps/rbpi/configure-depends
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ then

PATH="$PATH:$JENKINS_RBPI_DEVENV/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin" \
./configure --with-platform=raspberry-pi --host=arm-linux-gnueabihf --prefix=$XBMC_DEPENDS_ROOT --with-tarballs=$TARBALLS \
--with-firmware=$JENKINS_RBPI_DEVENV/firmware --build=i686-linux
--with-firmware=$JENKINS_RBPI_DEVENV/firmware --build=i686-linux $DEBUG_SWITCH
fi

0 comments on commit d493b1c

Please sign in to comment.