From 80621be0b1f7be85b0d0a37197865c29f018ad7a Mon Sep 17 00:00:00 2001 From: mittorn Date: Thu, 20 Aug 2015 01:22:32 +0700 Subject: [PATCH 01/11] Add overrides for NDK's setup.mk --- jni/Android.mk | 36 ++++++++++++++++++++++++++++++++++++ jni/Application.mk | 4 ++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/jni/Android.mk b/jni/Android.mk index 5053e7d6..6cc12757 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1 +1,37 @@ +# override some setup.mk defines + +override TARGET_arm_release_CFLAGS := +override TARGET_thumb_release_CFLAGS := +override TARGET_arm_debug_CFLAGS := +override TARGET_thumb_debug_CFLAGS := + +ifeq ($(TARGET_ARCH_ABI),armeabi-v7a-hard) +override TARGET_CFLAGS := $(CFLAGS_OPT) $(CFLAGS_OPT_ARM) $(CFLAGS_HARDFP) +endif + +ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) +override TARGET_CFLAGS := $(CFLAGS_OPT) $(CFLAGS_OPT_ARM) +endif + +ifeq ($(TARGET_ARCH_ABI),armeabi) +override TARGET_CFLAGS := $(CFLAGS_OPT) $(CFLAGS_OPT_ARMv5) +endif + +ifeq ($(TARGET_ARCH_ABI),x86) +override TARGET_CFLAGS := $(CFLAGS_OPT) $(CFLAGS_OPT_X86) +endif + +# Compatibility trick, don't need all projects to be updated + +CFLAGS_OPT := + +CFLAGS_OPT_ARM := + +CFLAGS_OPT_ARMv5 := + +CFLAGS_OPT_X86 := + +CFLAGS_HARDFP := + + include $(call all-subdir-makefiles) diff --git a/jni/Application.mk b/jni/Application.mk index 0ddc4f1c..53532d3c 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -14,9 +14,9 @@ endif CFLAGS_OPT := -O3 -fomit-frame-pointer -ggdb -funsafe-math-optimizations -ftree-vectorize -fgraphite-identity -floop-interchange -funsafe-loop-optimizations -finline-limit=1024 CFLAGS_OPT_ARM := -mthumb -mfpu=neon -mcpu=cortex-a9 -pipe -mvectorize-with-neon-quad -DVECTORIZE_SINCOS -CFLAGS_OPT_ARMv5 := -msoft-float -marm -pipe +CFLAGS_OPT_ARMv5 :=-mcpu=arm1136j-s -mfpu=vfp -marm -pipe CFLAGS_OPT_X86 := -mtune=atom -march=atom -mssse3 -mfpmath=sse -funroll-loops -pipe -DVECTORIZE_SINCOS - +CFLAGS_HARDFP := -D_NDK_MATH_NO_SOFTFP=1 -mhard-float -mfloat-abi=hard -DLOAD_HARDFP -DSOFTFP_LINK APPLICATIONMK_PATH = $(call my-dir) ifeq ($(EMILE),1) From 09be3178946ac65a9f066060f4bcd603f075a5b1 Mon Sep 17 00:00:00 2001 From: mittorn Date: Thu, 20 Aug 2015 01:34:33 +0700 Subject: [PATCH 02/11] Upload to transfer.sh and disable non-arm build --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b5138d1d..7934b178 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,8 @@ before_install: - git clone -q --depth=1 https://github.com/mittorn/SDL-mirror jni/src/SDL2/SDL-mirror - sed -i -- s/android-8/android-15/g project.properties script: - - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" + - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard" - ant debug after_script: - - curl -T bin/xashdroid-debug.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-`date +%d-%m-%y`-`git rev-parse --short HEAD`.apk + - curl --upload-file bin/xashdroid-debug.apk https://transfer.sh/xash3d-armv7-a-`date +%d-%m-%y`.apk + - curl -T bin/xashdroid-debug.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv7-a-`date +%d-%m-%y`-`git rev-parse --short HEAD`.apk From a04843e766a27265564d06cc9423b31981a7b93c Mon Sep 17 00:00:00 2001 From: mittorn Date: Thu, 20 Aug 2015 12:28:00 +0700 Subject: [PATCH 03/11] Add git versions to about dialog --- .gitignore | 1 + .travis.yml | 1 + build-test.sh | 1 + build.sh | 1 + debug.sh | 1 + gen-version.sh | 14 ++++++++++++++ res/layout/about.xml | 8 ++++++++ res/values/git-rev.xml | 4 ++++ 8 files changed, 31 insertions(+) create mode 100755 gen-version.sh create mode 100644 res/values/git-rev.xml diff --git a/.gitignore b/.gitignore index 9e679227..082b81f9 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ jni/src/MobileTouchControls/MobileTouchControls local.properties +res/values/git-rev.xml diff --git a/.travis.yml b/.travis.yml index 7934b178..e97fd3c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,7 @@ before_install: - sed -i -- s/android-8/android-15/g project.properties script: - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard" + - sh gen-version.sh travis build - ant debug after_script: - curl --upload-file bin/xashdroid-debug.apk https://transfer.sh/xash3d-armv7-a-`date +%d-%m-%y`.apk diff --git a/build-test.sh b/build-test.sh index ba14de6d..92c35655 100644 --- a/build-test.sh +++ b/build-test.sh @@ -4,6 +4,7 @@ DX=./../dx APKBUILDER=./../apkbuilder mkdir gen mkdir bin +sh gen-version.sh test build $AAPT package -m -J gen/ --rename-manifest-package in.celest.xash3d.hl -M AndroidManifest.xml -S test/res -I $ANDROID_JAR $JAVA_HOME/bin/javac -d bin/classes -s bin/classes -cp $ANDROID_JAR:libs/com.bda.controller.jar src/org/libsdl/app/SDLActivity.java src/com/beloko/games/hl/NativeLib.java src/com/beloko/touchcontrols/* gen/in/celest/xash3d/hl/R.java src/in/celest/xash3d/* $DX --dex --output=bin/classes.dex bin/classes/ libs/com.bda.controller.jar diff --git a/build.sh b/build.sh index 70eb6c3f..8e2c4795 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,7 @@ #!/bin/sh ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=0 SUPPORT_WEBP=false V=1 +sh gen-version.sh default-release ant release #jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../myks.keystore bin/xashdroid-release-unsigned.apk xashdroid #adb install -r -f bin/xashdroid-debug.apk diff --git a/debug.sh b/debug.sh index 4a895508..d8929ca3 100755 --- a/debug.sh +++ b/debug.sh @@ -1,6 +1,7 @@ #!/bin/sh ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=1 SUPPORT_WEBP=false V=1 -j3 APP_CFLAGS="-gdwarf-3" +sh gen-version.sh default-debug ant debug #jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../myks.keystore bin/xashdroid-release-unsigned.apk xashdroid -storepass 529459 adb install -r -f bin/xashdroid-debug.apk diff --git a/gen-version.sh b/gen-version.sh new file mode 100755 index 00000000..b7c5c645 --- /dev/null +++ b/gen-version.sh @@ -0,0 +1,14 @@ +echo '' > res/values/git-rev.xml +echo '' >> res/values/git-rev.xml +echo '' >> res/values/git-rev.xml +echo 'Version information:' $* \\n >> res/values/git-rev.xml +echo 'android:' $(git log --abbrev-commit --pretty=oneline -1) \\n \ +'engine:' $(cd jni/src/Xash3D/*/;git log --abbrev-commit --pretty=oneline -1) \\n \ +'client:' $(cd jni/src/XashXT/*/;git log --abbrev-commit --pretty=oneline -1) \\n \ +'halflife:' $(cd jni/src/HLSDK/*/;git log --abbrev-commit --pretty=oneline -1) \\n \ +'SDL2:' $(cd jni/src/SDL2/*/;git log --abbrev-commit --pretty=oneline -1) \\n \ +'TouchControls:' $(cd jni/src/MobileTouchControls/*/;git log --abbrev-commit --pretty=oneline -1) \\n \ +'nanogl:' $(cd jni/src/NanoGL/*/;git log --abbrev-commit --pretty=oneline -1) \\n \ + | sed -e s/\'/\\\\\'/g >> res/values/git-rev.xml +echo '' >> res/values/git-rev.xml +echo '' >> res/values/git-rev.xml diff --git a/res/layout/about.xml b/res/layout/about.xml index d935c01a..0ad3470b 100644 --- a/res/layout/about.xml +++ b/res/layout/about.xml @@ -45,6 +45,14 @@ android:password="false" android:longClickable="false" android:autoText="false" /> + + +No git version information + From 38f4a7c14469e62d8315eaf57ecf6e04fc0bba6a Mon Sep 17 00:00:00 2001 From: mittorn Date: Thu, 20 Aug 2015 13:13:01 +0700 Subject: [PATCH 04/11] Fix version information in holo theme --- gen-version.sh | 1 + res/layout/about.xml | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gen-version.sh b/gen-version.sh index b7c5c645..4ed95536 100755 --- a/gen-version.sh +++ b/gen-version.sh @@ -1,3 +1,4 @@ +git update-index --assume-unchanged res/values/git-rev.xml echo '' > res/values/git-rev.xml echo '' >> res/values/git-rev.xml echo '' >> res/values/git-rev.xml diff --git a/res/layout/about.xml b/res/layout/about.xml index 0ad3470b..db7246a5 100644 --- a/res/layout/about.xml +++ b/res/layout/about.xml @@ -52,7 +52,13 @@ android:text="@string/git_revisions" android:id="@+id/textView5" android:autoText="false" - android:autoLink="web" /> + android:longClickable="false" + android:password="false" + android:enabled="true" + android:clickable="false" + android:singleLine="false" + + /> From 1dda4a0468609e0168cc02422be649f20f156081 Mon Sep 17 00:00:00 2001 From: mittorn Date: Thu, 20 Aug 2015 13:38:55 +0700 Subject: [PATCH 05/11] Another try --- gen-version.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gen-version.sh b/gen-version.sh index 4ed95536..3e6854e2 100755 --- a/gen-version.sh +++ b/gen-version.sh @@ -3,13 +3,14 @@ echo '' > res/values/git-rev.xml echo '' >> res/values/git-rev.xml echo '' >> res/values/git-rev.xml echo 'Version information:' $* \\n >> res/values/git-rev.xml -echo 'android:' $(git log --abbrev-commit --pretty=oneline -1) \\n \ -'engine:' $(cd jni/src/Xash3D/*/;git log --abbrev-commit --pretty=oneline -1) \\n \ -'client:' $(cd jni/src/XashXT/*/;git log --abbrev-commit --pretty=oneline -1) \\n \ -'halflife:' $(cd jni/src/HLSDK/*/;git log --abbrev-commit --pretty=oneline -1) \\n \ -'SDL2:' $(cd jni/src/SDL2/*/;git log --abbrev-commit --pretty=oneline -1) \\n \ -'TouchControls:' $(cd jni/src/MobileTouchControls/*/;git log --abbrev-commit --pretty=oneline -1) \\n \ -'nanogl:' $(cd jni/src/NanoGL/*/;git log --abbrev-commit --pretty=oneline -1) \\n \ +echo 'android:' $(git log --abbrev-commit --pretty=oneline -1) '\n'\ +'engine:' $(cd jni/src/Xash3D/*/;git log --abbrev-commit --pretty=oneline -1) '\n'\ +'client:' $(cd jni/src/XashXT/*/;git log --abbrev-commit --pretty=oneline -1) ' \n'\ +'halflife:' $(cd jni/src/HLSDK/*/;git log --abbrev-commit --pretty=oneline -1) ' \n'\ +'SDL2:' $(cd jni/src/SDL2/*/;git log --abbrev-commit --pretty=oneline -1) '\n'\ +'TouchControls:' $(cd jni/src/MobileTouchControls/*/;git log --abbrev-commit --pretty=oneline -1) '\n'\ +'nanogl:' $(cd jni/src/NanoGL/*/;git log --abbrev-commit --pretty=oneline -1) '\n'\ | sed -e s/\'/\\\\\'/g >> res/values/git-rev.xml echo '' >> res/values/git-rev.xml echo '' >> res/values/git-rev.xml +cat res/values/git-rev.xml From a22678fc46cdd14f8a55d61a2c1e52655ae7664e Mon Sep 17 00:00:00 2001 From: mittorn Date: Thu, 20 Aug 2015 13:53:47 +0700 Subject: [PATCH 06/11] Yet another try --- gen-version.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gen-version.sh b/gen-version.sh index 3e6854e2..3cc7868b 100755 --- a/gen-version.sh +++ b/gen-version.sh @@ -3,14 +3,14 @@ echo '' > res/values/git-rev.xml echo '' >> res/values/git-rev.xml echo '' >> res/values/git-rev.xml echo 'Version information:' $* \\n >> res/values/git-rev.xml -echo 'android:' $(git log --abbrev-commit --pretty=oneline -1) '\n'\ +echo 'android:' $(git log --abbrev-commit --pretty=oneline -1) _endl \ 'engine:' $(cd jni/src/Xash3D/*/;git log --abbrev-commit --pretty=oneline -1) '\n'\ -'client:' $(cd jni/src/XashXT/*/;git log --abbrev-commit --pretty=oneline -1) ' \n'\ -'halflife:' $(cd jni/src/HLSDK/*/;git log --abbrev-commit --pretty=oneline -1) ' \n'\ -'SDL2:' $(cd jni/src/SDL2/*/;git log --abbrev-commit --pretty=oneline -1) '\n'\ -'TouchControls:' $(cd jni/src/MobileTouchControls/*/;git log --abbrev-commit --pretty=oneline -1) '\n'\ -'nanogl:' $(cd jni/src/NanoGL/*/;git log --abbrev-commit --pretty=oneline -1) '\n'\ - | sed -e s/\'/\\\\\'/g >> res/values/git-rev.xml +'client:' $(cd jni/src/XashXT/*/;git log --abbrev-commit --pretty=oneline -1) ' \\n'\ +'halflife:' $(cd jni/src/HLSDK/*/;git log --abbrev-commit --pretty=oneline -1) ' \\\n'\ +'SDL2:' $(cd jni/src/SDL2/*/;git log --abbrev-commit --pretty=oneline -1) \n \ +'TouchControls:' $(cd jni/src/MobileTouchControls/*/;git log --abbrev-commit --pretty=oneline -1) \\\n \ +'nanogl:' $(cd jni/src/NanoGL/*/;git log --abbrev-commit --pretty=oneline -1) \\\\n \ + | sed -e s/\'/\\\\\'/g -e s/_endl/'\\n'/ >> res/values/git-rev.xml echo '' >> res/values/git-rev.xml echo '' >> res/values/git-rev.xml cat res/values/git-rev.xml From d7c89d1d9b98032f2b0c07cecd3ff38950cb4884 Mon Sep 17 00:00:00 2001 From: mittorn Date: Thu, 20 Aug 2015 14:30:16 +0700 Subject: [PATCH 07/11] Fir trailing spaces in version info, add date --- .travis.yml | 4 ++-- gen-version.sh | 22 ++++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index e97fd3c4..6d1ac548 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,5 +28,5 @@ script: - sh gen-version.sh travis build - ant debug after_script: - - curl --upload-file bin/xashdroid-debug.apk https://transfer.sh/xash3d-armv7-a-`date +%d-%m-%y`.apk - - curl -T bin/xashdroid-debug.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv7-a-`date +%d-%m-%y`-`git rev-parse --short HEAD`.apk + - curl --upload-file bin/xashdroid-debug.apk https://transfer.sh/xash3d-armv7-`date -u +%y-%m-%d-%H-%M`.apk + - curl -T bin/xashdroid-debug.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv7-`date +%d-%m-%y`-`git rev-parse --short HEAD`.apk diff --git a/gen-version.sh b/gen-version.sh index 3cc7868b..d080d8ea 100755 --- a/gen-version.sh +++ b/gen-version.sh @@ -1,16 +1,18 @@ git update-index --assume-unchanged res/values/git-rev.xml echo '' > res/values/git-rev.xml echo '' >> res/values/git-rev.xml -echo '' >> res/values/git-rev.xml -echo 'Version information:' $* \\n >> res/values/git-rev.xml -echo 'android:' $(git log --abbrev-commit --pretty=oneline -1) _endl \ -'engine:' $(cd jni/src/Xash3D/*/;git log --abbrev-commit --pretty=oneline -1) '\n'\ -'client:' $(cd jni/src/XashXT/*/;git log --abbrev-commit --pretty=oneline -1) ' \\n'\ -'halflife:' $(cd jni/src/HLSDK/*/;git log --abbrev-commit --pretty=oneline -1) ' \\\n'\ -'SDL2:' $(cd jni/src/SDL2/*/;git log --abbrev-commit --pretty=oneline -1) \n \ -'TouchControls:' $(cd jni/src/MobileTouchControls/*/;git log --abbrev-commit --pretty=oneline -1) \\\n \ -'nanogl:' $(cd jni/src/NanoGL/*/;git log --abbrev-commit --pretty=oneline -1) \\\\n \ - | sed -e s/\'/\\\\\'/g -e s/_endl/'\\n'/ >> res/values/git-rev.xml +echo -n '' >> res/values/git-rev.xml +echo -n 'Version information:'$*_endl| sed -e s/_endl/'\\n'/ >> res/values/git-rev.xml +echo -n 'android:' $(git log --abbrev-commit --pretty=oneline -1) _endl\ +'engine:' $(cd jni/src/Xash3D/*/;git log --abbrev-commit --pretty=oneline -1) _endl\ +'client:' $(cd jni/src/XashXT/*/;git log --abbrev-commit --pretty=oneline -1) _endl\ +'halflife:' $(cd jni/src/HLSDK/*/;git log --abbrev-commit --pretty=oneline -1) _endl\ +'SDL2:' $(cd jni/src/SDL2/*/;git log --abbrev-commit --pretty=oneline -1) _endl\ +'TouchControls:' $(cd jni/src/MobileTouchControls/*/;git log --abbrev-commit --pretty=oneline -1) _endl\ +'nanogl:' $(cd jni/src/NanoGL/*/;git log --abbrev-commit --pretty=oneline -1)_endl\ + | sed -e s/\'/\\\\\'/g -e s/_endl/'\\n'/g >> res/values/git-rev.xml +echo -n ' ' $USER@$HOSTNAME >> res/values/git-rev.xml +echo -n $(date +%H:%M:%S-%d-%m-%y) >> res/values/git-rev.xml echo '' >> res/values/git-rev.xml echo '' >> res/values/git-rev.xml cat res/values/git-rev.xml From 2d9d05f00ec89876a13bc58bed2bd70b77ee02b5 Mon Sep 17 00:00:00 2001 From: mittorn Date: Thu, 20 Aug 2015 15:59:11 +0700 Subject: [PATCH 08/11] Fix spaces, add time to yandex --- .travis.yml | 4 ++-- gen-version.sh | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d1ac548..cbf853de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,5 +28,5 @@ script: - sh gen-version.sh travis build - ant debug after_script: - - curl --upload-file bin/xashdroid-debug.apk https://transfer.sh/xash3d-armv7-`date -u +%y-%m-%d-%H-%M`.apk - - curl -T bin/xashdroid-debug.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv7-`date +%d-%m-%y`-`git rev-parse --short HEAD`.apk + - curl --upload-file bin/xashdroid-debug.apk https://transfer.sh/xash3d-armv7-`date -u +%y-%m-%d_%H-%M`.apk + - curl -T bin/xashdroid-debug.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv7-`date -u +%y-%m-%d_%H-%M`-`git rev-parse --short HEAD`.apk diff --git a/gen-version.sh b/gen-version.sh index d080d8ea..72d5ea8e 100755 --- a/gen-version.sh +++ b/gen-version.sh @@ -2,7 +2,7 @@ git update-index --assume-unchanged res/values/git-rev.xml echo '' > res/values/git-rev.xml echo '' >> res/values/git-rev.xml echo -n '' >> res/values/git-rev.xml -echo -n 'Version information:'$*_endl| sed -e s/_endl/'\\n'/ >> res/values/git-rev.xml +echo -n 'Version information: ' $*_endl| sed -e s/_endl/'\\n'/ >> res/values/git-rev.xml echo -n 'android:' $(git log --abbrev-commit --pretty=oneline -1) _endl\ 'engine:' $(cd jni/src/Xash3D/*/;git log --abbrev-commit --pretty=oneline -1) _endl\ 'client:' $(cd jni/src/XashXT/*/;git log --abbrev-commit --pretty=oneline -1) _endl\ @@ -10,9 +10,8 @@ echo -n 'android:' $(git log --abbrev-commit --pretty=oneline -1) _endl\ 'SDL2:' $(cd jni/src/SDL2/*/;git log --abbrev-commit --pretty=oneline -1) _endl\ 'TouchControls:' $(cd jni/src/MobileTouchControls/*/;git log --abbrev-commit --pretty=oneline -1) _endl\ 'nanogl:' $(cd jni/src/NanoGL/*/;git log --abbrev-commit --pretty=oneline -1)_endl\ - | sed -e s/\'/\\\\\'/g -e s/_endl/'\\n'/g >> res/values/git-rev.xml -echo -n ' ' $USER@$HOSTNAME >> res/values/git-rev.xml -echo -n $(date +%H:%M:%S-%d-%m-%y) >> res/values/git-rev.xml + | sed -e s/\'//g -e s/_endl/'\\n'/g >> res/values/git-rev.xml +echo -n $USER@$(hostname) $(date +%H:%M:%S-%d-%m-%y) >> res/values/git-rev.xml echo '' >> res/values/git-rev.xml echo '' >> res/values/git-rev.xml cat res/values/git-rev.xml From 65f6fe58b7e73d8b84605be9a15bc73a0434b817 Mon Sep 17 00:00:00 2001 From: mittorn Date: Sat, 22 Aug 2015 07:53:18 +0700 Subject: [PATCH 09/11] Build three architectures --- .travis.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cbf853de..6c9df8bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,9 +24,21 @@ before_install: - git clone -q --depth=1 https://github.com/mittorn/SDL-mirror jni/src/SDL2/SDL-mirror - sed -i -- s/android-8/android-15/g project.properties script: - - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard" - sh gen-version.sh travis build + - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi-v7a-hard" - ant debug + - cp bin/xashdroid-debug.apk xashdroid-armv7.apk + - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="armeabi" + - ant debug + - cp bin/xashdroid-debug.apk xashdroid-armv6.apk + - ndk-build NDK_TOOLCHAIN_VERSION=4.8 XASH_SDL=1 SUPPORT_WEBP=false -j2 APP_CFLAGS="-w" APP_ABI="x86" + - ant debug + - cp bin/xashdroid-debug.apk xashdroid-x86.apk after_script: - - curl --upload-file bin/xashdroid-debug.apk https://transfer.sh/xash3d-armv7-`date -u +%y-%m-%d_%H-%M`.apk - - curl -T bin/xashdroid-debug.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv7-`date -u +%y-%m-%d_%H-%M`-`git rev-parse --short HEAD`.apk + - curl --upload-file xashdroid-armv7.apk https://transfer.sh/xash3d-armv7-`date -u +%y-%m-%d_%H-%M`.apk + - curl --upload-file xashdroid-armv6.apk https://transfer.sh/xash3d-armv6-`date -u +%y-%m-%d_%H-%M`.apk + - curl --upload-file xashdroid-x86.apk https://transfer.sh/xash3d-x86-`date -u +%y-%m-%d_%H-%M`.apk + - curl -T bin/xashdroid-armv7.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv7-`date -u +%y-%m-%d_%H-%M`-`git rev-parse --short HEAD`.apk + - curl -T bin/xashdroid-armv6.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv6-`date -u +%y-%m-%d_%H-%M`-`git rev-parse --short HEAD`.apk + - curl -T bin/xashdroid-x86.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-x86-`date -u +%y-%m-%d_%H-%M`-`git rev-parse --short HEAD`.apk + \ No newline at end of file From dba7d531e86334508be6e1c1a0d95537894fb7c2 Mon Sep 17 00:00:00 2001 From: mittorn Date: Mon, 24 Aug 2015 00:02:07 +0700 Subject: [PATCH 10/11] Fix yandex upload paths --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c9df8bc..f77f01ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ after_script: - curl --upload-file xashdroid-armv7.apk https://transfer.sh/xash3d-armv7-`date -u +%y-%m-%d_%H-%M`.apk - curl --upload-file xashdroid-armv6.apk https://transfer.sh/xash3d-armv6-`date -u +%y-%m-%d_%H-%M`.apk - curl --upload-file xashdroid-x86.apk https://transfer.sh/xash3d-x86-`date -u +%y-%m-%d_%H-%M`.apk - - curl -T bin/xashdroid-armv7.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv7-`date -u +%y-%m-%d_%H-%M`-`git rev-parse --short HEAD`.apk - - curl -T bin/xashdroid-armv6.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv6-`date -u +%y-%m-%d_%H-%M`-`git rev-parse --short HEAD`.apk - - curl -T bin/xashdroid-x86.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-x86-`date -u +%y-%m-%d_%H-%M`-`git rev-parse --short HEAD`.apk - \ No newline at end of file + - curl -T xashdroid-armv7.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv7-`date -u +%y-%m-%d_%H-%M`-`git rev-parse --short HEAD`.apk + - curl -T xashdroid-armv6.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv6-`date -u +%y-%m-%d_%H-%M`-`git rev-parse --short HEAD`.apk + - curl -T xashdroid-x86.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-x86-`date -u +%y-%m-%d_%H-%M`-`git rev-parse --short HEAD`.apk + From 29aec91121d8d3f7d37b1f5310964028198e7e1b Mon Sep 17 00:00:00 2001 From: mittorn Date: Mon, 24 Aug 2015 00:02:59 +0700 Subject: [PATCH 11/11] Fix layout --- res/layout/about.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/layout/about.xml b/res/layout/about.xml index db7246a5..af1d5142 100644 --- a/res/layout/about.xml +++ b/res/layout/about.xml @@ -34,11 +34,11 @@