try to fix android submodule recipe
This commit is contained in:
radius
parent
391abe2312
commit
f77af7233d
|
|
@ -411,7 +411,6 @@ build_libretro_bsnes_jni() {
|
|||
MAKEFILE=$4
|
||||
PLATFORM=$5
|
||||
PROFILE=$6
|
||||
|
||||
buildbot_log "$1 build starting [$jobid]"
|
||||
|
||||
cd ${DIR}/${SUBDIR}
|
||||
|
|
@ -429,16 +428,15 @@ build_libretro_bsnes_jni() {
|
|||
fi
|
||||
|
||||
echo "compiling for ${a}..."
|
||||
echo --------------------------------------------------
|
||||
if [ -z "${PROFILE}" ]; then
|
||||
echo --------------------------------------------------
|
||||
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
|
||||
|
|
@ -903,14 +902,14 @@ while read line; do
|
|||
fi
|
||||
OUT=`git submodule foreach git pull origin master`
|
||||
cd $WORK
|
||||
else
|
||||
else
|
||||
echo "cloning repo..."
|
||||
git clone --depth=1 "$URL" "$DIR"
|
||||
cd $DIR
|
||||
git submodule update --init
|
||||
BUILD="YES"
|
||||
fi
|
||||
cd $WORK
|
||||
cd $WORK
|
||||
fi
|
||||
|
||||
if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
|
||||
|
|
@ -972,8 +971,8 @@ if [ "${PLATFORM}" == "osx" ] && [ "${RA}" == "YES" ]; then
|
|||
echo URL: $URL
|
||||
echo REPO TYPE: $TYPE
|
||||
echo ENABLED: $ENABLED
|
||||
echo
|
||||
echo
|
||||
echo
|
||||
echo
|
||||
|
||||
ARGS=""
|
||||
|
||||
|
|
@ -1391,60 +1390,36 @@ 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`
|
||||
|
||||
echo $OUT
|
||||
if [ "${TYPE}" = "PROJECT" ]; then
|
||||
RADIR=$DIR
|
||||
if [[ $OUT == *"Already up-to-date"* ]]; then
|
||||
BUILD="NO"
|
||||
else
|
||||
BUILD="YES"
|
||||
fi
|
||||
fi
|
||||
cd $WORK
|
||||
else
|
||||
echo "cloning repo..."
|
||||
cd $PARENTDIR
|
||||
git clone "$URL" "$DIR" --depth=1
|
||||
cd $PARENTDIR
|
||||
cd $DIR
|
||||
if [ "${TYPE}" = "PROJECT" ]; then
|
||||
BUILD="YES"
|
||||
RADIR=$DIR
|
||||
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 [ -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
|
||||
RADIR=$DIR
|
||||
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
|
||||
cd $WORK
|
||||
|
||||
else
|
||||
echo "cloning repo..."
|
||||
cd $PARENTDIR
|
||||
git clone "$URL" "$DIR" --depth=1
|
||||
git submodule update --init
|
||||
cd $DIR
|
||||
if [ "${TYPE}" = "PROJECT" ]; then
|
||||
BUILD="YES"
|
||||
RADIR=$DIR
|
||||
fi
|
||||
cd $WORK
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -1541,8 +1516,8 @@ EOF
|
|||
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
|
||||
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
|
||||
|
||||
|
||||
if [ $? -eq 0 ]; then
|
||||
|
|
@ -1558,7 +1533,7 @@ EOF
|
|||
echo buildbot job: $MESSAGE | tee -a $TMPDIR/log/${BOT}/${LOGDATE}.log
|
||||
buildbot_log "$MESSAGE"
|
||||
|
||||
$NDK clean &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
|
||||
$NDK clean &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
|
||||
$NDK -j${JOBS} DEBUG=1 &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
|
||||
python ./version_increment.py
|
||||
ant clean &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
|
||||
|
|
|
|||
Loading…
Reference in New Issue