From c768b1c794bf0441634a72d288d8c97f787a1f6d Mon Sep 17 00:00:00 2001
From: Fabio Alessandrelli <fabio.alessandrelli@gmail.com>
Date: Tue, 7 Jul 2026 18:55:52 +0200
Subject: [PATCH] Package releases according to new store guidelines

---
 SConstruct                                   | 16 +++++++++-------
 misc/{webrtc.gdextension => cfg.gdextension} |  0
 misc/{webrtc.tres => cfg.tres}               |  0
 misc/scripts/package_release.sh              | 12 ++++++------
 4 files changed, 15 insertions(+), 13 deletions(-)
 rename misc/{webrtc.gdextension => cfg.gdextension} (100%)
 rename misc/{webrtc.tres => cfg.tres} (100%)

diff --git a/SConstruct b/SConstruct
index 390e0de..1c09ae2 100644
--- a/SConstruct
+++ b/SConstruct
@@ -167,10 +167,13 @@ if env["platform"] == "macos" and os.environ.get("OSXCROSS_ROOT", ""):
 opts.Update(env)
 
 target = env["target"]
+addon_name = "webrtc_native"
 if env["godot_version"] == "3":
-    result_path = os.path.join("bin", "gdnative", "webrtc" if env["target"] == "release" else "webrtc_debug")
+    if env["target"] != "release":
+        addon_name = "webrtc_native_debug"
+    result_path = os.path.join("bin", "gdnative", "addons", addon_name)
 else:
-    result_path = os.path.join("bin", "extension", "webrtc")
+    result_path = os.path.join("bin", "extension", "addons", addon_name)
 
 # Our includes and sources
 env.Append(CPPPATH=["src/"])
@@ -238,17 +241,16 @@ Default(library)
 
 # GDNativeLibrary
 if env["godot_version"] == "3":
-    gdnlib = "webrtc" if target != "debug" else "webrtc_debug"
     ext = ".tres"
     extfile = env.Substfile(
-        os.path.join(result_path, gdnlib + ext),
-        "misc/webrtc" + ext,
+        os.path.join(result_path, addon_name + ".tres"),
+        "misc/cfg.tres",
         SUBST_DICT={
-            "{GDNATIVE_PATH}": gdnlib,
+            "{GDNATIVE_PATH}": "addons/" + addon_name,
             "{TARGET}": "template_" + env["target"],
         },
     )
 else:
-    extfile = env.InstallAs(os.path.join(result_path, "webrtc.gdextension"), "misc/webrtc.gdextension")
+    extfile = env.InstallAs(os.path.join(result_path, addon_name + ".gdextension"), "misc/cfg.gdextension")
 
 Default(extfile)
diff --git a/misc/webrtc.gdextension b/misc/cfg.gdextension
similarity index 100%
rename from misc/webrtc.gdextension
rename to misc/cfg.gdextension
diff --git a/misc/webrtc.tres b/misc/cfg.tres
similarity index 100%
rename from misc/webrtc.tres
rename to misc/cfg.tres
diff --git a/misc/scripts/package_release.sh b/misc/scripts/package_release.sh
index 42fc798..8f3c6c9 100755
--- a/misc/scripts/package_release.sh
+++ b/misc/scripts/package_release.sh
@@ -6,28 +6,28 @@ set -x
 ARTIFACTS=${ARTIFACTS:-"artifacts"}
 DESTINATION=${DESTINATION:-"release"}
 VERSION=${VERSION:-"extension"}
-TYPE=${TYPE:-"webrtc"}
+ADDON_NAME=${ADDON_NAME:-"webrtc_native"}
 
 mkdir -p ${DESTINATION}
 ls -R ${DESTINATION}
 ls -R ${ARTIFACTS}
 
-DESTDIR="${DESTINATION}/${VERSION}/${TYPE}"
+DESTDIR="${DESTINATION}/${VERSION}/addons/${ADDON_NAME}"
 
 mkdir -p ${DESTDIR}/lib
 
-find "${ARTIFACTS}" -maxdepth 5 -wholename "*/${VERSION}/${TYPE}/lib/*" | xargs cp -r -t "${DESTDIR}/lib/"
+find "${ARTIFACTS}" -maxdepth 6 -wholename "*/${VERSION}/addons/${ADDON_NAME}/lib/*" | xargs cp -r -t "${DESTDIR}/lib/"
 find "${ARTIFACTS}" -wholename "*/LICENSE*" | xargs cp -t "${DESTDIR}/"
 
 if [ $VERSION = "gdnative" ]; then
-    find "${ARTIFACTS}" -wholename "*/${VERSION}/${TYPE}/${TYPE}.tres" | head -n 1 | xargs cp -t "${DESTDIR}/"
+    find "${ARTIFACTS}" -wholename "*/${VERSION}/addons/${ADDON_NAME}/${ADDON_NAME}.tres" | head -n 1 | xargs cp -t "${DESTDIR}/"
 else
-    find "${ARTIFACTS}" -wholename "*/${VERSION}/${TYPE}/${TYPE}.gdextension" | head -n 1 | xargs cp -t "${DESTDIR}/"
+    find "${ARTIFACTS}" -wholename "*/${VERSION}/addons/${ADDON_NAME}/${ADDON_NAME}.gdextension" | head -n 1 | xargs cp -t "${DESTDIR}/"
 fi
 
 CURDIR=$(pwd)
 cd "${DESTINATION}/${VERSION}"
-zip -r ../godot-${VERSION}-${TYPE}.zip ${TYPE}
+zip -r ../godot-${VERSION}-${ADDON_NAME}.zip addons
 cd "$CURDIR"
 
 ls -R ${DESTINATION}