diff --git a/build.sh b/build.sh index 8a3d4f881..35cd40f3a 100755 --- a/build.sh +++ b/build.sh @@ -15,6 +15,10 @@ if [ "$#" -gt 0 -a "$1" = "-r" ]; then run_apk=true fi +[ -e local.properties ] || { + android update project -p project || exit 1 + rm -f project/src/Globals.java +} # Set here your own NDK path if needed # export PATH=$PATH:~/src/endless_space/android-ndk-r7 NDKBUILDPATH=$PATH diff --git a/createSourceArchive.sh b/createSourceArchive.sh index abfad1f04..ce3421304 100755 --- a/createSourceArchive.sh +++ b/createSourceArchive.sh @@ -3,8 +3,9 @@ APPNAME=`grep AppName AndroidAppSettings.cfg | sed 's/.*=//' | tr -d '"' | tr " '/" '---'` APPVER=`grep AppVersionName AndroidAppSettings.cfg | sed 's/.*=//' | tr -d '"' | tr " '/" '---'` -# TODO: Boost and Python are stored in repository as precompiled binaries, the proper way to fix that is to build them using scripts, and remove that binaries -tar -c -z --exclude-vcs --exclude="*.o" --exclude="*.a" --exclude="*.so" --exclude="*.d" --exclude="*.dep" \ +# TODO: Boost, Python and ffmpeg are stored in repository as precompiled binaries, the proper way to fix that is to build them using scripts, and remove that binaries +# --exclude="*.a" --exclude="*.so" +tar -c -z --exclude-vcs --exclude="*.o" --exclude="*.d" --exclude="*.dep" \ -f $APPNAME-$APPVER-src.tar.gz \ `git ls-files --exclude-standard | grep -v '^project/jni/application/.*'` \ `find project/jni/application -maxdepth 1 -type f` \