This patch adds ability to include external, user-defined C++ modules
to be compiled as part of Godot via `custom_modules` build option
which can be passed to `scons`.
```
scons platform=x11 tools=yes custom_modules="../project/modules"
```
Features:
- detects all available modules under `custom_modules` directory the
same way as it does for built-in modules (not recursive);
- works with both relative and absolute paths on the filesystem;
- multiple search paths can be specified as a comma-separated list.
Module custom documentation and editor icons collection and generation
process is adapted to work with absolute paths needed by such modules.
Also fixed doctool bug mixing absolute and relative paths respectively.
Implementation details:
- `env.module_list` is a dictionary now, which holds both module name as
key and either a relative or absolute path to a module as a value.
- `methods.detect_modules` is run twice: once for built-in modules, and
second for external modules, all combined later.
- `methods.detect_modules` was not doing what it says on the tin. It is
split into `detect_modules` which collects a list of available modules
and `write_modules` which generates `register_types` sources for each.
- whether a module is built-in or external is distinguished by relative
or absolute paths respectively. `custom_modules` scons converter
ensures that the path is absolute even if relative path is supplied,
including expanding user paths and symbolic links.
- treats the parent directory as if it was Godot's base directory, so
that there's no need to change include paths in cases where custom
modules are included as dependencies in other modules.
(cherry picked from commit a96f0e98d7
)
26 lines
779 B
Python
26 lines
779 B
Python
#!/usr/bin/env python
|
|
|
|
Import('env')
|
|
|
|
import os
|
|
|
|
from platform_methods import run_in_subprocess
|
|
import editor_icons_builders
|
|
|
|
make_editor_icons_builder = Builder(action=run_in_subprocess(editor_icons_builders.make_editor_icons_action),
|
|
suffix='.h',
|
|
src_suffix='.svg')
|
|
|
|
env['BUILDERS']['MakeEditorIconsBuilder'] = make_editor_icons_builder
|
|
|
|
# Editor's own icons
|
|
icon_sources = Glob("*.svg")
|
|
|
|
# Module icons
|
|
for path in env.module_icons_paths:
|
|
if not os.path.isabs(path):
|
|
icon_sources += Glob("#" + path + "/*.svg") # Built-in.
|
|
else:
|
|
icon_sources += Glob(path + "/*.svg") # Custom.
|
|
|
|
env.Alias('editor_icons', [env.MakeEditorIconsBuilder('#editor/editor_icons.gen.h', icon_sources)])
|