mirror of
https://github.com/godotengine/godot.git
synced 2024-11-22 12:12:28 +00:00
Merge pull request #40257 from Xrayez/custom-modules-expandvars
Expand env vars for `custom_modules` build option
This commit is contained in:
commit
70e21154f0
@ -217,14 +217,15 @@ void unregister_module_types() {
|
||||
def convert_custom_modules_path(path):
|
||||
if not path:
|
||||
return path
|
||||
path = os.path.realpath(os.path.expanduser(os.path.expandvars(path)))
|
||||
err_msg = "Build option 'custom_modules' must %s"
|
||||
if not os.path.isdir(path):
|
||||
raise ValueError(err_msg % "point to an existing directory.")
|
||||
if os.path.realpath(path) == os.path.realpath("modules"):
|
||||
if path == os.path.realpath("modules"):
|
||||
raise ValueError(err_msg % "be a directory other than built-in `modules` directory.")
|
||||
if is_module(path):
|
||||
raise ValueError(err_msg % "point to a directory with modules, not a single module.")
|
||||
return os.path.realpath(os.path.expanduser(path))
|
||||
return path
|
||||
|
||||
|
||||
def disable_module(self):
|
||||
|
Loading…
Reference in New Issue
Block a user