Skip to content

Commit 118ddcc

Browse files
authored
Merge pull request #242 from branfosj/config
split out default config changes and remove proposed changes
2 parents c96c5c0 + ca2a194 commit 118ddcc

File tree

6 files changed

+58
-58
lines changed

6 files changed

+58
-58
lines changed
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# Changes in default configuration in EasyBuild v5.0
2+
3+
*(for a full overview of changes in EasyBuild v5.0, see [here](overview-of-changes.md))*
4+
5+
Various changes in default configuration included in EasyBuild v5.0, including:
6+
7+
* [Enable RPATH linking by default][rpath]
8+
* [Enable `--trace` by default][trace]
9+
10+
---
11+
12+
## Enable RPATH linking by default {: #rpath }
13+
14+
[RPATH linking][rpath_support] is enabled by default in EasyBuild v5.0 (see [easybuild-framework PR #4448](https://github.com/easybuilders/easybuild-framework/pull/4448)).
15+
16+
The benefits for enabling RPATH are explained in [Why RPATH?][rpath_support_why].
17+
18+
This enhancement **does not** add any filtering of environment variables. This means `$LD_LIBRARY_PATH`
19+
will continue to be appended by the environment module files EasyBuild generates,
20+
unless it is configured to filter these variables (via `--filter-env-vars`,
21+
see also [Relation to `$LD_LIBRARY_PATH`][rpath_support_LD_LIBRARY_PATH]).
22+
23+
To disable RPATH linking, either:
24+
25+
* Use the `--disable-rpath` command line option;
26+
* Set the `$EASYBUILD_DISABLE_RPATH` environment variable;
27+
* Disable RPATH linking in an EasyBuild [configuration file](../configuration.md#configuration_file):
28+
29+
``` ini
30+
[override]
31+
rpath=0
32+
```
33+
34+
35+
---
36+
37+
## Enable `--trace` by default {: #trace }
38+
39+
The [`--trace` option](../tracing-progress.md) is enabled by default (see [easybuild-framework PR #4250](https://github.com/easybuilders/easybuild-framework/pull/4250)).
40+
41+
This makes the output produced by the `eb` command more informative, by providing more information about what's going on in the background.
42+
43+
To disable trace output, either:
44+
45+
* Use the `--disable-trace` command line option;
46+
* Set the `$EASYBUILD_DISABLE_TRACE` environment variable;
47+
* Disable trace mode in a [configuration file](../configuration.md#configuration_file):
48+
49+
``` ini
50+
[override]
51+
trace=0
52+
```

docs/easybuild-v5/enhancements.md

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -5,55 +5,10 @@
55
Various significant enhancements are included in EasyBuild v5.0, including:
66

77
* [`run_shell_cmd` function][run_shell_cmd]
8-
* [Enable RPATH linking by default][rpath]
9-
* [Enable `--trace` by default][trace]
108

119
---
1210

1311
## `run_shell_cmd` function { : #run_shell_cmd }
1412

1513
See dedicated page on the new [`run_shell_cmd` function](run_shell_cmd.md).
1614

17-
---
18-
19-
## Enable RPATH linking by default {: #rpath }
20-
21-
[RPATH linking][rpath_support] is enabled by default in EasyBuild v5.0 (see [easybuild-framework PR #4448](https://github.com/easybuilders/easybuild-framework/pull/4448)).
22-
23-
The benefits for enabling RPATH are explained in [Why RPATH?][rpath_support_why].
24-
25-
This enhancement **does not** add any filtering of environment variables. This means `$LD_LIBRARY_PATH`
26-
will continue to be appended by the environment module files EasyBuild generates,
27-
unless it is configured to filter these variables (via `--filter-env-vars`,
28-
see also [Relation to `$LD_LIBRARY_PATH`][rpath_support_LD_LIBRARY_PATH]).
29-
30-
To disable RPATH linking, either:
31-
32-
* Use the `--disable-rpath` command line option;
33-
* Set the `$EASYBUILD_DISABLE_RPATH` environment variable;
34-
* Disable RPATH linking in an EasyBuild [configuration file](../configuration.md#configuration_file):
35-
36-
``` ini
37-
[override]
38-
rpath=0
39-
```
40-
41-
42-
---
43-
44-
## Enable `--trace` by default {: #trace }
45-
46-
The [`--trace` option](../tracing-progress.md) is enabled by default (see [easybuild-framework PR #4250](https://github.com/easybuilders/easybuild-framework/pull/4250)).
47-
48-
This makes the output produced by the `eb` command more informative, by providing more information about what's going on in the background.
49-
50-
To disable trace output, either:
51-
52-
* Use the `--disable-trace` command line option;
53-
* Set the `$EASYBUILD_DISABLE_TRACE` environment variable;
54-
* Disable trace mode in a [configuration file](../configuration.md#configuration_file):
55-
56-
``` ini
57-
[override]
58-
trace=0
59-
```

docs/easybuild-v5/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
- [Overview of changes](overview-of-changes.md)
44
- [Backwards-incompatible changes](backwards-incompatible-changes.md)
5+
- [Changes in default configuration](changes-in-default-configuration.md)
56
- [Enhancements](enhancements.md)
67
- [`run_shell_cmd` function](run_shell_cmd.md)
78
- [Deprecated functionality](deprecated-functionality.md)

docs/easybuild-v5/overview-of-changes.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@
33
!!! warning
44
EasyBuild 5.0 is currently still under development, via the `5.0.x` branches in the EasyBuild GitHub repositories.
55

6-
We intend to update this section of the documentation regularly as the planned changes are being implemented,
7-
and when there are [proposed changes](proposed-changes.md) where we are requesting community feedback.
6+
We intend to update this section of the documentation regularly as the planned changes are being implemented.
87

98
This page provides a concise overview of the most prominent changes in EasyBuild version 5.0,
109
which can be categorized as:
1110

1211
* [Enhancements](enhancements.md)
12+
* [Changes in default configuration](changes-in-default-configuration.md)
1313
* [Backward-incompatible changes](backwards-incompatible-changes.md)
1414
* [Deprecated functionality](deprecated-functionality.md)
15-
* [Proposed changes](proposed-changes.md)
1615
* [Policies](policies.md)
1716

1817
For in-depth details on a particular change, see the pull requests that are linked

docs/easybuild-v5/proposed-changes.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

mkdocs.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,11 @@ plugins:
196196
- index.md
197197
# necessary for search to work
198198
- search
199-
# redirects for original EasyBuild documentation to avoid broken URLs
200199
- redirects:
201200
redirect_maps:
201+
# redirect removed pages to sensible alternative
202+
easybuild-v5/proposed-changes/: easybuild-v5/index.md
203+
# redirects for original EasyBuild documentation to avoid broken URLs
202204
en/latest/Archived-easyconfigs.html: archived-easyconfigs.md
203205
en/latest/Backup_modules.html: backup-modules.md
204206
en/latest/Changelog.html: changelog-docs.md

0 commit comments

Comments
 (0)