diff --git a/README-ru.md b/README-ru.md deleted file mode 100644 index f6b957d0..00000000 --- a/README-ru.md +++ /dev/null @@ -1,39 +0,0 @@ -Xash3D FWGS Android -==== -[![Build Status](https://travis-ci.org/FWGS/xash3d-android-project.svg)](https://travis-ci.org/FWGS/xash3d-android-project) -### Пользователям -#### Инструкция по установке -0. Скачайте APK последней версии со страницы релизов репозитория Xash3D FWGS: https://github.com/FWGS/xash3d/releases/latest -1. Откройте и установите APK. -2. Создайте папку /sdcard/xash. -3. Скопируйте папку "valve" от Steam версии Half-Life в /sdcard/xash/. Пример: /sdcard/xash/valve -- игровые данные -4. Запустите игру - -#### Запуск модификаций -**Это приложение позволяет запустить только Half-Life и модификации без собственных игровых библиотек.** - -**Любая модификация со своими игровыми библиотеками требует отдельно установленное приложение с портированными на Android игровыми библиотеками.** - -Например, если вы захотите запустить Half-Life: C.A.G.E.D. - -1. Скопируйте папку caged от Steam-версии Half-Life: C.A.G.E.D. в /sdcard/xash. -2. Откройте Xash3D FWGS и добавьте в аргументы командной строки: -> -game caged - -Пример для Half-Life: Blue Shift. - -1. Скопируйте папку bshift от Steam-версии Half-Life: Blue Shift в /sdcard/xash/. -2. Установите отдельное приложение [отсюда](https://github.com/nekonomicon/BS-android/releases/latest) и запустите. - -Портированные на Android модификации cо своими игровыми библиотеками(точнее приложения для их запуска на Android) вы всегда можете найти в [Play Market](https://play.google.com/store/apps/dev?id=7039367093104802597) и на [ModDB](https://www.moddb.com/games/xash3d-android/downloads) - -Для большей информации о работающих модификациях, ознакомьтесь с этим [артиклем](https://github.com/FWGS/xash3d/wiki/List-of-mods-which-work-on-Android-and-other-non-Windows-platforms-without-troubles). - -#### Баги - -Обо всех багах пишите в "Issues" с логом и системной информацией. - -### Разработчикам - -+ Для компиляции, запустите `git submodule init && git submodule update --init --recursive`. Иначе у вас будет пустой APK, без библиотек. -+ ~~Мы используем наш SDL2 форк. Посетите https://github.com/mittorn/SDL-mirror~~. Забудьте. Мы больше не используем SDL2. diff --git a/README.md b/README.md deleted file mode 100644 index bcdb54e9..00000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -Xash3D FWGS Android -==== -[![Build Status](https://travis-ci.org/FWGS/xash3d-android-project.svg)](https://travis-ci.org/FWGS/xash3d-android-project) -### Users -#### Installation guide -0. Download the APK from Xash3D FWGS repo releases page: https://github.com/FWGS/xash3d/releases/latest -1. Install the APK. -2. Create /sdcard/xash folder. -3. Copy "valve" folder from your Half-Life Steam version to /sdcard/xash/. Example: /sdcard/xash/valve -- game data -4. Run the game. - -#### Launching other mods -**This app can run only Half-Life and mods that doesn't have own game libraries.** - -**Any mod with own custom game libraries required separate launcher with mod game libraries which was ported on Android.** - -For example, if you want to play Half-Life: C.A.G.E.D. - -1. Copy caged folder from your steam version of Half-Life: C.A.G.E.D. to /sdcard/xash. -2. Open Xash3D FWGS launcher and write to the command-line args: -> -game caged - -Example for Half-Life: Blue Shift. - -1. Copy bshift folder from your steam version of Half-Life: Blue Shift to /sdcard/xash. -2. Install separate launcher for Half-Life: Blue Shift from [here](https://github.com/nekonomicon/BS-android/releases/latest) and run. - -You can always find mods with own game libraries which was ported on Android( Actually separate launchers with game libraries which was ported on Android ) in [Play Market](https://play.google.com/store/apps/dev?id=7039367093104802597) and [ModDB](https://www.moddb.com/games/xash3d-android/downloads). - -For more information about supported mods, see this [article](https://github.com/FWGS/xash3d/wiki/List-of-mods-which-work-on-Android-and-other-non-Windows-platforms-without-troubles). - -#### Bugs - -About all bugs please write to issues with your device and OS info. - -### Developers - -+ For compiling, run `git submodule init && git submodule update --init --recursive`. Otherwise you will get an empty APK, without any libraries. -+ ~~We use our SDL2 fork. See https://github.com/mittorn/SDL-mirror~~. Nevermind. We don't use SDL2 anymore. diff --git a/AndroidManifest.xml b/android/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to android/AndroidManifest.xml diff --git a/assets/License.txt b/android/assets/License.txt similarity index 100% rename from assets/License.txt rename to android/assets/License.txt diff --git a/res/drawable-hdpi/ic_launcher.png b/android/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from res/drawable-hdpi/ic_launcher.png rename to android/res/drawable-hdpi/ic_launcher.png diff --git a/res/drawable-hdpi/ic_statusbar.png b/android/res/drawable-hdpi/ic_statusbar.png similarity index 100% rename from res/drawable-hdpi/ic_statusbar.png rename to android/res/drawable-hdpi/ic_statusbar.png diff --git a/res/drawable-mdpi/ic_launcher.png b/android/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from res/drawable-mdpi/ic_launcher.png rename to android/res/drawable-mdpi/ic_launcher.png diff --git a/res/drawable-mdpi/ic_statusbar.png b/android/res/drawable-mdpi/ic_statusbar.png similarity index 100% rename from res/drawable-mdpi/ic_statusbar.png rename to android/res/drawable-mdpi/ic_statusbar.png diff --git a/res/drawable-xhdpi/ic_launcher.png b/android/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xhdpi/ic_launcher.png rename to android/res/drawable-xhdpi/ic_launcher.png diff --git a/res/drawable-xhdpi/ic_statusbar.png b/android/res/drawable-xhdpi/ic_statusbar.png similarity index 100% rename from res/drawable-xhdpi/ic_statusbar.png rename to android/res/drawable-xhdpi/ic_statusbar.png diff --git a/res/drawable-xxhdpi/ic_launcher.png b/android/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xxhdpi/ic_launcher.png rename to android/res/drawable-xxhdpi/ic_launcher.png diff --git a/res/drawable-xxhdpi/ic_statusbar.png b/android/res/drawable-xxhdpi/ic_statusbar.png similarity index 100% rename from res/drawable-xxhdpi/ic_statusbar.png rename to android/res/drawable-xxhdpi/ic_statusbar.png diff --git a/res/drawable-xxxhdpi/ic_launcher.png b/android/res/drawable-xxxhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xxxhdpi/ic_launcher.png rename to android/res/drawable-xxxhdpi/ic_launcher.png diff --git a/res/drawable-xxxhdpi/ic_statusbar.png b/android/res/drawable-xxxhdpi/ic_statusbar.png similarity index 100% rename from res/drawable-xxxhdpi/ic_statusbar.png rename to android/res/drawable-xxxhdpi/ic_statusbar.png diff --git a/res/drawable/circle_black.xml b/android/res/drawable/circle_black.xml similarity index 100% rename from res/drawable/circle_black.xml rename to android/res/drawable/circle_black.xml diff --git a/res/drawable/circle_white.xml b/android/res/drawable/circle_white.xml similarity index 100% rename from res/drawable/circle_white.xml rename to android/res/drawable/circle_white.xml diff --git a/res/drawable/folder.png b/android/res/drawable/folder.png similarity index 100% rename from res/drawable/folder.png rename to android/res/drawable/folder.png diff --git a/res/drawable/ic_launcher.png b/android/res/drawable/ic_launcher.png similarity index 100% rename from res/drawable/ic_launcher.png rename to android/res/drawable/ic_launcher.png diff --git a/res/drawable/ic_statusbar.png b/android/res/drawable/ic_statusbar.png similarity index 100% rename from res/drawable/ic_statusbar.png rename to android/res/drawable/ic_statusbar.png diff --git a/res/drawable/layout_sel_background.xml b/android/res/drawable/layout_sel_background.xml similarity index 100% rename from res/drawable/layout_sel_background.xml rename to android/res/drawable/layout_sel_background.xml diff --git a/res/drawable/page0.png b/android/res/drawable/page0.png similarity index 100% rename from res/drawable/page0.png rename to android/res/drawable/page0.png diff --git a/res/drawable/page1_en.png b/android/res/drawable/page1_en.png similarity index 100% rename from res/drawable/page1_en.png rename to android/res/drawable/page1_en.png diff --git a/res/drawable/page2_en.png b/android/res/drawable/page2_en.png similarity index 100% rename from res/drawable/page2_en.png rename to android/res/drawable/page2_en.png diff --git a/res/drawable/page3_en.png b/android/res/drawable/page3_en.png similarity index 100% rename from res/drawable/page3_en.png rename to android/res/drawable/page3_en.png diff --git a/res/drawable/page4_en.png b/android/res/drawable/page4_en.png similarity index 100% rename from res/drawable/page4_en.png rename to android/res/drawable/page4_en.png diff --git a/res/layout/about.xml b/android/res/layout/about.xml similarity index 100% rename from res/layout/about.xml rename to android/res/layout/about.xml diff --git a/res/layout/activity_fpicker.xml b/android/res/layout/activity_fpicker.xml similarity index 100% rename from res/layout/activity_fpicker.xml rename to android/res/layout/activity_fpicker.xml diff --git a/res/layout/activity_launcher.xml b/android/res/layout/activity_launcher.xml similarity index 100% rename from res/layout/activity_launcher.xml rename to android/res/layout/activity_launcher.xml diff --git a/res/layout/activity_shortcut.xml b/android/res/layout/activity_shortcut.xml similarity index 100% rename from res/layout/activity_shortcut.xml rename to android/res/layout/activity_shortcut.xml diff --git a/res/layout/activity_tutorial.xml b/android/res/layout/activity_tutorial.xml similarity index 100% rename from res/layout/activity_tutorial.xml rename to android/res/layout/activity_tutorial.xml diff --git a/res/layout/notify.xml b/android/res/layout/notify.xml similarity index 100% rename from res/layout/notify.xml rename to android/res/layout/notify.xml diff --git a/res/layout/notify_21.xml b/android/res/layout/notify_21.xml similarity index 100% rename from res/layout/notify_21.xml rename to android/res/layout/notify_21.xml diff --git a/res/layout/row.xml b/android/res/layout/row.xml similarity index 100% rename from res/layout/row.xml rename to android/res/layout/row.xml diff --git a/res/layout/tutorial_step.xml b/android/res/layout/tutorial_step.xml similarity index 100% rename from res/layout/tutorial_step.xml rename to android/res/layout/tutorial_step.xml diff --git a/res/values-ru/pages.xml b/android/res/values-ru/pages.xml similarity index 100% rename from res/values-ru/pages.xml rename to android/res/values-ru/pages.xml diff --git a/res/values-ru/strings.xml b/android/res/values-ru/strings.xml similarity index 100% rename from res/values-ru/strings.xml rename to android/res/values-ru/strings.xml diff --git a/res/values/dimens.xml b/android/res/values/dimens.xml similarity index 100% rename from res/values/dimens.xml rename to android/res/values/dimens.xml diff --git a/res/values/git-rev.xml b/android/res/values/git-rev.xml similarity index 100% rename from res/values/git-rev.xml rename to android/res/values/git-rev.xml diff --git a/res/values/pages.xml b/android/res/values/pages.xml similarity index 100% rename from res/values/pages.xml rename to android/res/values/pages.xml diff --git a/res/values/strings.xml b/android/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to android/res/values/strings.xml diff --git a/res/values/styles.xml b/android/res/values/styles.xml similarity index 100% rename from res/values/styles.xml rename to android/res/values/styles.xml diff --git a/src/in/celest/xash3d/FPicker.java b/android/src/in/celest/xash3d/FPicker.java similarity index 100% rename from src/in/celest/xash3d/FPicker.java rename to android/src/in/celest/xash3d/FPicker.java diff --git a/src/in/celest/xash3d/InstallReceiver.java b/android/src/in/celest/xash3d/InstallReceiver.java similarity index 100% rename from src/in/celest/xash3d/InstallReceiver.java rename to android/src/in/celest/xash3d/InstallReceiver.java diff --git a/src/in/celest/xash3d/LauncherActivity.java b/android/src/in/celest/xash3d/LauncherActivity.java similarity index 100% rename from src/in/celest/xash3d/LauncherActivity.java rename to android/src/in/celest/xash3d/LauncherActivity.java diff --git a/src/in/celest/xash3d/ShortcutActivity.java b/android/src/in/celest/xash3d/ShortcutActivity.java similarity index 100% rename from src/in/celest/xash3d/ShortcutActivity.java rename to android/src/in/celest/xash3d/ShortcutActivity.java diff --git a/src/in/celest/xash3d/XashActivity.java b/android/src/in/celest/xash3d/XashActivity.java similarity index 100% rename from src/in/celest/xash3d/XashActivity.java rename to android/src/in/celest/xash3d/XashActivity.java diff --git a/src/in/celest/xash3d/XashConfig.java b/android/src/in/celest/xash3d/XashConfig.java similarity index 100% rename from src/in/celest/xash3d/XashConfig.java rename to android/src/in/celest/xash3d/XashConfig.java diff --git a/src/in/celest/xash3d/XashService.java b/android/src/in/celest/xash3d/XashService.java similarity index 100% rename from src/in/celest/xash3d/XashService.java rename to android/src/in/celest/xash3d/XashService.java diff --git a/src/in/celest/xash3d/XashTutorialActivity.java b/android/src/in/celest/xash3d/XashTutorialActivity.java similarity index 100% rename from src/in/celest/xash3d/XashTutorialActivity.java rename to android/src/in/celest/xash3d/XashTutorialActivity.java diff --git a/src/su/xash/fwgslib/CertCheck.java b/android/src/su/xash/fwgslib/CertCheck.java similarity index 100% rename from src/su/xash/fwgslib/CertCheck.java rename to android/src/su/xash/fwgslib/CertCheck.java diff --git a/src/su/xash/fwgslib/CheckUpdate.java b/android/src/su/xash/fwgslib/CheckUpdate.java similarity index 100% rename from src/su/xash/fwgslib/CheckUpdate.java rename to android/src/su/xash/fwgslib/CheckUpdate.java diff --git a/src/su/xash/fwgslib/FWGSLib.java b/android/src/su/xash/fwgslib/FWGSLib.java similarity index 100% rename from src/su/xash/fwgslib/FWGSLib.java rename to android/src/su/xash/fwgslib/FWGSLib.java diff --git a/src/su/xash/fwgslib/PagedView.java b/android/src/su/xash/fwgslib/PagedView.java similarity index 100% rename from src/su/xash/fwgslib/PagedView.java rename to android/src/su/xash/fwgslib/PagedView.java diff --git a/test/AndroidManifest.xml b/android/test/AndroidManifest.xml similarity index 100% rename from test/AndroidManifest.xml rename to android/test/AndroidManifest.xml diff --git a/test/res/drawable b/android/test/res/drawable similarity index 100% rename from test/res/drawable rename to android/test/res/drawable diff --git a/test/res/drawable-hdpi/ic_launcher.png b/android/test/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from test/res/drawable-hdpi/ic_launcher.png rename to android/test/res/drawable-hdpi/ic_launcher.png diff --git a/test/res/drawable-ldpi/ic_launcher.png b/android/test/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from test/res/drawable-ldpi/ic_launcher.png rename to android/test/res/drawable-ldpi/ic_launcher.png diff --git a/test/res/drawable-mdpi/ic_launcher.png b/android/test/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from test/res/drawable-mdpi/ic_launcher.png rename to android/test/res/drawable-mdpi/ic_launcher.png diff --git a/test/res/drawable-xhdpi/ic_launcher.png b/android/test/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from test/res/drawable-xhdpi/ic_launcher.png rename to android/test/res/drawable-xhdpi/ic_launcher.png diff --git a/test/res/layout b/android/test/res/layout similarity index 100% rename from test/res/layout rename to android/test/res/layout diff --git a/test/res/values b/android/test/res/values similarity index 100% rename from test/res/values rename to android/test/res/values diff --git a/test/res/values-ru b/android/test/res/values-ru similarity index 100% rename from test/res/values-ru rename to android/test/res/values-ru diff --git a/unused/SteamActivity.java b/android/unused/SteamActivity.java similarity index 100% rename from unused/SteamActivity.java rename to android/unused/SteamActivity.java diff --git a/unused/SteamService.java b/android/unused/SteamService.java similarity index 100% rename from unused/SteamService.java rename to android/unused/SteamService.java diff --git a/unused/XashActivity.java b/android/unused/XashActivity.java similarity index 100% rename from unused/XashActivity.java rename to android/unused/XashActivity.java diff --git a/unused/android-support-v4.jar b/android/unused/android-support-v4.jar similarity index 100% rename from unused/android-support-v4.jar rename to android/unused/android-support-v4.jar diff --git a/unused/notify.xml b/android/unused/notify.xml similarity index 100% rename from unused/notify.xml rename to android/unused/notify.xml diff --git a/unused/org/libsdl/app/SDLActivity.java b/android/unused/org/libsdl/app/SDLActivity.java similarity index 100% rename from unused/org/libsdl/app/SDLActivity.java rename to android/unused/org/libsdl/app/SDLActivity.java diff --git a/unused/res/values-de/strings.xml b/android/unused/res/values-de/strings.xml similarity index 100% rename from unused/res/values-de/strings.xml rename to android/unused/res/values-de/strings.xml diff --git a/unused/res/values-es/strings.xml b/android/unused/res/values-es/strings.xml similarity index 100% rename from unused/res/values-es/strings.xml rename to android/unused/res/values-es/strings.xml diff --git a/unused/res/values-fa/strings.xml b/android/unused/res/values-fa/strings.xml similarity index 100% rename from unused/res/values-fa/strings.xml rename to android/unused/res/values-fa/strings.xml diff --git a/unused/res/values-ko/strings.xml b/android/unused/res/values-ko/strings.xml similarity index 100% rename from unused/res/values-ko/strings.xml rename to android/unused/res/values-ko/strings.xml diff --git a/unused/res/values-pt-rBR/strings.xml b/android/unused/res/values-pt-rBR/strings.xml similarity index 100% rename from unused/res/values-pt-rBR/strings.xml rename to android/unused/res/values-pt-rBR/strings.xml diff --git a/unused/res/values-tr/strings.xml b/android/unused/res/values-tr/strings.xml similarity index 100% rename from unused/res/values-tr/strings.xml rename to android/unused/res/values-tr/strings.xml diff --git a/unused/res/values-ua/strings.xml b/android/unused/res/values-ua/strings.xml similarity index 100% rename from unused/res/values-ua/strings.xml rename to android/unused/res/values-ua/strings.xml diff --git a/unused/res/values-zh/strings.xml b/android/unused/res/values-zh/strings.xml similarity index 100% rename from unused/res/values-zh/strings.xml rename to android/unused/res/values-zh/strings.xml diff --git a/ant.properties b/ant.properties deleted file mode 100644 index b0971e89..00000000 --- a/ant.properties +++ /dev/null @@ -1,17 +0,0 @@ -# This file is used to override default values used by the Ant build system. -# -# This file must be checked into Version Control Systems, as it is -# integral to the build system of your project. - -# This file is only used by the Ant script. - -# You can use this to override default values such as -# 'source.dir' for the location of your java source folder and -# 'out.dir' for the location of your output folder. - -# You can also use it define how the release builds are signed by declaring -# the following properties: -# 'key.store' for the location of your keystore and -# 'key.alias' for the name of the key to use. -# The password will be asked during the build when you use the 'release' target. - diff --git a/build b/build deleted file mode 100755 index c4c01a47..00000000 --- a/build +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash - -PROJECT="xashdroid" -KEYSTORE="../myks.keystore" -KEYSTORE_ALIAS="xashdroid" -ANDROID_SDK_PATH="$HOME/.android" -BUILD_TOOLS_VER="28.0.3" - -if [[ "$1" = "--help" ]]; then - echo "Usage: ./build.sh " - exit 0 -fi - -if [[ "$#" -ne "1" ]]; then - echo "Illegal number of parameters, see ./build.sh --help" - exit 0 -fi - -if [[ "$1" = "release" ]]; then - NDK_BUILD_FLAGS="V=0 NDK_DEBUG=0" - CONFIG="release" - SIGN="sign" -else - NDK_BUILD_FLAGS="V=1 APP_CFLAGS=\"-gdwarf-3\" NDK_DEBUG=1" - CONFIG="debug" - SIGN="" -fi - -echo "*****************************************" -echo "* RELEASETYPE: $RELEASE " -echo "*****************************************" - -set -x - -# Generate config -./gen-config.sh $CONFIG $SIGN -./gen-version.sh default-$CONFIG - -# Regenerate PAK file -rm assets/extras.pak 2>/dev/null -python2 makepak.py xash-extras/ assets/extras.pak - -# Regenerate resources(otherwise it may glitch) -rm -rf gen/ bin/ - -# Build -ndk-build NDK_TOOLCHAIN_VERSION=4.8 $NDK_BUILD_FLAGS -j8 -ant $1 - -if [[ "$1" = "release" ]]; then - jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore $KEYSTORE bin/$PROJECT-$1-unsigned.apk $KEYSTORE_ALIAS # -tsa https://timestamp.geotrust.com/tsa - $ANDROID_SDK_PATH/build-tools/$BUILD_TOOLS_VER/zipalign 4 bin/$PROJECT-$1-unsigned.apk bin/$PROJECT-$1.apk -fi - -mv bin/$PROJECT-$1.apk $PROJECT-$1.apk - -# Auto deploy to test device -if [[ "$1" = "debug" ]]; then - adb install -f -r $PROJECT-$1.apk -fi - diff --git a/build-test.sh b/build-test.sh deleted file mode 100644 index 17404f39..00000000 --- a/build-test.sh +++ /dev/null @@ -1,27 +0,0 @@ -ANDROID_JAR=../android-24.jar -AAPT=./../aapt -DX=./../dx -APKBUILDER=./../apkbuilder -mkdir gen -mkdir -p bin/classes - -JAVAC=$JAVA_HOME/bin/javac - -if [ -z "$JAVA_HOME" ]; then - export JAVAC=$(which javac) -fi - -: ${OUTPUT:=$1} -: ${OUTPUT:=bin/xash3d-signed.apk} -sh gen-version.sh test build -sh gen-config.sh test -rm assets/extras.pak -python2.7 makepak.py xash-extras assets/extras.pak -$AAPT package -m -J gen/ --rename-manifest-package in.celest.xash3d.hl -M AndroidManifest.xml -S test/res -I $ANDROID_JAR -echo "package in.celest.xash3d.hl;public final class BuildConfig {public final static boolean DEBUG = true;}" > gen/in/celest/xash3d/hl/BuildConfig.java -$JAVAC -d bin/classes -s bin/classes -cp $ANDROID_JAR gen/in/celest/xash3d/hl/* src/in/celest/xash3d/*.java src/su/xash/fwgslib/*.java -$DX --dex --output=bin/classes.dex bin/classes/ -$AAPT package -f -M test/AndroidManifest.xml -S test/res -I $ANDROID_JAR -F bin/xash3d.apk.unaligned -zip bin/xash3d.apk.unaligned assets/* -$APKBUILDER bin/xash3d.apk -u -nf libs/ -rj libs -f bin/classes.dex -z bin/xash3d.apk.unaligned -java -jar /mnt/app/apktool/signapk.jar /mnt/app/apktool/testkey.x509.pem /mnt/app/apktool/testkey.pk8 bin/xash3d.apk $OUTPUT diff --git a/build.properties b/build.properties deleted file mode 100644 index edc7f230..00000000 --- a/build.properties +++ /dev/null @@ -1,17 +0,0 @@ -# This file is used to override default values used by the Ant build system. -# -# This file must be checked in Version Control Systems, as it is -# integral to the build system of your project. - -# This file is only used by the Ant script. - -# You can use this to override default values such as -# 'source.dir' for the location of your java source folder and -# 'out.dir' for the location of your output folder. - -# You can also use it define how the release builds are signed by declaring -# the following properties: -# 'key.store' for the location of your keystore and -# 'key.alias' for the name of the key to use. -# The password will be asked during the build when you use the 'release' target. - diff --git a/build.xml b/build.xml deleted file mode 100644 index 58b58b82..00000000 --- a/build.xml +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/default.properties b/default.properties deleted file mode 100644 index 0b9250e0..00000000 --- a/default.properties +++ /dev/null @@ -1,11 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "build.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-8 diff --git a/makepak.py b/makepak.py deleted file mode 100644 index 02c74234..00000000 --- a/makepak.py +++ /dev/null @@ -1,45 +0,0 @@ -import sys -import struct -import os - -#dummy class for stuffing the file headers into -class FileEntry: - pass - -#arguments are source directory, then target filename e.g. "pak1.pak" -rootdir = sys.argv[1] -pakfilename = sys.argv[2] - -pakfile = open(pakfilename,"wb") - -#write a dummy header to start with -pakfile.write(struct.Struct("<4s2l").pack(b"PACK",0,0)) - -#walk the directory recursively, add the files and record the file entries -offset = 12 -fileentries = [] -for root, subFolders, files in os.walk(rootdir): - for file in files: - entry = FileEntry() - impfilename = os.path.join(root,file) - entry.filename = os.path.relpath(impfilename,rootdir).replace("\\","/") - if(entry.filename.startswith(".git")):continue - print "pak: "+entry.filename - with open(impfilename, "rb") as importfile: - pakfile.write(importfile.read()) - entry.offset = offset - entry.length = importfile.tell() - offset = offset + entry.length - fileentries.append(entry) -tablesize = 0 - -#after all the file data, write the list of entries -for entry in fileentries: - pakfile.write(struct.Struct("<56s").pack(entry.filename.encode("ascii"))) - pakfile.write(struct.Struct("> README.md - echo >> README.md - echo Short changelog: >> README.md - echo \`\`\` >> README.md - (cd $TRAVIS_BUILD_DIR;git log --pretty=format:'%h %ad %s' --date iso -n 10 HEAD `curl https://raw.githubusercontent.com/FWGS/xash3d-deploy/$SOURCE_NAME-$TRAVIS_BRANCH/commit.txt` -.. )| cut -d ' ' -f 1-3,5-100 >> README.md - echo \`\`\` >> README.md - echo >> README.md - echo [Code on GitHub]\(https://github.com/FWGS/xash3d/tree/$TRAVIS_COMMIT\) >> README.md - echo >> README.md - echo [Full changelog for this build]\(https://github.com/FWGS/xash3d/commits/$TRAVIS_COMMIT\) >> README.md - echo >> README.md - for arg in $*; do - echo \* [$arg]\(https://github.com/FWGS/xash3d-deploy/blob/$SOURCE_NAME-$TRAVIS_BRANCH/$arg\?raw\=true\) >> README.md - echo >> README.md - done - echo $TRAVIS_COMMIT > commit.txt - git add . - git commit -m "Latest travis deploy $TRAVIS_COMMIT" - git checkout -b $SOURCE_NAME-$TRAVIS_BRANCH - git push -q --force travis-deploy-public $SOURCE_NAME-$TRAVIS_BRANCH >/dev/null 2>/dev/null - git checkout -b $SOURCE_NAME-latest - git push -q --force travis-deploy-public $SOURCE_NAME-latest >/dev/null 2>/dev/null -fi -exit 0 diff --git a/travis-upload.sh b/travis-upload.sh deleted file mode 100644 index e6c31374..00000000 --- a/travis-upload.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -# Upload travis generated APKs to the Transfer.sh and Yandex.Disk - -getDaysSinceRelease() -{ - printf %04d $(( ( $(date +'%s') - $(date -ud '2015-04-01' +'%s') )/60/60/24 )) -} - -DAYSSINCERELEASE=`getDaysSinceRelease` -COMMITHASH=$(git rev-parse --short HEAD) -#CURRENTBRANCH=$(git rev-parse --abbrev-ref HEAD) - - -PREFIX=$DAYSSINCERELEASE-$(date +"%H-%M") -POSTFIX=$COMMITHASH - -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`/ - - -while [ "$1" != "" ]; do -FNAME=$1 -FILE_BASE=${FNAME%.*} -FILE_EXT="${FNAME##*.}" -OUTNAME=$PREFIX-$FILE_BASE-$POSTFIX.$FILE_EXT -echo $FNAME: `curl -s --upload-file $FNAME https://transfer.sh/$OUTNAME 2>/dev/null` -curl -T $FNAME -s -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/$YADISKPATH/$OUTNAME > /dev/null -curl -T $FNAME -s -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/current-$FILE_BASE-$TRAVIS_BRANCH.$FILE_EXT > /dev/null -shift -done -exit 0