mirror of
https://github.com/libretro/libretro-super.git
synced 2025-02-19 23:51:59 +00:00
add branch support
This commit is contained in:
parent
926c6a966c
commit
fc14fbc350
@ -5,6 +5,7 @@ LOGDATE=`date +%Y-%m-%d`
|
||||
ORIGPATH=$PATH
|
||||
WORK=$PWD
|
||||
RECIPE=$1
|
||||
BRANCH=""
|
||||
|
||||
# ----- read variables from recipe config -----
|
||||
while read line; do
|
||||
@ -1003,6 +1004,9 @@ buildbot_pull(){
|
||||
if [ -d "${PARENTDIR}/${DIR}/.git" ]; then
|
||||
cd $PARENTDIR
|
||||
cd $DIR
|
||||
if [ -z "$BRANCH" ]; then
|
||||
git checkout $BRANCH
|
||||
fi
|
||||
echo "pulling changes from repo... "
|
||||
git reset --hard
|
||||
OUT=`git pull`
|
||||
@ -1029,6 +1033,12 @@ buildbot_pull(){
|
||||
echo "cloning repo..."
|
||||
cd $PARENTDIR
|
||||
git clone "$URL" "$DIR" --depth=1
|
||||
if [ -z "$BRANCH" ]; then
|
||||
cd $PARENTDIR
|
||||
cd $DIR
|
||||
git checkout $BRANCH
|
||||
fi
|
||||
cd $WORK
|
||||
if [ "${TYPE}" = "PROJECT" ]; then
|
||||
BUILD="YES"
|
||||
RADIR=$DIR
|
||||
@ -1211,6 +1221,7 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
|
||||
echo RELEASE=$RELEASE
|
||||
echo FORCE=$FORCE_RETROARCH_BUILD
|
||||
echo RADIR=$RADIR
|
||||
echo BRANCH=$BRANCH
|
||||
|
||||
buildbot_pull
|
||||
|
||||
@ -1283,7 +1294,7 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
|
||||
cp -rf $RARCH_DIR/info/* pkg/android/phoenix/assets/info/
|
||||
|
||||
echo "buildbot job: $jobid Building"
|
||||
buildbot_log "retroarch: [status: none] [$jobid]"
|
||||
buildbot_log "retroarch: [status: none] [$jobid] [branch: [branch: $BRANCH]]"
|
||||
echo
|
||||
cd pkg/android/phoenix
|
||||
rm bin/*.apk
|
||||
|
1
recipes/android/retroarch-android-dev
Normal file
1
recipes/android/retroarch-android-dev
Normal file
@ -0,0 +1 @@
|
||||
|
12
recipes/android/retroarch-android-dev.conf
Normal file
12
recipes/android/retroarch-android-dev.conf
Normal file
@ -0,0 +1,12 @@
|
||||
ANDROID_HOME /home/buildbot/tools/android/android-sdk-linux
|
||||
NDK_ROOT /home/buildbot/tools/android/android-ndk-r10e
|
||||
ANDROID_NDK /home/buildbot/tools/android/android-ndk-r10e
|
||||
PATH /home/buildbot/tools/android/android-ndk-r10e:/home/buildbot/tools/android/android-sdk-linux/tools
|
||||
PLATFORM android
|
||||
platform android
|
||||
MAKE make
|
||||
NDK ndk-build
|
||||
RA YES
|
||||
LIBSUFFIX _android
|
||||
JAVA_HOME /usr/lib/jvm/java-7-oracle
|
||||
BRANCH sandbox
|
7
recipes/android/retroarch-android-dev.ra
Normal file
7
recipes/android/retroarch-android-dev.ra
Normal file
@ -0,0 +1,7 @@
|
||||
retroarch retroarch https://github.com/libretro/Retroarch.git SUBMODULE YES .
|
||||
overlays overlays https://github.com/libretro/common-overlays.git ASSETS YES retroarch/media
|
||||
shaders shaders_cg https://github.com/libretro/common-shaders.git ASSETS YES retroarch/media
|
||||
autoconfig autoconfig https://github.com/libretro/retroarch-joypad-autoconfig.git ASSETS YES retroarch/media
|
||||
assets assets https://github.com/libretro/retroarch-assets.git ASSETS YES retroarch/media
|
||||
libretrodb libretrodb https://github.com/libretro/libretro-database.git ASSETS YES retroarch/media
|
||||
|
Loading…
x
Reference in New Issue
Block a user