asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
virtualx-engine/modules/upnp/SCsub

51 lines
1.3 KiB
Text
Raw Normal View History

Add UPnP support (port forwarding, querying external IP)
2018-05-11 02:00:16 +02:00
#!/usr/bin/env python
SCons: Format buildsystem files with psf/black Configured for a max line length of 120 characters. psf/black is very opinionated and purposely doesn't leave much room for configuration. The output is mostly OK so that should be fine for us, but some things worth noting: - Manually wrapped strings will be reflowed, so by using a line length of 120 for the sake of preserving readability for our long command calls, it also means that some manually wrapped strings are back on the same line and should be manually merged again. - Code generators using string concatenation extensively look awful, since black puts each operand on a single line. We need to refactor these generators to use more pythonic string formatting, for which many options are available (`%`, `format` or f-strings). - CI checks and a pre-commit hook will be added to ensure that future buildsystem changes are well-formatted. (cherry picked from commit cd4e46ee65dab6baa6a143bf3b3f64244be36712)
2020-03-30 08:28:32 +02:00
Import("env")
Import("env_modules")
Add UPnP support (port forwarding, querying external IP)
2018-05-11 02:00:16 +02:00
env_upnp = env_modules.Clone()
# Thirdparty source files
SCons: Add explicit dependencies on thirdparty code in cloned env Since we clone the environments to build thirdparty code, we don't get an explicit dependency on the build objects produced by that environment. So when we update thirdparty code, Godot code using it is not necessarily rebuilt (I think it is for changed headers, but not for changed .c/.cpp files), which can lead to an invalid compilation output (linking old Godot .o files with a newer, potentially ABI breaking version of thirdparty code). This was only seen as really problematic with bullet updates (leading to crashes when rebuilding Godot after a bullet update without cleaning .o files), but it's safer to fix it everywhere, even if it's a LOT of hacky boilerplate. (cherry picked from commit c7b53c03ae7f7feb45a6023ee5cf764025ebb5e1)
2020-12-17 16:01:36 +01:00
thirdparty_obj = []
SCons: Format buildsystem files with psf/black Configured for a max line length of 120 characters. psf/black is very opinionated and purposely doesn't leave much room for configuration. The output is mostly OK so that should be fine for us, but some things worth noting: - Manually wrapped strings will be reflowed, so by using a line length of 120 for the sake of preserving readability for our long command calls, it also means that some manually wrapped strings are back on the same line and should be manually merged again. - Code generators using string concatenation extensively look awful, since black puts each operand on a single line. We need to refactor these generators to use more pythonic string formatting, for which many options are available (`%`, `format` or f-strings). - CI checks and a pre-commit hook will be added to ensure that future buildsystem changes are well-formatted. (cherry picked from commit cd4e46ee65dab6baa6a143bf3b3f64244be36712)
2020-03-30 08:28:32 +02:00
if env["builtin_miniupnpc"]:
Add UPnP support (port forwarding, querying external IP)
2018-05-11 02:00:16 +02:00
thirdparty_dir = "#thirdparty/miniupnpc/"
thirdparty_sources = [
miniupnpc: Update to version 2.2.2 (cherry picked from commit 69486b105944dbeb528b0c78e3cbe44e4c7cc657)
2021-03-14 12:07:28 +01:00
"igd_desc_parse.c",
Add UPnP support (port forwarding, querying external IP)
2018-05-11 02:00:16 +02:00
"miniupnpc.c",
miniupnpc: Update to version 2.2.2 (cherry picked from commit 69486b105944dbeb528b0c78e3cbe44e4c7cc657)
2021-03-14 12:07:28 +01:00
"minixml.c",
"minisoap.c",
"minissdpc.c",
Add UPnP support (port forwarding, querying external IP)
2018-05-11 02:00:16 +02:00
"miniwget.c",
miniupnpc: Update to version 2.2.2 (cherry picked from commit 69486b105944dbeb528b0c78e3cbe44e4c7cc657)
2021-03-14 12:07:28 +01:00
"upnpcommands.c",
Add UPnP support (port forwarding, querying external IP)
2018-05-11 02:00:16 +02:00
"upnpdev.c",
miniupnpc: Update to version 2.2.2 (cherry picked from commit 69486b105944dbeb528b0c78e3cbe44e4c7cc657)
2021-03-14 12:07:28 +01:00
"upnpreplyparse.c",
Add UPnP support (port forwarding, querying external IP)
2018-05-11 02:00:16 +02:00
"connecthostport.c",
"portlistingparse.c",
miniupnpc: Update to version 2.2.2 (cherry picked from commit 69486b105944dbeb528b0c78e3cbe44e4c7cc657)
2021-03-14 12:07:28 +01:00
"receivedata.c",
"addr_is_reserved.c",
Add UPnP support (port forwarding, querying external IP)
2018-05-11 02:00:16 +02:00
]
miniupnpc: Update to version 2.2.3 Library code and public headers are now properly separated, we can fix include paths to remove the redundant subfolder. (cherry picked from commit 432ac521ef50ca41a81cffc1770cb46f72a422f6)
2021-11-19 12:00:37 +01:00
thirdparty_sources = [thirdparty_dir + "src/" + file for file in thirdparty_sources]
Add UPnP support (port forwarding, querying external IP)
2018-05-11 02:00:16 +02:00
miniupnpc: Update to version 2.2.3 Library code and public headers are now properly separated, we can fix include paths to remove the redundant subfolder. (cherry picked from commit 432ac521ef50ca41a81cffc1770cb46f72a422f6)
2021-11-19 12:00:37 +01:00
env_upnp.Prepend(CPPPATH=[thirdparty_dir + "include"])
SCons: Use CPPDEFINES instead of CPPFLAGS for pre-processor defines It's the recommended way to set those, and is more portable (automatically prepends -D for GCC/Clang and /D for MSVC). We still use CPPFLAGS for some pre-processor flags which are not defines.
2019-07-03 09:16:20 +02:00
env_upnp.Append(CPPDEFINES=["MINIUPNP_STATICLIB"])
miniupnpc: Disable socket timeout on Windows, matching upstream Fixes #88471. (cherry picked from commit f695de7c68e373088175f8f3b1650f11a27be7aa)
2024-05-06 23:30:09 +02:00
if env["platform"] != "windows":
env_upnp.Append(CPPDEFINES=["MINIUPNPC_SET_SOCKET_TIMEOUT"])
Add UPnP support (port forwarding, querying external IP)
2018-05-11 02:00:16 +02:00
SCons: Build thirdparty code in own env, disable warnings Also remove unnecessary `Export('env')` in other SCsubs, Export should only be used when exporting *new* objects.
2018-09-28 13:29:52 +02:00
env_thirdparty = env_upnp.Clone()
env_thirdparty.disable_warnings()
SCons: Add explicit dependencies on thirdparty code in cloned env Since we clone the environments to build thirdparty code, we don't get an explicit dependency on the build objects produced by that environment. So when we update thirdparty code, Godot code using it is not necessarily rebuilt (I think it is for changed headers, but not for changed .c/.cpp files), which can lead to an invalid compilation output (linking old Godot .o files with a newer, potentially ABI breaking version of thirdparty code). This was only seen as really problematic with bullet updates (leading to crashes when rebuilding Godot after a bullet update without cleaning .o files), but it's safer to fix it everywhere, even if it's a LOT of hacky boilerplate. (cherry picked from commit c7b53c03ae7f7feb45a6023ee5cf764025ebb5e1)
2020-12-17 16:01:36 +01:00
env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
env.modules_sources += thirdparty_obj
SCons: Build thirdparty code in own env, disable warnings Also remove unnecessary `Export('env')` in other SCsubs, Export should only be used when exporting *new* objects.
2018-09-28 13:29:52 +02:00
# Godot source files
SCons: Add explicit dependencies on thirdparty code in cloned env Since we clone the environments to build thirdparty code, we don't get an explicit dependency on the build objects produced by that environment. So when we update thirdparty code, Godot code using it is not necessarily rebuilt (I think it is for changed headers, but not for changed .c/.cpp files), which can lead to an invalid compilation output (linking old Godot .o files with a newer, potentially ABI breaking version of thirdparty code). This was only seen as really problematic with bullet updates (leading to crashes when rebuilding Godot after a bullet update without cleaning .o files), but it's safer to fix it everywhere, even if it's a LOT of hacky boilerplate. (cherry picked from commit c7b53c03ae7f7feb45a6023ee5cf764025ebb5e1)
2020-12-17 16:01:36 +01:00
module_obj = []
env_upnp.add_source_files(module_obj, "*.cpp")
env.modules_sources += module_obj
# Needed to force rebuilding the module files when the thirdparty library is updated.
env.Depends(module_obj, thirdparty_obj)
Reference in a new issue Copy permalink