diff options
Diffstat (limited to 'docs/markdown')
| -rw-r--r-- | docs/markdown/Contributing.md | 14 | ||||
| -rw-r--r-- | docs/markdown/snippets/feature_new.md | 6 |
2 files changed, 17 insertions, 3 deletions
diff --git a/docs/markdown/Contributing.md b/docs/markdown/Contributing.md index 7559c00..e385be2 100644 --- a/docs/markdown/Contributing.md +++ b/docs/markdown/Contributing.md @@ -29,6 +29,20 @@ Do not merge head back to your branch. Any merge commits in your pull request make it not acceptable for merging into master and you must remove them. +## Special procedure for new features + +Every new feature requires some extra steps, namely: + + - Must include a project test under `test cases/`, or if that's not + possible or if the test requires a special environment, it must go + into `run_unittests.py`. + - Must be registered with the [FeatureChecks framework](Release-notes-for-0.47.0.md#Feature_detection_based_on_meson_version_in_project) + that will warn the user if they try to use a new feature while + targetting an older meson version. + - Needs a release note snippet inside `docs/markdown/snippets/` with + a heading and a brief paragraph explaining what the feature does + with an example. + ## Acceptance and merging The kind of review and acceptance any merge proposal gets depends on diff --git a/docs/markdown/snippets/feature_new.md b/docs/markdown/snippets/feature_new.md index 7480634..94fb880 100644 --- a/docs/markdown/snippets/feature_new.md +++ b/docs/markdown/snippets/feature_new.md @@ -24,9 +24,9 @@ Project name: featurenew Project version: undefined Build machine cpu family: x86_64 Build machine cpu: x86_64 -WARNING: Project targetting '>=0.43' but tried to use feature introduced in '0.44.0': get_unquoted +WARNING: Project targetting '>=0.43' but tried to use feature introduced in '0.44.0': configuration_data.get_unquoted() Message: bar Build targets in project: 0 -Minimum version of features used: -0.44.0: {'get_unquoted'} +WARNING: Project specifies a minimum meson_version '>=0.43' which conflicts with: + * 0.44.0: {'configuration_data.get_unquoted()'} ``` |