Update the gdextension api json to Godot 4.3 dev3

m4gr3d · Feb 26, 2024 · 674773c · 674773c
1 parent 99cc7fe
commit 674773c
Show file tree

Hide file tree

Showing 6 changed files with 292,091 additions and 19 deletions.
diff --git a/.github/workflows/build-addon-on-push.yml b/.github/workflows/build-addon-on-push.yml
@@ -77,8 +77,8 @@ jobs:
       - name: Create extension library
         run: |
           cd aar
-          scons platform=${{ matrix.platform }} target=template_debug ${{ matrix.flags }}
-          scons platform=${{ matrix.platform }} target=template_release ${{ matrix.flags }}
+          scons platform=${{ matrix.platform }} target=template_debug ${{ matrix.flags }} custom_api_file=thirdparty/godot_cpp_gdextension_api/extension_api.json
+          scons platform=${{ matrix.platform }} target=template_release ${{ matrix.flags }} custom_api_file=thirdparty/godot_cpp_gdextension_api/extension_api.json
           cd ..
 
       # On Android we build our loaders and build our extension with gradlew
@@ -94,10 +94,10 @@ jobs:
       - name: Create Godot-CPP library
         run: |
           cd aar/thirdparty/godot-cpp
-          scons platform=${{ matrix.platform }} target=template_debug arch=arm64
-          scons platform=${{ matrix.platform }} target=template_release arch=arm64
-          scons platform=${{ matrix.platform }} target=template_debug arch=x86_64
-          scons platform=${{ matrix.platform }} target=template_release arch=x86_64
+          scons platform=${{ matrix.platform }} target=template_debug arch=arm64 custom_api_file=../godot_cpp_gdextension_api/extension_api.json
+          scons platform=${{ matrix.platform }} target=template_release arch=arm64 custom_api_file=../godot_cpp_gdextension_api/extension_api.json
+          scons platform=${{ matrix.platform }} target=template_debug arch=x86_64 custom_api_file=../godot_cpp_gdextension_api/extension_api.json
+          scons platform=${{ matrix.platform }} target=template_release arch=x86_64 custom_api_file=../godot_cpp_gdextension_api/extension_api.json
           cd ../../..
         if: matrix.platform == 'android'
       - name: Create Godot OpenXR Vendors AARs

diff --git a/.github/workflows/mavencentral-publish.yml b/.github/workflows/mavencentral-publish.yml
@@ -39,10 +39,10 @@ jobs:
       - name: Release build
         run: |
           cd thirdparty/godot-cpp
-          scons platform=android target=template_debug arch=arm64
-          scons platform=android target=template_release arch=arm64
-          scons platform=android target=template_debug arch=x86_64
-          scons platform=android target=template_release arch=x86_64
+          scons platform=android target=template_debug arch=arm64 custom_api_file=../godot_cpp_gdextension_api/extension_api.json
+          scons platform=android target=template_release arch=arm64 custom_api_file=../godot_cpp_gdextension_api/extension_api.json
+          scons platform=android target=template_debug arch=x86_64 custom_api_file=../godot_cpp_gdextension_api/extension_api.json
+          scons platform=android target=template_release arch=x86_64 custom_api_file=../godot_cpp_gdextension_api/extension_api.json
           cd ../..
           ./gradlew -Prelease_version=${{ github.ref_name }} build
 

diff --git a/README.md b/README.md
@@ -21,10 +21,10 @@ git submodule update --init
 Build the Android C++ bindings using the following commands.
 ```
 cd thirdparty/godot-cpp
-scons platform=android target=template_debug arch=arm64
-scons platform=android target=template_release arch=arm64
-scons platform=android target=template_debug arch=x86_64
-scons platform=android target=template_release arch=x86_64
+scons platform=android target=template_debug arch=arm64 custom_api_file=../godot_cpp_gdextension_api/extension_api.json
+scons platform=android target=template_release arch=arm64 custom_api_file=../godot_cpp_gdextension_api/extension_api.json
+scons platform=android target=template_debug arch=x86_64 custom_api_file=../godot_cpp_gdextension_api/extension_api.json
+scons platform=android target=template_release arch=x86_64 custom_api_file=../godot_cpp_gdextension_api/extension_api.json
 ```
 
 When the command is completed, you should have static libraries stored in `thirdparty/godot-cpp/bin`
