ShuriZma
/
libretro-super
mirror of https://github.com/libretro/libretro-super.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

try to fix android submodule recipe

This commit is contained in:
radius 2016-03-01 23:48:19 -05:00
parent 391abe2312
commit f77af7233d
1 changed files with 38 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
libretro-buildbot-recipe.sh
View File

@ -411,7 +411,6 @@ build_libretro_bsnes_jni() {
MAKEFILE=$4
PLATFORM=$5
PROFILE=$6
buildbot_log "$1 build starting [$jobid]"
cd ${DIR}/${SUBDIR}
@ -430,15 +429,14 @@ build_libretro_bsnes_jni() {
echo "compiling for ${a}..."
echo --------------------------------------------------
if [ -z "${PROFILE}" ]; then
if [ -z "${ARGS}" ]; then
echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}"
${NDK} -j${JOBS} APP_ABI=${a}
else
echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}"
${NDK} -j${JOBS} APP_ABI=${a} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log
else
echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}" profile=${PROFILE}
${NDK} -j${JOBS} APP_ABI=${a} profile=${PROFILE} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log
fi
echo $PWD
cp -v ../libs/${a}/libretro_${NAME}_${PROFILE}.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_${PROFILE}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log
cp -v ../libs/${a}/libretro_${NAME}_${PROFILE}.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_${PROFILE}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}
if [ $? -eq 0 ]; then
MESSAGE="$1-$a build succeeded [$jobid]"
@ -772,6 +770,7 @@ while read line; do
else
BUILD="YES"
fi
fi
FORCE_ORIG=$FORCE
@ -787,7 +786,7 @@ while read line; do
BUILD="YES"
fi
if [ "${PREVCORE}" = "bsnes_mercury" -a "${PREVBUILD}" = "YES" -a "${NAME}" = "bsnes_mercury" ]; then
if [ "${PREVCORE}" = "bsnes" -a "${PREVBUILD}" = "YES" -a "${NAME}" = "bsnes-mercury" ]; then
FORCE="YES"
BUILD="YES"
fi
@ -1391,13 +1390,13 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
ARGS="${ARGS%"${ARGS##*[![:space:]]}"}"
if [ "${TYPE}" = "PROJECT" ]; then
if [ -d "${PARENTDIR}/${DIR}/.git" ]; then
cd $PARENTDIR
cd $DIR
echo "pulling changes from repo... "
git reset --hard
OUT=`git pull`
git submodule foreach git pull origin master
echo $OUT
if [ "${TYPE}" = "PROJECT" ]; then
@ -1409,11 +1408,12 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
fi
fi
cd $WORK
else
echo "cloning repo..."
cd $PARENTDIR
git clone "$URL" "$DIR" --depth=1
cd $PARENTDIR
git submodule update --init
cd $DIR
if [ "${TYPE}" = "PROJECT" ]; then
BUILD="YES"
@ -1421,31 +1421,6 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
fi
cd $WORK
fi
elif [ "${TYPE}" == "SUBMODULE" ]; then
if [ -d "${DIR}/.git" ]; then
cd $PARENTDIR
cd $DIR
echo "pulling changes from repo... "
OUT=`git pull`
if [[ $OUT == *"Already up-to-date"* ]]; then
BUILD="NO"
else
BUILD="YES"
RADIR=$DIR
fi
OUT=`git submodule foreach git pull origin master`
cd $WORK
else
echo "cloning repo..."
git clone --depth=1 "$URL" "$DIR"
cd $DIR
git submodule update --init
BUILD="YES"
RADIR=$DIR
cd $WORK
fi
fi
fi
echo