Merge branch 'tof-3-7' into 'master'

Tanks of freedom: new upstream release



See merge request !1036
This commit is contained in:
Boris Kraut 2015-11-02 10:24:43 +00:00
commit b014d9a033

View file

@ -156,5 +156,32 @@ Build:0.3.6.1-beta,6
../godot/bin/godot_server.server.tools.* -export Android ../tof.apk ../godot/bin/godot_server.server.tools.* -export Android ../tof.apk
buildjni=no buildjni=no
Build:0.3.7-beta,7
commit=f70b833660371786493b37de14f3ace4c24cd1b5
output=tof.apk
srclibs=Godot@d3b42e41b0e446938d6634c8783e575de3d0b60f
prebuild=mkdir tof && \
bash -O extglob -c "mv !(tof) tof" && \
printf "[platform:Android]\n\npackage/icon=\"res://icon.png\"\npackage/name=\"Tanks of Freedom\"\npackage/unique_name=\"in.p1x.tanks_of_freedom\"\nversion/code=\"7\"\nversion/name=\"0.3.7-beta\"\n" > tof/export.cfg && \
cp -R $$Godot$$ godot
target=android-19
scandelete=godot/platform/flash/lib/libGL.a,godot/platform/android/libs/google_play_services/libs/google-play-services.jar
build=cd godot && \
scons -j 8 p=server && \
for libname in apk_expansion downloader_library google_play_services play_licensing; do sed -i 's/android-15/android-19/' platform/android/libs/${libname}/project.properties; done && \
export ANDROID_NDK_ROOT=$$NDK$$ && \
scons -j 8 p=android target=release && \
mkdir -p platform/android/java/libs/armeabi && \
cp bin/libgodot.android.opt.so platform/android/java/libs/armeabi/libgodot_android.so && \
pushd platform/android/java/ && \
ant release && \
popd && \
export HOME=$PWD && \
mkdir -p ~/.godot/templates/ && \
cp platform/android/java/bin/Godot-release-unsigned.apk ~/.godot/templates/android_release.apk && \
cd ../tof && \
../godot/bin/godot_server.server.tools.* -export Android ../tof.apk
buildjni=no
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:None Update Check Mode:None