Cannot build if love version differs from love-android-sdl2. Minor improvements.

This commit is contained in:
Antonin Décimo
2014-07-21 13:59:34 +02:00
parent 42a83c9cc9
commit 1370745417

View File

@@ -428,6 +428,9 @@ if [ -f "$PWD"/"$PROJECT_NAME".ico ]; then
else else
PROJECT_ICO= PROJECT_ICO=
fi fi
if [ -z "$PROJECT_VERSION" ]; then
PROJECT_VERSION=1
fi
## Debug log ## ## Debug log ##
@@ -775,28 +778,33 @@ if [ "$RELEASE_APK" = true ]; then
cd "$RELEASE_DIR" cd "$RELEASE_DIR"
fi fi
mkdir -p "$LOVE_ANDROID_DIR"/assets
cp "$PROJECT_NAME".love "$LOVE_ANDROID_DIR"/assets/game.love
cd "$LOVE_ANDROID_DIR"
MAINTAINER_USERNAME=${MAINTAINER_NAME// /_} MAINTAINER_USERNAME=${MAINTAINER_NAME// /_}
ACTIVITY=${PROJECT_NAME// /_}Activity ACTIVITY=${PROJECT_NAME// /_}Activity
ANDROID_VERSION=$(grep -Eo -m 1 "[0-9]+.[0-9]+.[0-9]+[a-z]*" AndroidManifest.xml) ANDROID_VERSION=$(grep -Eo -m 1 "[0-9]+.[0-9]+.[0-9]+[a-z]*" "$LOVE_ANDROID_DIR"/AndroidManifest.xml)
sed -i "s/org.love2d.android/com.${MAINTAINER_USERNAME}.${PACKAGE_NAME}/" AndroidManifest.xml ANDROID_LOVE_VERSION=$(echo "$ANDROID_VERSION" | grep -Eo "[0-9]+.[0-9]+.[0-9]+")
sed -i "s/$ANDROID_VERSION/${ANDROID_VERSION}-${PACKAGE_NAME}-v${PROJECT_VERSION}/" AndroidManifest.xml if [ "$LOVE_VERSION" != "$ANDROID_LOVE_VERSION" ]; then
sed -i "0,/LÖVE for Android/s//$PROJECT_NAME $PROJECT_VERSION/" AndroidManifest.xml echo "Love version ($LOVE_VERSION) differs from love-android-sdl2 version ($ANDROID_LOVE_VERSION). Could not create package."
sed -i "s/LÖVE for Android/$PROJECT_NAME/" AndroidManifest.xml else
sed -i "s/GameActivity/$ACTIVITY/" AndroidManifest.xml mkdir -p "$LOVE_ANDROID_DIR"/assets
cp "$PROJECT_NAME".love "$LOVE_ANDROID_DIR"/assets/game.love
cd "$LOVE_ANDROID_DIR"
sed -i "s/org.love2d.android/com.${MAINTAINER_USERNAME}.${PACKAGE_NAME}/" AndroidManifest.xml
sed -i "s/$ANDROID_VERSION/${ANDROID_VERSION}-${PACKAGE_NAME}-v${PROJECT_VERSION}/" AndroidManifest.xml
sed -i "0,/LÖVE for Android/s//$PROJECT_NAME $PROJECT_VERSION/" AndroidManifest.xml
sed -i "s/LÖVE for Android/$PROJECT_NAME/" AndroidManifest.xml
sed -i "s/GameActivity/$ACTIVITY/" AndroidManifest.xml
mkdir -p src/com/$MAINTAINER_USERNAME/$PACKAGE_NAME mkdir -p src/com/$MAINTAINER_USERNAME/$PACKAGE_NAME
echo "package com.${MAINTAINER_USERNAME}.${PACKAGE_NAME}; echo "package com.${MAINTAINER_USERNAME}.${PACKAGE_NAME};
import org.love2d.android.GameActivity; import org.love2d.android.GameActivity;
public class $ACTIVITY extends GameActivity {} public class $ACTIVITY extends GameActivity {}
" > src/com/$MAINTAINER_USERNAME/$PACKAGE_NAME/${ACTIVITY}.java " > src/com/$MAINTAINER_USERNAME/$PACKAGE_NAME/${ACTIVITY}.java
ant debug ant debug
cp bin/love_android_sdl2-debug.apk "$RELEASE_DIR" cp bin/love_android_sdl2-debug.apk "$RELEASE_DIR"
cd "$RELEASE_DIR" cd "$RELEASE_DIR"
fi
fi fi
## Love file ## ## Love file ##