disable auto version increment on RELEASE builds

This commit is contained in:
radius 2016-03-05 13:13:31 -05:00
parent 7c0d22437a
commit 4116c4de72

View File

@ -780,12 +780,12 @@ while read line; do
FORCE="YES"
BUILD="YES"
fi
if [ "${PREVCORE}" = "bsnes" -a "${PREVBUILD}" = "YES" -a "${NAME}" = "bsnes" ]; then
FORCE="YES"
BUILD="YES"
fi
if [ "${PREVCORE}" = "bsnes" -a "${PREVBUILD}" = "YES" -a "${NAME}" = "bsnes-mercury" ]; then
FORCE="YES"
BUILD="YES"
@ -1420,7 +1420,7 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
echo "cloning repo..."
cd $PARENTDIR
git clone "$URL" "$DIR" --depth=1
if [ "${TYPE}" = "PROJECT" ]; then
BUILD="YES"
RADIR=$DIR
@ -1524,12 +1524,13 @@ EOF
$NDK clean &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
$NDK -j${JOBS} &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
python ./version_increment.py
if [ "${RELEASE}" == "NO" ]; then
python ./version_increment.py
fi
ant clean &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
android update project --path . --target android-22 &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
android update project --path libs/googleplay --target android-21 &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
android update project --path libs/appcompat --target android-21 &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
echo RELEASE BUILD: $RELEASE $RARCH_DIR
ant release &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-release.apk &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-release.apk
@ -1555,7 +1556,6 @@ EOF
android update project --path . --target android-22 &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
android update project --path libs/googleplay --target android-21 &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
android update project --path libs/appcompat --target android-21 &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
echo RELEASE BUILD: $RELEASE
ant set-debuggable release &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-debug.apk &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-debug.apk