diff options
| -rwxr-xr-x | godot-update | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/godot-update b/godot-update index 3711af5..2a57c5b 100755 --- a/godot-update +++ b/godot-update @@ -35,14 +35,16 @@ function build() export CC=/usr/lib/ccache/bin/clang rm ./bin/* - [ $CLEAN -eq 1 ] && scons platform=x11 --clean + platform=linuxbsd + platform=x11 + [ $CLEAN -eq 1 ] && scons platform=$platform --clean - # https://docs.godotengine.org/en/3.1/development/compiling/compiling_for_x11.html + # https://docs.godotengine.org/en/3.2/development/compiling/compiling_for_x11.html target=release_debug - echo -e "build : ${RED}x11$RESET target=$RED$target$RESET" - time scons -j$J platform=x11 target=$target tools=yes colored=yes pulseaudio=no bits=64 warnings=no - # scons -j$J platform=x11 target=$target tools=no colored=yes pulseaudio=no bits=64 warnings=no - # scons -j$J platform=x11 target=$target tools=no colored=yes pulseaudio=no bits=32 warnings=no + echo -e "build : ${RED}$platform$RESET target=$RED$target$RESET" + time scons -j$J platform=$platform target=$target tools=yes colored=yes pulseaudio=no bits=64 warnings=no + # scons -j$J platform=$platform target=$target tools=no colored=yes pulseaudio=no bits=64 warnings=no + # scons -j$J platform=$platform target=$target tools=no colored=yes pulseaudio=no bits=32 warnings=no cp ./bin/godot*tools* $DST/godot if [ $ANDROID -eq 1 ] @@ -52,27 +54,29 @@ function build() [ ! -d $DST_EXPORT ] && mkdir $DST_EXPORT [ $CLEAN -eq 1 ] && scons platform=android --clean - # https://docs.godotengine.org/en/3.1/development/compiling/compiling_for_android.html + # https://docs.godotengine.org/en/3.2/development/compiling/compiling_for_android.html + echo -e "${RED}gradlew clean$RESET" + pushd platform/android/java && ./gradlew cleanGodotTemplates && popd ndk_platform=android-29 - for arch in arm64v8 armv7; #x86_6 + for target in release debug; do - for target in release_debug; + for arch in arm64v8 armv7; #x86_6 do echo -e "build : ${RED}android$RESET android_arch=$RED$arch$RESET target=$RED$target$RESET ndk_platform=$RED$ndk_platform$RESET" time scons -j$J platform=android target=$target android_arch=$arch ndk_platform=$ndk_platform tools=no disable_3d=true done done - - echo "${RED}gradlew build$RESET" - pushd platform/android/java && ./gradlew build --build-cache -Dandroid_ndk=$ndk_platform && popd - cp platform/android/java/app/build/outputs/apk/debug/android_debug.apk $DST_EXPORT/android_debug.apk - cp platform/android/java/app/build/outputs/apk/release/android_release.apk $DST_EXPORT/android_release.apk + echo -e "${RED}gradlew build$RESET" + pushd platform/android/java && ./gradlew generateGodotTemplates && popd fi } pushd ./godot - [ $CLEAN -eq 1 ] && find -name \*.o -delete + if [ $CLEAN -eq 1 ] + then + find -name \*.o -o -name \*.gen.cpp -o -name \*.gen.h -delete + fi HEAD_PREV=$(git log HEAD~1.. --pretty=format:'%H' | head -n1) echo -e "current HEAD : $RED$HEAD_PREV$RESET" @@ -84,9 +88,9 @@ pushd ./godot then build git log $HEAD_PREV.. - ls -l bin/ fi popd -# godot-git ~/usr/git/castle_itter/project.godot +ls -l godot/bin/ + |