From 690b31e7dd8d4583c50c1f5c60fde3c6888ff7bf Mon Sep 17 00:00:00 2001
From: Fabio Alessandrelli <fabio.alessandrelli@gmail.com>
Date: Mon, 17 Oct 2022 00:51:32 +0200
Subject: [Upstream] Update to Godot beta 3.

Update build targets.
Move release script out of CI yaml.
Disable debug CI builds for Godot 3.x since they are mostly used for
debugging the extension itself.
---
 SConstruct | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

(limited to 'SConstruct')

diff --git a/SConstruct b/SConstruct
index c10c492..f041ce5 100644
--- a/SConstruct
+++ b/SConstruct
@@ -26,13 +26,13 @@ if env["godot_version"] == "3":
     if "platform" in ARGUMENTS and ARGUMENTS["platform"] == "macos":
         ARGUMENTS["platform"] = "osx"  # compatibility with old osx name
 
-    env = SConscript("godot-cpp-3.x/SConstruct")
-
     scons_cache_path = os.environ.get("SCONS_CACHE")
     if scons_cache_path is not None:
         CacheDir(scons_cache_path)
         Decider("MD5")
 
+    env = SConscript("godot-cpp-3.x/SConstruct")
+
     # Patch base env
     replace_flags(env["CCFLAGS"], {
         "-mios-simulator-version-min=10.0": "-mios-simulator-version-min=11.0",
@@ -57,7 +57,7 @@ if env["godot_version"] == "3":
     if env["platform"] in ["windows", "linux"]:
         env["arch"] = "x86_32" if env["bits"] == "32" else "x86_64"
         env["arch_suffix"] = env["arch"]
-    elif env["platform"] == "osx":
+    elif env["platform"] == "macos":
         env["arch"] = env["macos_arch"]
         env["arch_suffix"] = env["arch"]
     elif env["platform"] == "ios":
@@ -71,6 +71,10 @@ if env["godot_version"] == "3":
             "x86_64": "x86_64",
         }[env["android_arch"]]
         env["arch_suffix"] = env["arch"]
+
+    target_compat = "template_" + env["target"]
+    env["suffix"] = ".{}.{}.{}".format(env["platform"], target_compat, env["arch_suffix"])
+    env["debug_symbols"] = False
 else:
     ARGUMENTS["ios_min_version"] = "11.0"
     env = SConscript("godot-cpp/SConstruct").Clone()
@@ -82,7 +86,10 @@ if env["platform"] == "windows" and env["use_mingw"]:
 opts.Update(env)
 
 target = env["target"]
-result_path = os.path.join("bin", "gdnative" if env["godot_version"] == "3" else "extension", "webrtc" if env["target"] == "release" else "webrtc_debug")
+if env["godot_version"] == "3":
+    result_path = os.path.join("bin", "gdnative", "webrtc" if env["target"] == "release" else "webrtc_debug")
+else:
+    result_path = os.path.join("bin", "extension", "webrtc")
 
 # Dependencies
 deps_source_dir = "deps"
@@ -93,6 +100,7 @@ env.Append(BUILDERS={
 
 # SSL
 ssl = env.BuildOpenSSL(env.Dir(builders.get_ssl_build_dir(env)), env.Dir(builders.get_ssl_source_dir(env)))
+env.Depends(ssl, env.File("builders.py"))
 
 env.Prepend(CPPPATH=[builders.get_ssl_include_dir(env)])
 env.Prepend(LIBPATH=[builders.get_ssl_build_dir(env)])
@@ -100,6 +108,7 @@ env.Append(LIBS=[ssl])
 
 # RTC
 rtc = env.BuildLibDataChannel(env.Dir(builders.get_rtc_build_dir(env)), [env.Dir(builders.get_rtc_source_dir(env))] + ssl)
+env.Depends(rtc, env.File("builders.py"))
 
 env.Append(LIBPATH=[builders.get_rtc_build_dir(env)])
 env.Append(CPPPATH=[builders.get_rtc_include_dir(env)])
@@ -124,7 +133,7 @@ else:
 env.Depends(sources, [ssl, rtc])
 
 # Make the shared library
-result_name = "webrtc_native.{}.{}.{}{}".format(env["platform"], env["target"], env["arch_suffix"], env["SHLIBSUFFIX"])
+result_name = "webrtc_native{}{}".format(env["suffix"], env["SHLIBSUFFIX"])
 env.Depends(sources, ssl)
 
 if env["platform"] == "windows" and env["use_mingw"]:
@@ -134,12 +143,13 @@ library = env.SharedLibrary(target=os.path.join(result_path, "lib", result_name)
 Default(library)
 
 # GDNativeLibrary
-gdnlib = "webrtc"
-if target != "release":
-    gdnlib += "_debug"
-ext = ".tres" if env["godot_version"] == "3" else ".gdextension"
-extfile = env.Substfile(os.path.join(result_path, gdnlib + ext), "misc/webrtc" + ext, SUBST_DICT={
-    "{GDNATIVE_PATH}": gdnlib,
-    "{TARGET}": env["target"],
-})
+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, SUBST_DICT={
+        "{GDNATIVE_PATH}": gdnlib,
+        "{TARGET}": "template_" + env["target"],
+    })
+else:
+    extfile = env.InstallAs(os.path.join(result_path, "webrtc.gdextension"), "misc/webrtc.gdextension")
 Default(extfile)
-- 
cgit v1.2.3