make sure to specify architecture

This commit is contained in:
Radius 2015-01-27 18:34:52 -05:00
parent dead65845a
commit e0acbdb430

View File

@ -746,6 +746,9 @@ echo ============================================
cd $WORK
BUILD=""
ECHO $RA
ECHO $PLATFORM
if [ "${PLATFORM}" == "psp1" ];
then
@ -987,8 +990,143 @@ then
fi
echo $PLATFORM
echo $RA
if [ "${PLATFORM}" == "theos_ios" ] && [ "${RA}" == "YES" ];
then
while read line; do
NAME=`echo $line | cut --fields=1 --delimiter=" "`
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 "Processing $NAME"
echo ============================================
echo NAME: $NAME
echo DIR: $DIR
echo PARENT: $PARENTDIR
echo URL: $URL
echo REPO TYPE: $TYPE
echo ENABLED: $ENABLED
ARGS=""
TEMP=`echo $line | cut --fields=9 --delimiter=" "`
if [ -n ${TEMP} ];
then
ARGS="${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut --fields=10 --delimiter=" "`
if [ -n ${TEMP} ];
then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut --fields=11 --delimiter=" "`
if [ -n ${TEMP} ];
then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut --fields=12 --delimiter=" "`
if [ -n ${TEMP} ];
then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut --fields=13 --delimiter=" "`
if [ -n ${TEMP} ];
then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut --fields=14 --delimiter=" "`
if [ -n ${TEMP} ];
then
ARGS="${ARGS} ${TEMP}"
fi
ARGS="${ARGS%"${ARGS##*[![:space:]]}"}"
echo ARGS: $ARGS
if [ -d "${PARENTDIR}/${DIR}/.git" ];
then
cd $PARENTDIR
cd $DIR
echo "pulling from repo... "
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 $DIR
if [ "${TYPE}" == "PROJECT" ];
then
BUILD="YES"
RADIR=$DIR
fi
cd $WORK
fi
fi
echo
echo
done < $1.ra
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ];
then
echo "Compiling Shaders"
echo ============================================
echo RADIR $RADIR
cd $RADIR
$MAKE -f Makefile.griffin shaders-convert-glsl PYTHON3=$PYTHON
echo "Processing Assets"
echo ============================================
echo "Building"
echo ============================================
cd apple/iOS
rm RetroArch.app -rf
rm -rfv *.deb
ln -s $THEOS theos
export PRODUCT_NAME=RetroArch
$MAKE clean
$MAKE -j8
./package.sh
mkdir obj/RetroArch.app/modules
cp -rfv ../../../dist/theos/*.* obj/RetroArch.app/modules
cp -rfv ../../../dist/info/*.* obj/RetroArch.app/modules
$MAKE package
cp -r *.deb /home/buildbot/www/.radius/
fi
fi
if [ "${PLATFORM}" == "theos_ios" ] && [ "${RA}" == "YES" ];
then
@ -1128,4 +1266,128 @@ then
fi
if [ "${PLATFORM}" == "MINGW64" ] && [ "${RA}" == "YES" ];
then
while read line; do
NAME=`echo $line | cut --fields=1 --delimiter=" "`
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 "Processing $NAME"
echo ============================================
echo NAME: $NAME
echo DIR: $DIR
echo PARENT: $PARENTDIR
echo URL: $URL
echo REPO TYPE: $TYPE
echo ENABLED: $ENABLED
ARGS=""
TEMP=`echo $line | cut --fields=9 --delimiter=" "`
if [ -n ${TEMP} ];
then
ARGS="${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut --fields=10 --delimiter=" "`
if [ -n ${TEMP} ];
then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut --fields=11 --delimiter=" "`
if [ -n ${TEMP} ];
then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut --fields=12 --delimiter=" "`
if [ -n ${TEMP} ];
then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut --fields=13 --delimiter=" "`
if [ -n ${TEMP} ];
then
ARGS="${ARGS} ${TEMP}"
fi
TEMP=""
TEMP=`echo $line | cut --fields=14 --delimiter=" "`
if [ -n ${TEMP} ];
then
ARGS="${ARGS} ${TEMP}"
fi
ARGS="${ARGS%"${ARGS##*[![:space:]]}"}"
echo ARGS: $ARGS
if [ -d "${PARENTDIR}/${DIR}/.git" ];
then
cd $PARENTDIR
cd $DIR
echo "pulling from repo... "
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 $DIR
if [ "${TYPE}" == "PROJECT" ];
then
BUILD="YES"
RADIR=$DIR
fi
cd $WORK
fi
fi
echo
echo
done < $1.ra
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ];
then
echo RADIR $RADIR
cd $RADIR
echo "Building"
echo ============================================
$MAKE clean
./configure
$MAKE
fi
fi
PATH=$ORIGPATH