Merge remote-tracking branch 'origin/travis-new-path' into remove-sdl

2016-05-16 22:26:53 +00:00 · 2016-05-16 22:26:53 +00:00 · 379266732e
commit 379266732e
parent 1333895aa6 87a536ffc0
8 changed files with 325 additions and 11 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -41,14 +41,5 @@ script:


 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 --upload-file xashdroid-armv7-tegra2.apk https://transfer.sh/xash3d-armv7-tegra2-`date -u +%y-%m-%d_%H-%M`.apk
-  - curl --upload-file xashdroid-armv5.apk https://transfer.sh/xash3d-armv5-`date -u +%y-%m-%d_%H-%M`.apk
-  - 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
-  - curl -T xashdroid-armv7-tegra2.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv7-tegra2-`date -u +%y-%m-%d_%H-%M`-`git rev-parse --short HEAD`.apk
-  - curl -T xashdroid-armv5.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv5-`date -u +%y-%m-%d_%H-%M`-`git rev-parse --short HEAD`.apk
+  - bash scripts/travis-upload.sh

--- a/README.md
+++ b/README.md
@ -26,5 +26,5 @@ About all bugs please write to issues with your device and OS info.

 ### Developers

-+ Just put into jni/src/XXXX/ a symlink to a repository. For example, for HLSDK it will be jni/src/HLSDK/halflife/
+ For compiling, run `git submodule init && git submodule update`. Otherwise you will get an empty APK, without any libraries. 
 + We use our SDL2 fork. See https://github.com/mittorn/SDL-mirror
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Xash3D</string>
+	<string name="launcher_name">Xash3D</string>
+	<string name="launcher_name_test">Xash3D (test)</string>
+
+    <string name="launch_button">¡Iniciar Xash3D!</string>
+    <string name="cmd_args_text">Parámetros de línea de comandos(sólo expertos)</string>
+	<string name="use_controls">Activar controles táctiles</string>
+	<string name="use_volume">Usar botones de volumen</string>
+	<string name="text_res_path">Ruta de los archivos del juego</string>
+	<string name="touch_set">Configurar controles</string>
+	<string name="text_shortcut">Acceso directo Xash3D</string>
+	<string name="text_shortcut_test">Acceso directo Xash3D_test</string>
+	<string name="shortcut_button_save">Guardar acceso directo</string>
+	<string name="gamedir">Directorio del mod</string>
+	<string name="pkgname">Nombre del paquete del mod (sólo expertos)</string>
+	<string name="shortcut_name">Nombre del acceso directo</string>
+
+<!-- TODO: Remove or change this placeholder text -->
+    <string name="about_main">Xash3D Android</string>
+    <string name="about_copyright">SDLash3D no está afiliado con Valve o cualquiera de sus socios. Todos los derechos reservados a sus respectivos dueños.</string>
+    <string name="version_string" translatable="false">v0.17.1</string>
+    <string name="about_authors">Adaptación para Android por SDLash3D team: \n
+&#8226; a1batross\n
+&#8226; mittorn \n
+&#8226; nicknekit.\n
+
+Especial agradecimiento a:\n
+&#8226; Uncle Mike por Xash3D engine\n
+&#8226; Valve por Half-Life\n
+&#8226; Desarrolladores de libSDL2.\n</string>
+<string name="about_links">Siguenos en: 
+	&#8226; <a href="https://vk.com/xashdroid">VK</a>
+	&#8226; <a href="http://moddb.com/game/xash3d-android">ModDB</a>
+	&#8226; <a href="https://github.com/SDLash3D">GitHub</a></string>
+    <string name="about_button">Acerca de Xash3D Android</string>
+    <string name="create_shortcut_button">Crear acceso directo del mod</string>
+    <string name="select_folder">(seleccionar)</string>
+</resources>
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+  <string name="app_name">Xash3D</string>
+  <string name="launcher_name">Xash3D</string>
+  <string name="launcher_name_test">Xash3D (آزمایشی)</string>
+  <string name="launch_button">!Xash3Dاجرای</string>
+  <string name="cmd_args_text">دستورات خط فرمان (فقط برای حرفه ای ها):</string>
+  <string name="use_controls">فعال کردن کنترل های لمسی</string>
+  <string name="use_volume">استفاده از دکمه های صدا</string>
+  <string name="text_res_path">مسیر منابع بازی:</string>
+  <string name="touch_set">تنظیمات کنترل:</string>
+  <string name="text_shortcut">Xash3D میانبر</string>
+  <string name="text_shortcut_test">Xash3D_test shortcut</string>
+  <string name="shortcut_button_save">ذخیره میانبر</string>
+  <string name="gamedir">مسیر مود</string>
+  <string name="pkgname">نام بسته مود (فقط برای حرفه ای ها):</string>
+  <string name="shortcut_name">نام میانبر</string>
+  <string name="about_main">Xash3D Android</string>
+  <string name="about_copyright">یا شرکای آن ندارد. تمامی حقوق کپی برای صاحبان هر کدام محفوظ است. Valve هیچ نسبتی با SDLash3D</string>
+  <string name="version_string" translatable="false">v0.17.1</string>
+  <string name="about_authors">:SDLash3D پورت شده به اندروید توسط تیم \n • a1batross\n • mittorn \n • nicknekit.\n  تشکر ویژه از:\n • Xash3Dبرای موتور Uncle Mike\n •  Half-Life برای Valve\n • libSDL2 توسعه دهندگان.\n</string>
+  <string name="about_links">ما را دنبال کنید در  : •<a href="https://vk.com/xashdroid">VK</a>•<a href="http://moddb.com/game/xash3d-android">ModDB</a>•<a href="https://github.com/SDLash3D">GitHub</a></string>
+  <string name="about_button">Xash3D Android درباره</string>
+  <string name="create_shortcut_button">ایجاد میانبر مود</string>
+  <string name="select_folder">(انتخاب)</string>
+</resources>
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Xash3D</string>
+	<string name="launcher_name">Xash3D</string>
+	<string name="launcher_name_test">Xash3D (test)</string>
+
+    <string name="launch_button">Iniciar Xash3D!</string>
+    <string name="cmd_args_text">Argumentos de linha de comando(apenas expecialistas)</string>
+	<string name="use_controls">Habilitar controles de touch</string>
+	<string name="use_volume">Use as teclas de volume</string>
+	<string name="text_res_path">Diretório para recursos do jogo</string>
+	<string name="touch_set">Configurações de controle</string>
+	<string name="text_shortcut">Atalho Xash3D</string>
+	<string name="text_shortcut_test">Atalho Xash3D_test</string>
+	<string name="shortcut_button_save">Salvar atalho</string>
+	<string name="gamedir">Diretório do Mod</string>
+	<string name="pkgname">Nome do pacote de Mod (apenas expecialistas)</string>
+	<string name="shortcut_name">Nome do atalho</string>
+
+<!-- TODO: Remove or change this placeholder text -->
+    <string name="about_main">Xash3D Android</string>
+    <string name="about_copyright">SDLash3D não é afiliado com a Valve ou qualquer um dos seus parceiros. Todos os direitos autorais reservados aos respectivos proprietários.</string>
+    <string name="version_string" translatable="false">v0.17.1</string>
+    <string name="about_authors">Porta para android pelo time SDLash3D: \n
+&#8226; a1batross\n
+&#8226; mittorn \n
+&#8226; nicknekit.\n
+
+Agradecimentos especiais para:\n
+&#8226; Uncle Mike pelo motor Xash3D\n
+&#8226; Valve pelo Half-Life\n
+&#8226; Desenvolvedores libSDL2.\n</string>
+<string name="about_links">Siga-nos no:
+	&#8226; <a href="https://vk.com/xashdroid">VK</a>
+	&#8226; <a href="http://moddb.com/game/xash3d-android">ModDB</a>
+	&#8226; <a href="https://github.com/SDLash3D">GitHub</a></string>
+    <string name="about_button">Sobre Android Xash3D</string>
+    <string name="create_shortcut_button">Criar atalho para o mod</string>
+    <string name="select_folder">(selecionar)</string>
+</resources>
--- a/res/values-zh/strings.xml
+++ b/res/values-zh/strings.xml
@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+
+
+    <string name="app_name">Xash3D</string>
+
+    <string name="launcher_name">Xash3D</string>
+
+    <string name="launcher_name_test">Xash3D (test)</string>
+
+    <string name="launch_button">启动 Xash3D!</string>
+
+    <string name="cmd_args_text">命令行参数（高级）</string>
+
+    <string name="use_controls">启用触摸控制</string>
+
+    <string name="use_volume">使用音量键</string>
+
+    <string name="text_res_path">游戏资源路径</string>
+
+    <string name="touch_set">控制设置</string>
+
+    <string name="text_shortcut">Xash3D 快捷方式</string>
+
+    <string name="text_shortcut_test">Xash3D_test 快捷方式</string>
+
+    <string name="shortcut_button_save">保存快捷方式</string>
+
+    <string name="gamedir">Mod 目录</string>
+
+    <string name="pkgname">Mod 资源包名字（高级）</string>
+
+    <string name="shortcut_name">快捷方式名字</string>
+
+
+<!-- TODO: Remove or change this placeholder text -->
+
+    <string name="about_main">Xash3D Android</string>
+
+    <string name="about_copyright">SDLash3D不隶属于Valve或其合作伙伴。 版权归各自所有。</string>
+
+    <string name="version_string" translatable="false">v0.17.1</string>
+
+    <string name="about_authors">由SDLash3D团队移植到Android系统，成员： \n
+
+&#8226; a1batross\n
+
+&#8226; mittorn \n
+
+&#8226; nicknekit.\n
+
+
+特别感谢：\n
+
+&#8226; Uncle Mike 制作的 Xash3D 引擎\n
+
+&#8226; Valve 制作的 《半条命》\n
+
+&#8226; libSDL2 开发商\n</string>
+
+    <string name="about_links">联系我们： 
+
+	&#8226; <a href="https://vk.com/xashdroid">VK</a>
+
+	&#8226; <a href="http://moddb.com/game/xash3d-android">ModDB</a>
+
+	&#8226; <a href="https://github.com/SDLash3D">GitHub</a></string>
+
+    <string name="about_button">关于 Xash3D Android</string>
+
+    <string name="create_shortcut_button">创建mod快捷方式</string>
+
+    <string name="select_folder">(选择)</string>
+
+</resources>
+
--- a/scripts/auto-rename.sh
+++ b/scripts/auto-rename.sh
@ -0,0 +1,75 @@
+#!/bin/bash
+
+# Was used to move bunch of travis autobuilds to new path
+
+# Remove unneeded info
+function clearName
+{
+	echo $1 | sed 's/xashdroid-//;s/.apk//'
+}
+
+function getYear
+{
+	echo $1 | awk -F- '{ print $(NF-4)}'
+}
+
+function getMonth
+{
+	echo $1 | awk -F- '{ print $(NF-3)}'
+}
+
+function getDay
+{
+	echo $1 | awk -F- '{ print $(NF-2)}' | awk -F_ '{ print $1 }'
+}
+
+function getHour
+{
+	echo $1 | awk -F- '{ print $(NF-2)}' | awk -F_ '{ print $2 }'
+}
+
+function getMinute
+{
+	echo $1 | awk -F- '{ print $(NF-1)}'
+}
+
+function getHash
+{
+	echo $1 | awk -F- '{ print $(NF)}'
+}
+
+
+function getArch
+{
+	local SECOND=`echo $1 | awk -F- '{ print $(NF-5)}'`
+	local FIRST=`echo $1 | awk -F- '{ print $(NF-6)}'`
+	
+	if [ "$SECOND" = "tegra2" ]; then
+		echo $FIRST-$SECOND
+	else
+		echo $SECOND
+	fi
+}
+
+function getDaysSinceRelease
+{
+	printf %04d $(( ( $(date -ud "$1$2$3" +'%s') - $(date -ud '150401' +'%s') )/60/60/24 ))
+}
+
+
+for i in *.apk;
+do
+	NAME=`clearName ${i}`
+	YEAR=`getYear ${NAME}`
+	MONTH=`getMonth ${NAME}`
+	DAY=`getDay ${NAME}`
+	HOUR=`getHour ${NAME}`
+	MINUTE=`getMinute ${NAME}`
+	ARCH=`getArch ${NAME}`
+	HASH=`getHash ${NAME}`
+	DAYSSINCERELEASE=`getDaysSinceRelease ${YEAR} ${MONTH} ${DAY}`
+	
+	echo "Moving ${i} to 20${YEAR}/${MONTH}/${DAY}/xash3d-${DAYSSINCERELEASE}-${HOUR}-${MINUTE}-${ARCH}-${HASH}.apk"
+	mkdir -p 20${YEAR}/${MONTH}/${DAY}/
+	mv ${i} 20${YEAR}/${MONTH}/${DAY}/xash3d-${DAYSSINCERELEASE}-${HOUR}-${MINUTE}-${ARCH}-${HASH}.apk
+done
--- a/scripts/travis-upload.sh
+++ b/scripts/travis-upload.sh
@ -0,0 +1,63 @@
+#!/bin/bash
+
+# Upload travis generated APKs to the Transfer.sh and Yandex.Disk
+
+function getDaysSinceRelease
+{
+	printf %04d $(( ( $(date +'%s') - $(date -ud '150401' +'%s') )/60/60/24 ))
+}
+
+DAYSSINCERELEASE=`getDaysSinceRelease`
+COMMITHASH=$(git rev-parse --short HEAD)
+CURRENTBRANCH=$(git rev-parse --abbrev-ref HEAD)
+
+function generateFileName
+{
+	echo "xash3d-$DAYSSINCERELEASE-$(date +"%H-%M")-$1-$COMMITHASH.apk"
+}
+
+
+
+# Transfer.sh
+TRANSFERSH_ARMV5=`curl --upload-file xashdroid-armv5.apk https://transfer.sh/$(generateFileName armv5)`
+TRANSFERSH_ARMV6=`curl --upload-file xashdroid-armv6.apk https://transfer.sh/$(generateFileName armv6)`
+TRANSFERSH_ARMV7=`curl --upload-file xashdroid-armv7.apk https://transfer.sh/$(generateFileName armv7)`
+TRANSFERSH_ARMV7TEGRA2=`curl --upload-file xashdroid-armv7-tegra2.apk https://transfer.sh/$(generateFileName armv7-tegra2)`
+TRANSFERSH_X86=`curl --upload-file xashdroid-x86.apk https://transfer.sh/$(generateFileName x86)`
+
+echo "Transfer.sh links:"
+echo "armv5:              ${TRANSFERSH_ARMV5}"
+echo "armv6:              ${TRANSFERSH_ARMV6}"
+echo "armv7:              ${TRANSFERSH_ARMV7}"
+echo "tegra2:             ${TRANSFERSH_ARMV7TEGRA2}"
+echo "x86:                ${TRANSFERSH_X86}"
+
+# YaDisk
+
+YADISKPATH=`date +%Y/%m/%d`
+
+curl -u $YADISK_USERNAME:$YADISK_PASSWORD -X MKCOL https://webdav.yandex.ru/XashTestVersions/`date +%Y`
+curl -u $YADISK_USERNAME:$YADISK_PASSWORD -X MKCOL https://webdav.yandex.ru/XashTestVersions/`date +%Y/%m`/
+curl -u $YADISK_USERNAME:$YADISK_PASSWORD -X MKCOL https://webdav.yandex.ru/XashTestVersions/`date +%Y/%m/%d`/
+
+curl -T xashdroid-armv7.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName armv7)
+curl -T xashdroid-armv6.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName armv6)
+curl -T xashdroid-armv5.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName armv5)
+curl -T xashdroid-armv7-tegra2.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName armv7-tegra2)
+curl -T xashdroid-x86.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$(generateFileName x86)
+
+# Update current
+# $TRAVIS_BRANCH is predefined by Travis CI
+function generateFileName_current
+{
+	echo "xash3d-current-$1-$TRAVIS_BRANCH.apk"
+}
+
+curl -T xashdroid-armv7.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$(generateFileName_current armv7)
+curl -T xashdroid-armv6.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$(generateFileName_current armv6)
+curl -T xashdroid-armv5.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$(generateFileName_current armv5)
+curl -T xashdroid-armv7-tegra2.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$(generateFileName_current armv7-tegra2)
+curl -T xashdroid-x86.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$(generateFileName_current x86)
+
+
+exit 0