@@ -33,10 +33,10 @@ that will be used for compilation by the plugin.
 ### Building the Plugin
 Run the following command from the root directory to generate the editor gdextension plugin:
 ```
-scons target=template_debug
-scons target=template_release
-scons target=template_debug platform=android
-scons target=template_release platform=android
+scons target=template_debug custom_api_file=thirdparty/godot_cpp_gdextension_api/extension_api.json
+scons target=template_release custom_api_file=thirdparty/godot_cpp_gdextension_api/extension_api.json
+scons target=template_debug platform=android custom_api_file=thirdparty/godot_cpp_gdextension_api/extension_api.json
+scons target=template_release platform=android custom_api_file=thirdparty/godot_cpp_gdextension_api/extension_api.json
 ```
 
 #### Linux / MacOS

diff --git a/thirdparty/godot-cpp b/thirdparty/godot-cpp
diff --git a/thirdparty/godot_cpp_gdextension_api/README.md b/thirdparty/godot_cpp_gdextension_api/README.md
@@ -0,0 +1,23 @@
+# GDExtension API
+
+This directory contains the API JSON for
+[**Godot Engine**](https://github.com/godotengine/godot)'s *GDExtensions* API.
+
+## Current API version
+- **Godot Engine v4.3.dev.custom_build**
+- [commit 81f3d43cc1ba01136795fb2059bbaa55bc514a16](https://github.com/godotengine/godot/commit/81f3d43cc1ba01136795fb2059bbaa55bc514a16)
+
+## Updating API
+
+The API JSON is synced with the latest version of Godot used when developing the plugin. Here is the
+update procedure:
+
+- Compile [Godot Engine](https://github.com/godotengine/godot) at the specific
+  version/commit which you are using.
+  * Or if you use an official release, download that version of the Godot editor.
+- Use the compiled or downloaded executable to generate the `extension_api.json` file with:
+
+```
+godot --dump-extension-api
+```
+- Copy the generated `extension_api.json` file into this directory
+1 −1		.github/ISSUE_TEMPLATE/bug_report.yml
+1 −1		.github/workflows/ci.yml
+0 −11		CMakeLists.txt
+5 −2		README.md
+162 −15		binding_generator.py
+111 −3		gdextension/gdextension_interface.h
+32 −28		include/godot_cpp/classes/wrapped.hpp
+22 −22		include/godot_cpp/core/binder_common.hpp
+12 −0		include/godot_cpp/core/builtin_ptrcall.hpp
+45 −6		include/godot_cpp/core/class_db.hpp
+2 −0		include/godot_cpp/core/object.hpp
+11 −0		include/godot_cpp/core/property_info.hpp
+6 −0		include/godot_cpp/core/type_info.hpp
+4 −1		include/godot_cpp/godot.hpp
+132 −73		include/godot_cpp/templates/cowdata.hpp
+9 −0		include/godot_cpp/templates/safe_refcount.hpp
+53 −38		include/godot_cpp/templates/vector.hpp
+3 −3		include/godot_cpp/variant/aabb.hpp
+9 −9		include/godot_cpp/variant/char_string.hpp
+9 −0		include/godot_cpp/variant/typed_array.hpp
+7 −0		include/godot_cpp/variant/variant.hpp
+3 −0		include/godot_cpp/variant/vector2i.hpp
+11 −0		include/godot_cpp/variant/vector3i.hpp
+11 −0		include/godot_cpp/variant/vector4i.hpp
+41 −0		src/core/class_db.cpp
+13 −2		src/godot.cpp
+18 −18		src/variant/char_string.cpp
+20 −20		src/variant/packed_arrays.cpp
+8 −0		src/variant/vector2i.cpp
+0 −22		test/CMakeLists.txt
+5 −0		test/project/example.gd
+4 −0		test/project/main.gd
+3 −1		test/project/main.tscn
+31 −0		test/src/example.cpp
+33 −2		test/src/example.h
+3 −1		test/src/register_types.cpp
+9 −0		tools/android.py
+94 −0		tools/common_compiler_flags.py
+108 −39		tools/godotcpp.py
+3 −0		tools/ios.py
+4 −1		tools/linux.py
+3 −0		tools/macos.py
+0 −144		tools/targets.py
+3 −0		tools/web.py
+3 −2		tools/windows.py