Fix a bug and clean up the whitespace some more
This commit is contained in:
T. Joseph Carter
parent
0143866764
commit
3b0cacbe52
|
|
@ -17,13 +17,12 @@ WORK=$PWD
|
||||||
echo Original PATH: $PATH
|
echo Original PATH: $PATH
|
||||||
|
|
||||||
while read line; do
|
while read line; do
|
||||||
KEY=`echo $line | cut --fields=1 --delimiter=" "`
|
KEY=`echo $line | cut -f 1 -d " "`
|
||||||
VALUE=`echo $line | cut --fields=2 --delimiter=" "`
|
VALUE=`echo $line | cut -f 2 -d " "`
|
||||||
|
|
||||||
if [ "${KEY}" = "PATH" ]; then
|
if [ "${KEY}" = "PATH" ]; then
|
||||||
export PATH=${VALUE}:${ORIGPATH}
|
export PATH=${VALUE}:${ORIGPATH}
|
||||||
echo New PATH: $PATH
|
echo New PATH: $PATH
|
||||||
|
|
||||||
else
|
else
|
||||||
export ${KEY}=${VALUE}
|
export ${KEY}=${VALUE}
|
||||||
echo $KEY: $VALUE
|
echo $KEY: $VALUE
|
||||||
|
|
@ -32,7 +31,7 @@ done < $1.conf
|
||||||
echo
|
echo
|
||||||
echo
|
echo
|
||||||
|
|
||||||
. ./libretro-config.sh
|
. $WORK/libretro-config.sh
|
||||||
|
|
||||||
echo
|
echo
|
||||||
[[ "${ARM_NEON}" ]] && echo 'ARM NEON opts enabled...' && export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}-neon"
|
[[ "${ARM_NEON}" ]] && echo 'ARM NEON opts enabled...' && export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}-neon"
|
||||||
|
|
@ -69,7 +68,6 @@ fi
|
||||||
mkdir -v -p "$RARCH_DIST_DIR"
|
mkdir -v -p "$RARCH_DIST_DIR"
|
||||||
|
|
||||||
if [ "${PLATFORM}" = "android" ]; then
|
if [ "${PLATFORM}" = "android" ]; then
|
||||||
|
|
||||||
IFS=' ' read -ra ABIS <<< "$TARGET_ABIS"
|
IFS=' ' read -ra ABIS <<< "$TARGET_ABIS"
|
||||||
for a in "${ABIS[@]}"; do
|
for a in "${ABIS[@]}"; do
|
||||||
echo $a
|
echo $a
|
||||||
|
|
@ -174,7 +172,7 @@ buildbot_log() {
|
||||||
|
|
||||||
MESSAGE=`echo -e $1`
|
MESSAGE=`echo -e $1`
|
||||||
|
|
||||||
HASH=`echo -n "$MESSAGE" | openssl sha1 -hmac $SIG | cut --fields=2 --delimiter=" "`
|
HASH=`echo -n "$MESSAGE" | openssl sha1 -hmac $SIG | cut -f 2 -d " "`
|
||||||
curl --data "message=$MESSAGE&sign=$HASH" $LOGURL
|
curl --data "message=$MESSAGE&sign=$HASH" $LOGURL
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -198,8 +196,6 @@ build_libretro_generic_makefile() {
|
||||||
JOBS=1
|
JOBS=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if [ -z "${NOCLEAN}" ]; then
|
if [ -z "${NOCLEAN}" ]; then
|
||||||
echo "cleaning up..."
|
echo "cleaning up..."
|
||||||
echo "cleanup command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean"
|
echo "cleanup command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean"
|
||||||
|
|
@ -227,8 +223,7 @@ build_libretro_generic_makefile() {
|
||||||
|
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
MESSAGE="$1 build successful ($jobid)"
|
MESSAGE="$1 build successful ($jobid)"
|
||||||
if [ "${MAKEPORTABLE}" == "YES" ];
|
if [ "${MAKEPORTABLE}" == "YES" ]; then
|
||||||
then
|
|
||||||
echo "$1 running retrolink ($jobid)"
|
echo "$1 running retrolink ($jobid)"
|
||||||
$WORK/retrolink.sh ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
|
$WORK/retrolink.sh ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
|
||||||
fi
|
fi
|
||||||
|
|
@ -239,11 +234,9 @@ build_libretro_generic_makefile() {
|
||||||
echo BUILDBOT JOB: $MESSAGE
|
echo BUILDBOT JOB: $MESSAGE
|
||||||
buildbot_log "$MESSAGE"
|
buildbot_log "$MESSAGE"
|
||||||
JOBS=$OLDJ
|
JOBS=$OLDJ
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
build_libretro_generic_theos() {
|
build_libretro_generic_theos() {
|
||||||
|
|
||||||
echo PARAMETERS: DIR $2, SUBDIR: $3, MAKEFILE: $4
|
echo PARAMETERS: DIR $2, SUBDIR: $3, MAKEFILE: $4
|
||||||
|
|
||||||
NAME=$1
|
NAME=$1
|
||||||
|
|
@ -256,9 +249,6 @@ build_libretro_generic_theos() {
|
||||||
cd $DIR
|
cd $DIR
|
||||||
cd $SUBDIR
|
cd $SUBDIR
|
||||||
|
|
||||||
ln -s $THEOS theos
|
|
||||||
|
|
||||||
|
|
||||||
if [ -z "${NOCLEAN}" ]; then
|
if [ -z "${NOCLEAN}" ]; then
|
||||||
echo "cleaning up..."
|
echo "cleaning up..."
|
||||||
echo "cleanup command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean"
|
echo "cleanup command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean"
|
||||||
|
|
@ -287,11 +277,9 @@ build_libretro_generic_theos() {
|
||||||
fi
|
fi
|
||||||
echo BUILDBOT JOB: $MESSAGE
|
echo BUILDBOT JOB: $MESSAGE
|
||||||
buildbot_log "$MESSAGE"
|
buildbot_log "$MESSAGE"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
build_libretro_generic_jni() {
|
build_libretro_generic_jni() {
|
||||||
|
|
||||||
echo PARAMETERS: DIR $2, SUBDIR: $3
|
echo PARAMETERS: DIR $2, SUBDIR: $3
|
||||||
|
|
||||||
NAME=$1
|
NAME=$1
|
||||||
|
|
@ -334,13 +322,9 @@ build_libretro_generic_jni() {
|
||||||
buildbot_log "$MESSAGE"
|
buildbot_log "$MESSAGE"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
build_libretro_bsnes_jni() {
|
build_libretro_bsnes_jni() {
|
||||||
|
|
||||||
echo PARAMETERS: DIR $2, SUBDIR: $3
|
echo PARAMETERS: DIR $2, SUBDIR: $3
|
||||||
|
|
||||||
NAME=$1
|
NAME=$1
|
||||||
|
|
@ -382,14 +366,12 @@ build_libretro_bsnes_jni() {
|
||||||
fi
|
fi
|
||||||
echo BUILDBOT JOB: $MESSAGE
|
echo BUILDBOT JOB: $MESSAGE
|
||||||
buildbot_log "$MESSAGE"
|
buildbot_log "$MESSAGE"
|
||||||
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
build_libretro_generic_gl_makefile() {
|
build_libretro_generic_gl_makefile() {
|
||||||
|
|
||||||
|
|
||||||
NAME=$1
|
NAME=$1
|
||||||
DIR=$2
|
DIR=$2
|
||||||
SUBDIR=$3
|
SUBDIR=$3
|
||||||
|
|
@ -397,7 +379,6 @@ build_libretro_generic_gl_makefile() {
|
||||||
PLATFORM=$5
|
PLATFORM=$5
|
||||||
ARGS=$6
|
ARGS=$6
|
||||||
|
|
||||||
|
|
||||||
check_opengl
|
check_opengl
|
||||||
|
|
||||||
cd $DIR
|
cd $DIR
|
||||||
|
|
@ -433,14 +414,11 @@ build_libretro_generic_gl_makefile() {
|
||||||
buildbot_log "$MESSAGE"
|
buildbot_log "$MESSAGE"
|
||||||
|
|
||||||
reset_compiler_targets
|
reset_compiler_targets
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
build_libretro_bsnes() {
|
build_libretro_bsnes() {
|
||||||
|
|
||||||
|
|
||||||
NAME=$1
|
NAME=$1
|
||||||
DIR=$2
|
DIR=$2
|
||||||
PROFILE=$3
|
PROFILE=$3
|
||||||
|
|
@ -448,22 +426,18 @@ build_libretro_bsnes() {
|
||||||
PLATFORM=$5
|
PLATFORM=$5
|
||||||
BSNESCOMPILER=$6
|
BSNESCOMPILER=$6
|
||||||
|
|
||||||
|
|
||||||
cd $DIR
|
cd $DIR
|
||||||
|
|
||||||
|
|
||||||
if [ -z "${NOCLEAN}" ]; then
|
if [ -z "${NOCLEAN}" ]; then
|
||||||
echo "cleaning up..."
|
echo "cleaning up..."
|
||||||
|
|
||||||
rm -f obj/*.{o,"${FORMAT_EXT}"}
|
rm -f obj/*.{o,"${FORMAT_EXT}"}
|
||||||
rm -f out/*.{o,"${FORMAT_EXT}"}
|
rm -f out/*.{o,"${FORMAT_EXT}"}
|
||||||
|
|
||||||
|
|
||||||
if [ "${PROFILE}" = "cpp98" -o "${PROFILE}" = "bnes" ]; then
|
if [ "${PROFILE}" = "cpp98" -o "${PROFILE}" = "bnes" ]; then
|
||||||
${MAKE} clean
|
${MAKE} clean
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
echo BUILDBOT JOB: $jobid $1 cleanup success!
|
echo BUILDBOT JOB: $jobid $1 cleanup success!
|
||||||
else
|
else
|
||||||
|
|
@ -473,7 +447,6 @@ build_libretro_bsnes() {
|
||||||
|
|
||||||
echo "compiling..."
|
echo "compiling..."
|
||||||
|
|
||||||
|
|
||||||
if [ "${PROFILE}" = "cpp98" ]; then
|
if [ "${PROFILE}" = "cpp98" ]; then
|
||||||
${MAKE} platform="${PLATFORM}" ${COMPILER} "-j${JOBS}"
|
${MAKE} platform="${PLATFORM}" ${COMPILER} "-j${JOBS}"
|
||||||
elif [ "${PROFILE}" = "bnes" ]; then
|
elif [ "${PROFILE}" = "bnes" ]; then
|
||||||
|
|
@ -498,7 +471,6 @@ build_libretro_bsnes() {
|
||||||
fi
|
fi
|
||||||
echo BUILDBOT JOB: $MESSAGE
|
echo BUILDBOT JOB: $MESSAGE
|
||||||
buildbot_log "$MESSAGE"
|
buildbot_log "$MESSAGE"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#fetch a project and mark it for building if there have been any changes
|
#fetch a project and mark it for building if there have been any changes
|
||||||
|
|
@ -509,15 +481,14 @@ export jobid=$1
|
||||||
echo
|
echo
|
||||||
echo
|
echo
|
||||||
while read line; do
|
while read line; do
|
||||||
|
NAME=`echo $line | cut -f 1 -d " "`
|
||||||
NAME=`echo $line | cut --fields=1 --delimiter=" "`
|
DIR=`echo $line | cut -f 2 -d " "`
|
||||||
DIR=`echo $line | cut --fields=2 --delimiter=" "`
|
URL=`echo $line | cut -f 3 -d " "`
|
||||||
URL=`echo $line | cut --fields=3 --delimiter=" "`
|
TYPE=`echo $line | cut -f 4 -d " "`
|
||||||
TYPE=`echo $line | cut --fields=4 --delimiter=" "`
|
ENABLED=`echo $line | cut -f 5 -d " "`
|
||||||
ENABLED=`echo $line | cut --fields=5 --delimiter=" "`
|
COMMAND=`echo $line | cut -f 6 -d " "`
|
||||||
COMMAND=`echo $line | cut --fields=6 --delimiter=" "`
|
MAKEFILE=`echo $line | cut -f 7 -d " "`
|
||||||
MAKEFILE=`echo $line | cut --fields=7 --delimiter=" "`
|
SUBDIR=`echo $line | cut -f 8 -d " "`
|
||||||
SUBDIR=`echo $line | cut --fields=8 --delimiter=" "`
|
|
||||||
|
|
||||||
if [ "${ENABLED}" = "YES" ]; then
|
if [ "${ENABLED}" = "YES" ]; then
|
||||||
echo "BUILDBOT JOB: $jobid Processing $NAME"
|
echo "BUILDBOT JOB: $jobid Processing $NAME"
|
||||||
|
|
@ -530,35 +501,34 @@ while read line; do
|
||||||
echo DIR: $DIR
|
echo DIR: $DIR
|
||||||
echo SUBDIR: $SUBDIR
|
echo SUBDIR: $SUBDIR
|
||||||
|
|
||||||
|
|
||||||
ARGS=""
|
ARGS=""
|
||||||
|
|
||||||
TEMP=`echo $line | cut --fields=9 --delimiter=" "`
|
TEMP=`echo $line | cut -f 9 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${TEMP}"
|
ARGS="${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=10 --delimiter=" "`
|
TEMP=`echo $line | cut -f 10 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=11 --delimiter=" "`
|
TEMP=`echo $line | cut -f 11 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=12 --delimiter=" "`
|
TEMP=`echo $line | cut -f 12 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=13 --delimiter=" "`
|
TEMP=`echo $line | cut -f 13 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=14 --delimiter=" "`
|
TEMP=`echo $line | cut -f 14 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
|
|
@ -596,9 +566,7 @@ while read line; do
|
||||||
BUILD="YES"
|
BUILD="YES"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
else
|
else
|
||||||
echo "cloning repo..."
|
echo "cloning repo..."
|
||||||
git clone --depth=1 "$URL" "$DIR"
|
git clone --depth=1 "$URL" "$DIR"
|
||||||
|
|
@ -676,7 +644,6 @@ while read line; do
|
||||||
cd "${BASE_DIR}"
|
cd "${BASE_DIR}"
|
||||||
PREVCORE=$NAME
|
PREVCORE=$NAME
|
||||||
PREVBUILD=$BUILD
|
PREVBUILD=$BUILD
|
||||||
|
|
||||||
done < $1
|
done < $1
|
||||||
|
|
||||||
echo "BUILDBOT JOB: $jobid Building Retroarch"
|
echo "BUILDBOT JOB: $jobid Building Retroarch"
|
||||||
|
|
@ -685,15 +652,13 @@ cd $WORK
|
||||||
BUILD=""
|
BUILD=""
|
||||||
|
|
||||||
if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
|
if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
|
||||||
|
|
||||||
while read line; do
|
while read line; do
|
||||||
|
NAME=`echo $line | cut -f 1 -d " "`
|
||||||
NAME=`echo $line | cut --fields=1 --delimiter=" "`
|
DIR=`echo $line | cut -f 2 -d " "`
|
||||||
DIR=`echo $line | cut --fields=2 --delimiter=" "`
|
URL=`echo $line | cut -f 3 -d " "`
|
||||||
URL=`echo $line | cut --fields=3 --delimiter=" "`
|
TYPE=`echo $line | cut -f 4 -d " "`
|
||||||
TYPE=`echo $line | cut --fields=4 --delimiter=" "`
|
ENABLED=`echo $line | cut -f 5 -d " "`
|
||||||
ENABLED=`echo $line | cut --fields=5 --delimiter=" "`
|
PARENTDIR=`echo $line | cut -f 6 -d " "`
|
||||||
PARENTDIR=`echo $line | cut --fields=6 --delimiter=" "`
|
|
||||||
|
|
||||||
if [ "${ENABLED}" = "YES" ]; then
|
if [ "${ENABLED}" = "YES" ]; then
|
||||||
echo "BUILDBOT JOB: $jobid Processing $NAME"
|
echo "BUILDBOT JOB: $jobid Processing $NAME"
|
||||||
|
|
@ -707,32 +672,32 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
|
||||||
|
|
||||||
ARGS=""
|
ARGS=""
|
||||||
|
|
||||||
TEMP=`echo $line | cut --fields=9 --delimiter=" "`
|
TEMP=`echo $line | cut -f 9 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${TEMP}"
|
ARGS="${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=10 --delimiter=" "`
|
TEMP=`echo $line | cut -f 10 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=11 --delimiter=" "`
|
TEMP=`echo $line | cut -f 11 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=12 --delimiter=" "`
|
TEMP=`echo $line | cut -f 12 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=13 --delimiter=" "`
|
TEMP=`echo $line | cut -f 13 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=14 --delimiter=" "`
|
TEMP=`echo $line | cut -f 14 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
|
|
@ -765,7 +730,6 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
|
||||||
if [ "${TYPE}" = "PROJECT" ]; then
|
if [ "${TYPE}" = "PROJECT" ]; then
|
||||||
BUILD="YES"
|
BUILD="YES"
|
||||||
RADIR=$DIR
|
RADIR=$DIR
|
||||||
|
|
||||||
fi
|
fi
|
||||||
cd $WORK
|
cd $WORK
|
||||||
fi
|
fi
|
||||||
|
|
@ -774,6 +738,7 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
|
||||||
echo
|
echo
|
||||||
echo
|
echo
|
||||||
done < $1.ra
|
done < $1.ra
|
||||||
|
|
||||||
if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
|
if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
|
||||||
echo "BUILDBOT JOB: $jobid Compiling Shaders"
|
echo "BUILDBOT JOB: $jobid Compiling Shaders"
|
||||||
echo
|
echo
|
||||||
|
|
@ -825,15 +790,13 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${PLATFORM}" = "theos_ios" ] && [ "${RA}" = "YES" ]; then
|
if [ "${PLATFORM}" = "theos_ios" ] && [ "${RA}" = "YES" ]; then
|
||||||
|
|
||||||
while read line; do
|
while read line; do
|
||||||
|
NAME=`echo $line | cut -f 1 -d " "`
|
||||||
NAME=`echo $line | cut --fields=1 --delimiter=" "`
|
DIR=`echo $line | cut -f 2 -d " "`
|
||||||
DIR=`echo $line | cut --fields=2 --delimiter=" "`
|
URL=`echo $line | cut -f 3 -d " "`
|
||||||
URL=`echo $line | cut --fields=3 --delimiter=" "`
|
TYPE=`echo $line | cut -f 4 -d " "`
|
||||||
TYPE=`echo $line | cut --fields=4 --delimiter=" "`
|
ENABLED=`echo $line | cut -f 5 -d " "`
|
||||||
ENABLED=`echo $line | cut --fields=5 --delimiter=" "`
|
PARENTDIR=`echo $line | cut -f 6 -d " "`
|
||||||
PARENTDIR=`echo $line | cut --fields=6 --delimiter=" "`
|
|
||||||
|
|
||||||
if [ "${ENABLED}" = "YES" ]; then
|
if [ "${ENABLED}" = "YES" ]; then
|
||||||
echo "BUILDBOT JOB: $jobid Processing $NAME"
|
echo "BUILDBOT JOB: $jobid Processing $NAME"
|
||||||
|
|
@ -847,32 +810,32 @@ if [ "${PLATFORM}" = "theos_ios" ] && [ "${RA}" = "YES" ]; then
|
||||||
|
|
||||||
ARGS=""
|
ARGS=""
|
||||||
|
|
||||||
TEMP=`echo $line | cut --fields=9 --delimiter=" "`
|
TEMP=`echo $line | cut -f 9 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${TEMP}"
|
ARGS="${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=10 --delimiter=" "`
|
TEMP=`echo $line | cut -f 10 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=11 --delimiter=" "`
|
TEMP=`echo $line | cut -f 11 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=12 --delimiter=" "`
|
TEMP=`echo $line | cut -f 12 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=13 --delimiter=" "`
|
TEMP=`echo $line | cut -f 13 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=14 --delimiter=" "`
|
TEMP=`echo $line | cut -f 14 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
|
|
@ -914,6 +877,7 @@ if [ "${PLATFORM}" = "theos_ios" ] && [ "${RA}" = "YES" ]; then
|
||||||
echo
|
echo
|
||||||
echo
|
echo
|
||||||
done < $1.ra
|
done < $1.ra
|
||||||
|
|
||||||
if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
|
if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
|
||||||
echo "BUILDBOT JOB: $jobid Compiling Shaders"
|
echo "BUILDBOT JOB: $jobid Compiling Shaders"
|
||||||
echo
|
echo
|
||||||
|
|
@ -950,15 +914,13 @@ if [ "${PLATFORM}" = "theos_ios" ] && [ "${RA}" = "YES" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" = "YES" ]; then
|
if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" = "YES" ]; then
|
||||||
|
|
||||||
while read line; do
|
while read line; do
|
||||||
|
NAME=`echo $line | cut -f 1 -d " "`
|
||||||
NAME=`echo $line | cut --fields=1 --delimiter=" "`
|
DIR=`echo $line | cut -f 2 -d " "`
|
||||||
DIR=`echo $line | cut --fields=2 --delimiter=" "`
|
URL=`echo $line | cut -f 3 -d " "`
|
||||||
URL=`echo $line | cut --fields=3 --delimiter=" "`
|
TYPE=`echo $line | cut -f 4 -d " "`
|
||||||
TYPE=`echo $line | cut --fields=4 --delimiter=" "`
|
ENABLED=`echo $line | cut -f 5 -d " "`
|
||||||
ENABLED=`echo $line | cut --fields=5 --delimiter=" "`
|
PARENTDIR=`echo $line | cut -f 6 -d " "`
|
||||||
PARENTDIR=`echo $line | cut --fields=6 --delimiter=" "`
|
|
||||||
|
|
||||||
if [ "${ENABLED}" = "YES" ]; then
|
if [ "${ENABLED}" = "YES" ]; then
|
||||||
echo "BUILDBOT JOB: $jobid Processing $NAME"
|
echo "BUILDBOT JOB: $jobid Processing $NAME"
|
||||||
|
|
@ -972,33 +934,33 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" =
|
||||||
|
|
||||||
ARGS=""
|
ARGS=""
|
||||||
|
|
||||||
TEMP=`echo $line | cut --fields=9 --delimiter=" "`
|
TEMP=`echo $line | cut -f 9 -d " "`
|
||||||
if [ -n ${TEMP} ];
|
if [ -n ${TEMP} ];
|
||||||
then
|
then
|
||||||
ARGS="${TEMP}"
|
ARGS="${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=10 --delimiter=" "`
|
TEMP=`echo $line | cut -f 10 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=11 --delimiter=" "`
|
TEMP=`echo $line | cut -f 11 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=12 --delimiter=" "`
|
TEMP=`echo $line | cut -f 12 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=13 --delimiter=" "`
|
TEMP=`echo $line | cut -f 13 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=14 --delimiter=" "`
|
TEMP=`echo $line | cut -f 14 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
|
|
@ -1031,7 +993,6 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" =
|
||||||
if [ "${TYPE}" = "PROJECT" ]; then
|
if [ "${TYPE}" = "PROJECT" ]; then
|
||||||
BUILD="YES"
|
BUILD="YES"
|
||||||
RADIR=$DIR
|
RADIR=$DIR
|
||||||
|
|
||||||
fi
|
fi
|
||||||
cd $WORK
|
cd $WORK
|
||||||
fi
|
fi
|
||||||
|
|
@ -1040,8 +1001,8 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" =
|
||||||
echo
|
echo
|
||||||
echo
|
echo
|
||||||
done < $1.ra
|
done < $1.ra
|
||||||
if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
|
|
||||||
|
|
||||||
|
if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
|
||||||
cd $RADIR
|
cd $RADIR
|
||||||
echo "BUILDBOT JOB: $jobid Building"
|
echo "BUILDBOT JOB: $jobid Building"
|
||||||
echo
|
echo
|
||||||
|
|
@ -1133,8 +1094,6 @@ video_shader_dir = ":\shaders"
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
rm -rfv windows
|
rm -rfv windows
|
||||||
mkdir -p windows
|
mkdir -p windows
|
||||||
mkdir -p windows/overlays
|
mkdir -p windows/overlays
|
||||||
|
|
@ -1163,27 +1122,22 @@ EOF
|
||||||
cp -Rfv audio/audio_filters/*.dsp windows/filters/audio
|
cp -Rfv audio/audio_filters/*.dsp windows/filters/audio
|
||||||
cp -Rfv gfx/video_filters/*.dll windows/filters/video
|
cp -Rfv gfx/video_filters/*.dll windows/filters/video
|
||||||
cp -Rfv gfx/video_filters/*.filt windows/filters/video
|
cp -Rfv gfx/video_filters/*.filt windows/filters/video
|
||||||
|
|
||||||
else
|
else
|
||||||
MESSAGE="retroarch build failed ($jobid)"
|
MESSAGE="retroarch build failed ($jobid)"
|
||||||
echo $MESSAGE
|
echo $MESSAGE
|
||||||
buildbot_log "$MESSAGE"
|
buildbot_log "$MESSAGE"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then
|
if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then
|
||||||
|
|
||||||
while read line; do
|
while read line; do
|
||||||
|
NAME=`echo $line | cut -f 1 -d " "`
|
||||||
NAME=`echo $line | cut --fields=1 --delimiter=" "`
|
DIR=`echo $line | cut -f 2 -d " "`
|
||||||
DIR=`echo $line | cut --fields=2 --delimiter=" "`
|
URL=`echo $line | cut -f 3 -d " "`
|
||||||
URL=`echo $line | cut --fields=3 --delimiter=" "`
|
TYPE=`echo $line | cut -f 4 -d " "`
|
||||||
TYPE=`echo $line | cut --fields=4 --delimiter=" "`
|
ENABLED=`echo $line | cut -f 5 -d " "`
|
||||||
ENABLED=`echo $line | cut --fields=5 --delimiter=" "`
|
PARENTDIR=`echo $line | cut -f 6 -d " "`
|
||||||
PARENTDIR=`echo $line | cut --fields=6 --delimiter=" "`
|
|
||||||
|
|
||||||
if [ "${ENABLED}" = "YES" ]; then
|
if [ "${ENABLED}" = "YES" ]; then
|
||||||
echo "BUILDBOT JOB: $jobid Processing $NAME"
|
echo "BUILDBOT JOB: $jobid Processing $NAME"
|
||||||
|
|
@ -1197,32 +1151,32 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then
|
||||||
|
|
||||||
ARGS=""
|
ARGS=""
|
||||||
|
|
||||||
TEMP=`echo $line | cut --fields=9 --delimiter=" "`
|
TEMP=`echo $line | cut -f 9 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${TEMP}"
|
ARGS="${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=10 --delimiter=" "`
|
TEMP=`echo $line | cut -f 10 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=11 --delimiter=" "`
|
TEMP=`echo $line | cut -f 11 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=12 --delimiter=" "`
|
TEMP=`echo $line | cut -f 12 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=13 --delimiter=" "`
|
TEMP=`echo $line | cut -f 13 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=14 --delimiter=" "`
|
TEMP=`echo $line | cut -f 14 -d " "`
|
||||||
if [ -n ${TEMP} ]; then
|
if [ -n ${TEMP} ]; then
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
|
|
@ -1255,7 +1209,6 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then
|
||||||
if [ "${TYPE}" = "PROJECT" ]; then
|
if [ "${TYPE}" = "PROJECT" ]; then
|
||||||
BUILD="YES"
|
BUILD="YES"
|
||||||
RADIR=$DIR
|
RADIR=$DIR
|
||||||
|
|
||||||
fi
|
fi
|
||||||
cd $WORK
|
cd $WORK
|
||||||
fi
|
fi
|
||||||
|
|
@ -1264,21 +1217,19 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then
|
||||||
echo
|
echo
|
||||||
echo
|
echo
|
||||||
done < $1.ra
|
done < $1.ra
|
||||||
if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
|
|
||||||
|
|
||||||
|
if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
|
||||||
cd $RADIR
|
cd $RADIR
|
||||||
rm -rfv psp1/pkg
|
rm -rfv psp1/pkg
|
||||||
echo "BUILDBOT JOB: $jobid Building"
|
echo "BUILDBOT JOB: $jobid Building"
|
||||||
echo
|
echo
|
||||||
|
|
||||||
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ]; then
|
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ]; then
|
||||||
|
|
||||||
cd dist-scripts
|
cd dist-scripts
|
||||||
rm *.a
|
rm *.a
|
||||||
cp -v $RARCH_DIST_DIR/*.a .
|
cp -v $RARCH_DIST_DIR/*.a .
|
||||||
ls -1 *.a | awk -F "." ' { print "cp " $0 " " $1 "_psp1." $2 }' |sh
|
ls -1 *.a | awk -F "." ' { print "cp " $0 " " $1 "_psp1." $2 }' |sh
|
||||||
|
|
||||||
|
|
||||||
./psp1-cores.sh
|
./psp1-cores.sh
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
MESSAGE="retroarch build successful ($jobid)"
|
MESSAGE="retroarch build successful ($jobid)"
|
||||||
|
|
@ -1292,7 +1243,6 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then
|
||||||
echo ============================================
|
echo ============================================
|
||||||
cp retroarch.cfg retroarch.default.cfg
|
cp retroarch.cfg retroarch.default.cfg
|
||||||
|
|
||||||
|
|
||||||
mkdir -p psp1/pkg/
|
mkdir -p psp1/pkg/
|
||||||
mkdir -p psp1/pkg/cheats
|
mkdir -p psp1/pkg/cheats
|
||||||
mkdir -p psp1/pkg/database
|
mkdir -p psp1/pkg/database
|
||||||
|
|
@ -1302,26 +1252,20 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then
|
||||||
cp -Rfv media/libretrodb/cht/* psp1/pkg/cheats
|
cp -Rfv media/libretrodb/cht/* psp1/pkg/cheats
|
||||||
cp -Rfv media/libretrodb/rdb/* psp1/pkg/database/rdb
|
cp -Rfv media/libretrodb/rdb/* psp1/pkg/database/rdb
|
||||||
cp -Rfv media/libretrodb/cursors/* psp1/pkg/database/cursors
|
cp -Rfv media/libretrodb/cursors/* psp1/pkg/database/cursors
|
||||||
|
fi
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
fi
|
if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ]; then
|
||||||
|
|
||||||
if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ];
|
|
||||||
then
|
|
||||||
|
|
||||||
while read line; do
|
while read line; do
|
||||||
|
NAME=`echo $line | cut -f 1 -d " "`
|
||||||
|
DIR=`echo $line | cut -f 2 -d " "`
|
||||||
|
URL=`echo $line | cut -f 3 -d " "`
|
||||||
|
TYPE=`echo $line | cut -f 4 -d " "`
|
||||||
|
ENABLED=`echo $line | cut -f 5 -d " "`
|
||||||
|
PARENTDIR=`echo $line | cut -f 6 -d " "`
|
||||||
|
|
||||||
NAME=`echo $line | cut --fields=1 --delimiter=" "`
|
if [ "${ENABLED}" == "YES" ]; then
|
||||||
DIR=`echo $line | cut --fields=2 --delimiter=" "`
|
|
||||||
URL=`echo $line | cut --fields=3 --delimiter=" "`
|
|
||||||
TYPE=`echo $line | cut --fields=4 --delimiter=" "`
|
|
||||||
ENABLED=`echo $line | cut --fields=5 --delimiter=" "`
|
|
||||||
PARENTDIR=`echo $line | cut --fields=6 --delimiter=" "`
|
|
||||||
|
|
||||||
if [ "${ENABLED}" == "YES" ];
|
|
||||||
then
|
|
||||||
echo "BUILDBOT JOB: $jobid Processing $NAME"
|
echo "BUILDBOT JOB: $jobid Processing $NAME"
|
||||||
echo
|
echo
|
||||||
echo NAME: $NAME
|
echo NAME: $NAME
|
||||||
|
|
@ -1333,39 +1277,33 @@ then
|
||||||
|
|
||||||
ARGS=""
|
ARGS=""
|
||||||
|
|
||||||
TEMP=`echo $line | cut --fields=9 --delimiter=" "`
|
TEMP=`echo $line | cut -f 9 -d " "`
|
||||||
if [ -n ${TEMP} ];
|
if [ -n ${TEMP} ]; then
|
||||||
then
|
|
||||||
ARGS="${TEMP}"
|
ARGS="${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=10 --delimiter=" "`
|
TEMP=`echo $line | cut -f 10 -d " "`
|
||||||
if [ -n ${TEMP} ];
|
if [ -n ${TEMP} ]; then
|
||||||
then
|
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=11 --delimiter=" "`
|
TEMP=`echo $line | cut -f 11 -d " "`
|
||||||
if [ -n ${TEMP} ];
|
if [ -n ${TEMP} ]; then
|
||||||
then
|
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=12 --delimiter=" "`
|
TEMP=`echo $line | cut -f 12 -d " "`
|
||||||
if [ -n ${TEMP} ];
|
if [ -n ${TEMP} ]; then
|
||||||
then
|
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=13 --delimiter=" "`
|
TEMP=`echo $line | cut -f 13 -d " "`
|
||||||
if [ -n ${TEMP} ];
|
if [ -n ${TEMP} ]; then
|
||||||
then
|
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
TEMP=""
|
TEMP=""
|
||||||
TEMP=`echo $line | cut --fields=14 --delimiter=" "`
|
TEMP=`echo $line | cut -f 14 -d " "`
|
||||||
if [ -n ${TEMP} ];
|
if [ -n ${TEMP} ]; then
|
||||||
then
|
|
||||||
ARGS="${ARGS} ${TEMP}"
|
ARGS="${ARGS} ${TEMP}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -1373,18 +1311,15 @@ then
|
||||||
|
|
||||||
echo ARGS: $ARGS
|
echo ARGS: $ARGS
|
||||||
|
|
||||||
if [ -d "${PARENTDIR}/${DIR}/.git" ];
|
if [ -d "${PARENTDIR}/${DIR}/.git" ]; then
|
||||||
then
|
|
||||||
cd $PARENTDIR
|
cd $PARENTDIR
|
||||||
cd $DIR
|
cd $DIR
|
||||||
echo "pulling from repo... "
|
echo "pulling from repo... "
|
||||||
OUT=`git pull`
|
OUT=`git pull`
|
||||||
echo $OUT
|
echo $OUT
|
||||||
if [ "${TYPE}" == "PROJECT" ];
|
if [ "${TYPE}" == "PROJECT" ]; then
|
||||||
then
|
|
||||||
RADIR=$DIR
|
RADIR=$DIR
|
||||||
if [[ $OUT == *"Already up-to-date"* ]]
|
if [[ $OUT == *"Already up-to-date"* ]]; then
|
||||||
then
|
|
||||||
BUILD="NO"
|
BUILD="NO"
|
||||||
else
|
else
|
||||||
BUILD="YES"
|
BUILD="YES"
|
||||||
|
|
@ -1397,8 +1332,7 @@ then
|
||||||
git clone "$URL" "$DIR" --depth=1
|
git clone "$URL" "$DIR" --depth=1
|
||||||
cd $DIR
|
cd $DIR
|
||||||
|
|
||||||
if [ "${TYPE}" == "PROJECT" ];
|
if [ "${TYPE}" == "PROJECT" ]; then
|
||||||
then
|
|
||||||
BUILD="YES"
|
BUILD="YES"
|
||||||
RADIR=$DIR
|
RADIR=$DIR
|
||||||
|
|
||||||
|
|
@ -1410,16 +1344,14 @@ then
|
||||||
echo
|
echo
|
||||||
echo
|
echo
|
||||||
done < $1.ra
|
done < $1.ra
|
||||||
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ];
|
|
||||||
then
|
|
||||||
|
|
||||||
|
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ]; then
|
||||||
cd $RADIR
|
cd $RADIR
|
||||||
#rm -rfv wii/pkg
|
#rm -rfv wii/pkg
|
||||||
echo "BUILDBOT JOB: $jobid Building"
|
echo "BUILDBOT JOB: $jobid Building"
|
||||||
echo
|
echo
|
||||||
|
|
||||||
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ];
|
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ]; then
|
||||||
then
|
|
||||||
|
|
||||||
cd dist-scripts
|
cd dist-scripts
|
||||||
rm *.a
|
rm *.a
|
||||||
|
|
@ -1427,8 +1359,7 @@ then
|
||||||
|
|
||||||
ls -1 *.a | awk -F "." ' { print "cp " $0 " " $1 "_wii." $2 }' |sh
|
ls -1 *.a | awk -F "." ' { print "cp " $0 " " $1 "_wii." $2 }' |sh
|
||||||
sh ./wii-cores.sh
|
sh ./wii-cores.sh
|
||||||
if [ $? -eq 0 ];
|
if [ $? -eq 0 ]; then
|
||||||
then
|
|
||||||
MESSAGE="retroarch build successful ($jobid)"
|
MESSAGE="retroarch build successful ($jobid)"
|
||||||
echo $MESSAGE
|
echo $MESSAGE
|
||||||
else
|
else
|
||||||
|
|
@ -1437,7 +1368,6 @@ then
|
||||||
fi
|
fi
|
||||||
buildbot_log "$MESSAGE"
|
buildbot_log "$MESSAGE"
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Packaging"
|
echo "Packaging"
|
||||||
|
|
@ -1455,10 +1385,6 @@ then
|
||||||
cp -Rfv media/libretrodb/rdb/* wii/pkg/database/rdb
|
cp -Rfv media/libretrodb/rdb/* wii/pkg/database/rdb
|
||||||
cp -Rfv media/libretrodb/cursors/* wii/pkg/database/cursors
|
cp -Rfv media/libretrodb/cursors/* wii/pkg/database/cursors
|
||||||
cp -Rfv media/overlays/* wii/pkg/overlays
|
cp -Rfv media/overlays/* wii/pkg/overlays
|
||||||
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
PATH=$ORIGPATH
|
PATH=$ORIGPATH
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue