diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 2b10f863f2..cf83384396 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -17,7 +17,7 @@ build: python: "3.9" jobs: pre_build: - - ./scripts/apidoc_full.sh + - ./framework/scripts/apidoc_full.sh - breathe-apidoc -o docs/api apidoc/xml post_build: - | diff --git a/ChangeLog.d/00README.md b/ChangeLog.d/00README.md index 2fbc989dee..321e88800e 100644 --- a/ChangeLog.d/00README.md +++ b/ChangeLog.d/00README.md @@ -86,6 +86,6 @@ See [existing entries](../ChangeLog) for examples. ## How `ChangeLog` is updated -Run [`../scripts/assemble_changelog.py`](../scripts/assemble_changelog.py) -from a Git working copy +Run [`../framework/scripts/assemble_changelog.py`] +(../framework/scripts/assemble_changelog.py) from a Git working copy to move the entries from files in `ChangeLog.d` to the main `ChangeLog` file. diff --git a/tests/scripts/components-basic-checks.sh b/tests/scripts/components-basic-checks.sh index 0ff7f44ab5..f6f8ad793d 100644 --- a/tests/scripts/components-basic-checks.sh +++ b/tests/scripts/components-basic-checks.sh @@ -11,7 +11,7 @@ component_check_recursion () { msg "Check: recursion.pl" # < 1s - tests/scripts/recursion.pl library/*.c + ./framework/scripts/recursion.pl library/*.c } component_check_generated_files () { @@ -36,7 +36,7 @@ component_check_generated_files () { component_check_doxy_blocks () { msg "Check: doxygen markup outside doxygen blocks" # < 1s - tests/scripts/check-doxy-blocks.pl + ./framework/scripts/check-doxy-blocks.pl } component_check_files () { @@ -47,7 +47,7 @@ component_check_files () { component_check_changelog () { msg "Check: changelog entries" # < 1s rm -f ChangeLog.new - scripts/assemble_changelog.py -o ChangeLog.new + ./framework/scripts/assemble_changelog.py -o ChangeLog.new if [ -e ChangeLog.new ]; then # Show the diff for information. It isn't an error if the diff is # non-empty. @@ -132,7 +132,7 @@ component_check_test_dependencies () { component_check_doxygen_warnings () { msg "Check: doxygen warnings (builds the documentation)" # ~ 3s - tests/scripts/doxygen.sh + ./framework/scripts/doxygen.sh } component_check_code_style () { @@ -149,7 +149,7 @@ support_check_code_style () { component_check_python_files () { msg "Lint: Python scripts" - tests/scripts/check-python-files.sh + ./framework/scripts/check-python-files.sh } component_check_test_helpers () {