diff --git a/app2sd.sh b/app2sd.sh deleted file mode 100755 index 69d8d4147..000000000 --- a/app2sd.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -APK=$1 -if [ -z "$APK" ] ; then - APK=project/bin/MainActivity-debug.apk -fi - -echo Moving shared libraries on $APK to SD card -APK=`pwd`/$APK - -[ -e $APK ] || { echo File $APK does not exist; exit 1; } - -TMPDIR=app2sd-$$ - -mkdir -p $TMPDIR -cd $TMPDIR - -unzip $APK "lib/armeabi/*" || { echo "This apk file has already been app2sd-ed, or improperly compiled"; exit 1; } - -zip -j bindata.zip lib/armeabi/* -mkdir assets -split -b 1048576 -d -a 1 bindata.zip assets/bindata -rm bindata.zip - -zip -d $APK "lib/armeabi/*" "META-INF/*" - -zip -0 $APK assets/bindata* - -jarsigner -verbose -keystore ~/.android/debug.keystore -storepass "android" $APK androiddebugkey - -zipalign 4 $APK $APK-tmp -mv -f $APK-tmp $APK - -cd .. -rm -rf $TMPDIR diff --git a/regression.sh b/regression.sh deleted file mode 100755 index 7e2ef4bbd..000000000 --- a/regression.sh +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash - -if [ -z "$1" ] ; then - echo "Usage: $0 startdate [enddate=now] [revisions-step=10]" - echo "Runs regression tests for all Git revisions up to specified date," - echo "and produces the FPS measurements for each of the revisions." - echo "Naturally, you'll need to have an Android device connected to USB port," - echo "and you should disable screen timeout in the Android device settings." - echo "Also, it messes up your current Git branch, so backup all your current changes," - echo "and you'll have to run command 'git checkout -f sdl_android' after you're done." -fi - -if echo "$0" | grep "regression/run-regression.sh" ; then -echo Running FPS regression tests -else -mkdir -p regression -cp -f "$0" regression/run-regression.sh -chmod a+x regression/run-regression.sh -regression/run-regression.sh "$@" -exit $? -fi - -FROM="$1" -FROM="`git log -n 1 --format='%cD' \"@{$FROM}\" --`" -TO="$2" -if [ -z "$TODATE" ] ; then - TO="`git log -n 1 --format='%cD' --`" -fi -STEP="$3" -if [ -z "$STEP" ] ; then - STEP=10 -fi - -REVLIMIT="2011-05-31 16:30:08" -if [ `date -d "$REVLIMIT" "+%s"` -gt `date -d "$FROM" "+%s"` ] ; then - echo "----- WARNING ----- ----- WARNING ----- ----- WARNING ----- ----- WARNING -----" - echo "The revisions below date $REVLIMIT do not support skipping the config dialog," - echo "so they will stuck at the config screen after launching, so no data will be collected." - echo "You will have to launch the tests with those .apk files manually" - echo "----- WARNING ----- ----- WARNING ----- ----- WARNING ----- ----- WARNING -----" -fi - -#export OLDBRANCH=`git branch | grep '*' | sed 's/[* ]*//'` -#export CURDIR="`pwd`" -#function restoreGit() { -# echo Restoring Git branch "$OLDBRANCH" -# rm -rf "$CURDIR/project/jni/application/regression" -# git checkout -f "$OLDBRANCH" -# exit 0 -#} - -#trap restoreGit SIGHUP - -echo Revisions from "$FROM" to "$TO" , step "$STEP" -rm -rf regression/regression -cp -r project/jni/application/regression regression/regression -git checkout -f "@{$TO}" -CURRENT="`git log -n 1 --format='%cD' --`" -while [ `date -d "$CURRENT" "+%s"` -gt `date -d "$FROM" "+%s"` ] ; do -CURFMT="`git log -n 1 --format='%ci' -- | sed 's/[+].*//' | sed 's/ /::/'`" -CURFMT=`echo $CURFMT | sed 's/ //'` -echo \"$CURFMT\" -rm -f project/jni/application/src -rm -rf project/jni/application/regression -cp -rf regression/regression project/jni/application/regression -ln -s regression project/jni/application/src -./ChangeAppSettings.sh -a -echo Patching project/src/Globals.java -cat project/src/Globals.java | \ - sed "s/public static boolean DownloadToSdcard = .*;/public static boolean DownloadToSdcard = false;/" > \ - project/src/Globals.java.1 -mv -f project/src/Globals.java.1 project/src/Globals.java -echo "#define BUILDDATE \"$CURFMT\"" > project/jni/application/regression/regression.h -rm -rf project/obj -cd project -nice -n19 ndk-build V=1 -j4 && ant debug && cp -f bin/DemoActivity-debug.apk ../regression/$CURFMT.apk -cd .. -adb shell pm uninstall net.olofson.ballfield.regression -sleep 2 -adb install -r regression/$CURFMT.apk -sleep 5 -adb shell am start -n net.olofson.ballfield.regression/.MainActivity -sleep 40 -echo >> regression/regression.txt -echo BUILDDATE $CURFMT: "`git log -n 1 --format="%s"`" >> regression/regression.txt -echo >> regression/regression.txt -adb shell logcat -d -t 20 | grep "SDL REGRESSION BUILDDATE $CURFMT" >> regression/regression.txt -adb shell pm uninstall net.olofson.ballfield.regression - -git checkout -f "HEAD~$STEP" -CURRENT="`git log -n 1 --format='%cD' --`" -done - -#restoreGit