Skip to content

Commit 364c28b

Browse files
committed
Streamline php_modules and php_tools definitions
1 parent a122d66 commit 364c28b

File tree

221 files changed

+10
-147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+10
-147
lines changed

bin/gen-php-modules.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ def get_module_options(module_dirname: str) -> Dict[str, Any]:
6464
return load_yaml(os.path.join(PHP_MODULE_PATH, module_dirname, "options.yml"))
6565

6666

67-
def get_module_build(module_dirname: str) -> Dict[str, Any]:
68-
"""Returns yaml dict build configuration of a PHP module given by its absolute file path."""
69-
return load_yaml(os.path.join(PHP_MODULE_PATH, module_dirname, "build.yml"))
67+
def get_module_install(module_dirname: str) -> Dict[str, Any]:
68+
"""Returns yaml dict install configuration of a PHP module given by its absolute file path."""
69+
return load_yaml(os.path.join(PHP_MODULE_PATH, module_dirname, "install.yml"))
7070

7171

7272
def get_module_test(module_dirname: str) -> Dict[str, Any]:
@@ -196,7 +196,7 @@ def write_group_vars(modules: List[str]) -> None:
196196
opts = get_module_options(module)
197197
fp.write(" " + module + ":\n")
198198
fp.write(" disabled: [" + ", ".join(str(x) for x in opts["exclude"]) + "]\n")
199-
fp.write(load_yaml_raw(os.path.join(PHP_MODULE_PATH, module, "build.yml"), 4))
199+
fp.write(load_yaml_raw(os.path.join(PHP_MODULE_PATH, module, "install.yml"), 4))
200200

201201

202202
# --------------------------------------------------------------------------------------------------

bin/gen-php-tools.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ def get_tool_options(tool_dirname: str) -> Dict[str, Any]:
6464
return load_yaml(os.path.join(PHP_TOOL_PATH, tool_dirname, "options.yml"))
6565

6666

67-
def get_tool_build(tool_dirname: str) -> Dict[str, Any]:
68-
"""Returns yaml dict build configuration of a PHP tool given by its absolute file path."""
67+
def get_tool_install(tool_dirname: str) -> Dict[str, Any]:
68+
"""Returns yaml dict install configuration of a PHP tool given by its absolute file path."""
6969
return load_yaml(os.path.join(PHP_TOOL_PATH, tool_dirname, "install.yml"))
7070

7171

doc/contributor/PHP-EXT-build.yml.md renamed to doc/contributor/PHP-EXT-install.yml.md

Lines changed: 2 additions & 3 deletions

doc/contributor/PHP-EXT-options.yml.md

Lines changed: 2 additions & 3 deletions

doc/contributor/PHP-EXT-test.yml.md

Lines changed: 0 additions & 27 deletions
This file was deleted.
File renamed without changes.

php_modules/amqp/test.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.
File renamed without changes.

php_modules/apc/test.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.
File renamed without changes.

0 commit comments

Comments
 (0)