FixTravisReleases : add godot download as quickfix to generate bindin…

…gs, need to investigate (#15)
utopia-rise · May 13, 2019 · beca430 · beca430
1 parent d90db45
commit beca430
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ python:
   - "2.7"
 matrix:
   include:
-    - env: PLATFORM=ios BINDINGS_ARGS="platform=ios generate_bindings=True bits=64 target=release" DRIVER_ARGS="p=ios target=release dynamic=no"
+    - env: PLATFORM=ios BINDINGS_ARGS="godotbinpath=../Godot.app platform=ios generate_bindings=True bits=64 target=release" DRIVER_ARGS="p=ios target=release dynamic=no"
       os: osx
       osx_image: xcode10.2
       compiler: clang
@@ -12,22 +12,24 @@ matrix:
           packages:
             - jq
             - scons
+            - p7zip
           update: true
-    - env: PLATFORM=linux BINDINGS_ARGS="use_llvm=yes platform=linux generate_bindings=True bits=64 target=release clang-path=/usr/local/clang-5.0.0/bin/" DRIVER_ARGS="p=linux use_llvm=yes target=release clang-path=/usr/local/clang-5.0.0/bin/"
+    - env: PLATFORM=linux BINDINGS_ARGS="godotbinpath=../Godot_v3.1.1-stable_x11.64 use_llvm=yes platform=linux generate_bindings=True bits=64 target=release clang-path=/usr/local/clang-5.0.0/bin/" DRIVER_ARGS="p=linux use_llvm=yes target=release clang-path=/usr/local/clang-5.0.0/bin/"
       os: linux
       compiler: clang
     - env: PLATFORM=android BINDINGS_ARGS="" DRIVER_ARGS="NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=Android.mk  APP_PLATFORM=android-21" ANDROID_NDK_ROOT="/home/travis/build/utopia-rise/android-sdk/ndk-bundle"
       os: linux
-    - env: PLATFORM=osx BINDINGS_ARGS="platform=osx generate_bindings=True bits=64 target=release" DRIVER_ARGS="p=osx target=release"
+    - env: PLATFORM=osx BINDINGS_ARGS="godotbinpath=../Godot.app platform=osx generate_bindings=True bits=64 target=release" DRIVER_ARGS="p=osx target=release"
       os: osx
       compiler: clang
       addons:
         homebrew:
           packages:
             - jq
             - scons
+            - p7zip
           update: true
-    - env: PLATFORM=windows BINDINGS_ARGS="platform=windows generate_bindings=True bits=64 target=release" DRIVER_ARGS="p=windows target=release"
+    - env: PLATFORM=windows BINDINGS_ARGS="godotbinpath=../Godot_v3.1.1-stable_win64.exe platform=windows generate_bindings=True bits=64 target=release" DRIVER_ARGS="p=windows target=release"
       os: windows
       compiler: clang
 before_install:
@@ -51,11 +53,15 @@ before_install:
   - if [[ "$PLATFORM" == "ios" ]]; then cp -r "/Volumes/FMOD Programmers API iOS/FMOD Programmers API/api" ios; fi
   - if [[ "$PLATFORM" == "android" ]]; then mv fmodstudioapi11012android/api android; fi
   - cd ../../
+  - if [[ "$PLATFORM" == "linux" || "$PLATFORM" == "android" ]]; then sudo apt-get install -y p7zip-full && wget https://downloads.tuxfamily.org/godotengine/3.1.1/Godot_v3.1.1-stable_x11.64.zip && 7z x Godot_v3.1.1-stable_x11.64.zip; fi
+  - if [[ "$PLATFORM" == "osx" || "$PLATFORM" == "ios" ]]; then wget https://downloads.tuxfamily.org/godotengine/3.1.1/Godot_v3.1.1-stable_osx.64.zip && 7z x Godot_v3.1.1-stable_osx.64.zip; fi
+  - if [[ "$PLATFORM" == "windows" ]]; then wget https://downloads.tuxfamily.org/godotengine/3.1.1/Godot_v3.1.1-stable_win64.exe.zip && 7z x Godot_v3.1.1-stable_win64.exe.zip; fi
   - git clone --recursive  https://github.com/utopia-rise/godot-cpp godot-cpp
   - cd godot-cpp
   - git checkout 3.1-utopia
+  - git submodule update --recursive
 install:
-  - if [[ "$PLATFORM" == "android" ]]; then scons platform=android generate_bindings=True bits=64 target=release android-abi=arm && scons platform=android generate_bindings=True bits=64 target=release android-abi=arm64 && cd ../fmod-gdnative; fi
+  - if [[ "$PLATFORM" == "android" ]]; then scons godotbinpath=../Godot_v3.1.1-stable_x11.64 platform=android generate_bindings=True bits=64 target=release android-abi=arm && scons platform=android generate_bindings=True bits=64 target=release android-abi=arm64 && cd ../fmod-gdnative; fi
   - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then C:/scons/scons.bat $BINDINGS_ARGS && cd ../fmod-gdnative; elif [[ "$PLATFORM" != "android" ]]; then scons $BINDINGS_ARGS && cd ../fmod-gdnative; fi
 script: if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then C:/scons/scons.bat $DRIVER_ARGS; elif [[ "$PLATFORM" == "android" ]]; then $ANDROID_NDK_ROOT/ndk-build $DRIVER_ARGS && rm libs/arm64-v8a/libc++_shared.so && rm libs/arm64-v8a/libfmod.so && rm libs/arm64-v8a/libfmodstudio.so && rm libs/armeabi-v7a/libc++_shared.so && rm libs/armeabi-v7a/libfmod.so && rm libs/armeabi-v7a/libfmodstudio.so && tar zcvf libandroid_fmod_gdnative.tar.gz libs/; else scons $DRIVER_ARGS; fi
 deploy:

diff --git a/README.md b/README.md
@@ -71,11 +71,11 @@ This project uses [SEMVER](https://semver.org/).
 
 #### Godot compatibility matrix
 
-| Driver Version | Godot 3.0 | Godot 3.1-stable |
-|----------------|-----------|------------------|
-|      0.0.0     |           |         X        |
-|      1.0.0     |           |         X        |
-|      2.0.0     |           |         X        |
+| Driver Version | Godot 3.0 | Godot 3.1-stable | Godot 3.1.1-stable |
+|----------------|-----------|------------------|--------------------|
+|      0.0.0     |           |         X        |                    |
+|      1.0.0     |           |         X        |                    |
+|      2.0.0     |           |         X        |          X         |
 
 ### Building GDNative API bindings