Remove ant support
This commit is contained in:
parent
7129e36901
commit
c5d681dcc7
@ -31,7 +31,7 @@ after some tweaks, but atm. only linux is supported.
|
|||||||
|
|
||||||
Dependencies list (may be incomplete):
|
Dependencies list (may be incomplete):
|
||||||
|
|
||||||
autoconf, automake, make, python, gradle, ant, imagemagick, cmake,
|
autoconf, automake, make, python, gradle, imagemagick, cmake,
|
||||||
vorbis-tools, pngquant
|
vorbis-tools, pngquant
|
||||||
|
|
||||||
Additionally some dependencies for optimize_data script:
|
Additionally some dependencies for optimize_data script:
|
||||||
@ -89,12 +89,6 @@ BUILD_TYPE - Allows to set build type.
|
|||||||
Possible values: debug, release, beta.
|
Possible values: debug, release, beta.
|
||||||
Default is: debug.
|
Default is: debug.
|
||||||
|
|
||||||
BUILD_TOOL - Allows to choose a tool that is used for creating package.
|
|
||||||
Note that ant has been already removed from Android SDK, so
|
|
||||||
you have to use SDK <= 25.2.5 for building with ant.
|
|
||||||
Possible values: ant, gradle.
|
|
||||||
Default is: gradle.
|
|
||||||
|
|
||||||
BUILD_TOOLS_VER - Allows to override the SDK build-tools version.
|
BUILD_TOOLS_VER - Allows to override the SDK build-tools version.
|
||||||
|
|
||||||
SDK_PATH - Path to SDK directory
|
SDK_PATH - Path to SDK directory
|
||||||
|
@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project name="SuperTuxKart" default="help">
|
|
||||||
|
|
||||||
<import file="${sdk.dir}/tools/ant/build.xml" />
|
|
||||||
|
|
||||||
</project>
|
|
@ -152,7 +152,6 @@ if [ -z "$BUILD_TYPE" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$BUILD_TYPE" = "debug" ] || [ "$BUILD_TYPE" = "Debug" ]; then
|
if [ "$BUILD_TYPE" = "debug" ] || [ "$BUILD_TYPE" = "Debug" ]; then
|
||||||
export ANT_BUILD_TYPE="debug"
|
|
||||||
export GRADLE_BUILD_TYPE="assembleDebug"
|
export GRADLE_BUILD_TYPE="assembleDebug"
|
||||||
export IS_DEBUG_BUILD=1
|
export IS_DEBUG_BUILD=1
|
||||||
export APP_NAME="$APP_NAME_DEBUG"
|
export APP_NAME="$APP_NAME_DEBUG"
|
||||||
@ -161,7 +160,6 @@ if [ "$BUILD_TYPE" = "debug" ] || [ "$BUILD_TYPE" = "Debug" ]; then
|
|||||||
export APP_DIR_NAME="$APP_DIR_NAME_DEBUG"
|
export APP_DIR_NAME="$APP_DIR_NAME_DEBUG"
|
||||||
export APP_ICON="$APP_ICON_DEBUG"
|
export APP_ICON="$APP_ICON_DEBUG"
|
||||||
elif [ "$BUILD_TYPE" = "release" ] || [ "$BUILD_TYPE" = "Release" ]; then
|
elif [ "$BUILD_TYPE" = "release" ] || [ "$BUILD_TYPE" = "Release" ]; then
|
||||||
export ANT_BUILD_TYPE="release"
|
|
||||||
export GRADLE_BUILD_TYPE="assembleRelease"
|
export GRADLE_BUILD_TYPE="assembleRelease"
|
||||||
export IS_DEBUG_BUILD=0
|
export IS_DEBUG_BUILD=0
|
||||||
export APP_NAME="$APP_NAME_RELEASE"
|
export APP_NAME="$APP_NAME_RELEASE"
|
||||||
@ -170,7 +168,6 @@ elif [ "$BUILD_TYPE" = "release" ] || [ "$BUILD_TYPE" = "Release" ]; then
|
|||||||
export APP_DIR_NAME="$APP_DIR_NAME_RELEASE"
|
export APP_DIR_NAME="$APP_DIR_NAME_RELEASE"
|
||||||
export APP_ICON="$APP_ICON_RELEASE"
|
export APP_ICON="$APP_ICON_RELEASE"
|
||||||
elif [ "$BUILD_TYPE" = "beta" ] || [ "$BUILD_TYPE" = "Beta" ]; then
|
elif [ "$BUILD_TYPE" = "beta" ] || [ "$BUILD_TYPE" = "Beta" ]; then
|
||||||
export ANT_BUILD_TYPE="release"
|
|
||||||
export GRADLE_BUILD_TYPE="assembleRelease"
|
export GRADLE_BUILD_TYPE="assembleRelease"
|
||||||
export IS_DEBUG_BUILD=0
|
export IS_DEBUG_BUILD=0
|
||||||
export APP_NAME="$APP_NAME_BETA"
|
export APP_NAME="$APP_NAME_BETA"
|
||||||
@ -184,17 +181,6 @@ else
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check selected build tool
|
|
||||||
if [ -z "$BUILD_TOOL" ]; then
|
|
||||||
BUILD_TOOL="gradle"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$BUILD_TOOL" != "gradle" ] && [ "$BUILD_TOOL" != "ant" ]; then
|
|
||||||
echo "Unsupported BUILD_TOOL: $BUILD_TOOL. Possible values are: " \
|
|
||||||
"gradle, ant"
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check if we have access to the Android NDK and SDK
|
# Check if we have access to the Android NDK and SDK
|
||||||
if [ -z "$NDK_PATH" ]; then
|
if [ -z "$NDK_PATH" ]; then
|
||||||
export NDK_PATH="$NDK_PATH_DEFAULT"
|
export NDK_PATH="$NDK_PATH_DEFAULT"
|
||||||
@ -507,15 +493,9 @@ if [ -f "/usr/lib/jvm/java-8-openjdk-amd64/bin/java" ]; then
|
|||||||
export PATH=$JAVA_HOME/bin:$PATH
|
export PATH=$JAVA_HOME/bin:$PATH
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$BUILD_TOOL" = "gradle" ]; then
|
export ANDROID_HOME="$SDK_PATH"
|
||||||
export ANDROID_HOME="$SDK_PATH"
|
./gradlew -Pcompile_sdk_version=$COMPILE_SDK_VERSION \
|
||||||
./gradlew -Pcompile_sdk_version=$COMPILE_SDK_VERSION \
|
-Pbuild_tools_ver="$BUILD_TOOLS_VER" \
|
||||||
-Pbuild_tools_ver="$BUILD_TOOLS_VER" \
|
$GRADLE_BUILD_TYPE
|
||||||
$GRADLE_BUILD_TYPE
|
|
||||||
elif [ "$BUILD_TOOL" = "ant" ]; then
|
|
||||||
ant -Dsdk.dir="$SDK_PATH" \
|
|
||||||
-Dtarget="android-$TARGET_SDK_VERSION" \
|
|
||||||
$ANT_BUILD_TYPE
|
|
||||||
fi
|
|
||||||
|
|
||||||
check_error
|
check_error
|
||||||
|
Loading…
x
Reference in New Issue
Block a user