diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/dist/shell/_godot.zsh-completion | 2 | ||||
| -rw-r--r-- | misc/dist/shell/godot.bash-completion | 2 | ||||
| -rw-r--r-- | misc/dist/shell/godot.fish | 2 | ||||
| -rwxr-xr-x | misc/hooks/pre-commit-make-rst | 2 | ||||
| -rwxr-xr-x | misc/scripts/check_ci_log.py | 2 | ||||
| -rwxr-xr-x | misc/scripts/clang_format.sh | 2 | ||||
| -rw-r--r-- | misc/scripts/codespell.sh | 4 |
7 files changed, 13 insertions, 3 deletions
diff --git a/misc/dist/shell/_godot.zsh-completion b/misc/dist/shell/_godot.zsh-completion index 6444ca337e..b17bb6e66b 100644 --- a/misc/dist/shell/_godot.zsh-completion +++ b/misc/dist/shell/_godot.zsh-completion @@ -78,6 +78,8 @@ _arguments \ '--export[export the project using the given preset and matching release template]:export preset name then path' \ '--export-debug[same as --export, but using the debug template]:export preset name then path' \ '--export-pack[same as --export, but only export the game pack for the given preset]:export preset name then path' \ + '--convert-3to4[converts project from Godot 3.x to Godot 4.x]' \ + '--validate-conversion-3to4[shows what elements will be renamed when converting project from Godot 3.x to Godot 4.x]' \ '--doctool[dump the engine API reference to the given path in XML format, merging if existing files are found]:path to base Godot build directory (optional):_dirs' \ '--no-docbase[disallow dumping the base types (used with --doctool)]' \ '--build-solutions[build the scripting solutions (e.g. for C# projects)]' \ diff --git a/misc/dist/shell/godot.bash-completion b/misc/dist/shell/godot.bash-completion index 31e067e29a..1ab687e1fc 100644 --- a/misc/dist/shell/godot.bash-completion +++ b/misc/dist/shell/godot.bash-completion @@ -81,6 +81,8 @@ _complete_godot_options() { --export --export-debug --export-pack +--convert-3to4 +--validate-conversion-3to4 --doctool --no-docbase --build-solutions diff --git a/misc/dist/shell/godot.fish b/misc/dist/shell/godot.fish index da4ce1190c..d58066c135 100644 --- a/misc/dist/shell/godot.fish +++ b/misc/dist/shell/godot.fish @@ -93,6 +93,8 @@ complete -c godot -l check-only -d "Only parse for errors and quit (use with --s complete -c godot -l export -d "Export the project using the given preset and matching release template" -x complete -c godot -l export-debug -d "Same as --export, but using the debug template" -x complete -c godot -l export-pack -d "Same as --export, but only export the game pack for the given preset" -x +complete -c godot -l convert-3to4 -d "Converts project from Godot 3.x to Godot 4.x" +complete -c godot -l validate-conversion-3to4 -d "Shows what elements will be renamed when converting project from Godot 3.x to Godot 4.x" complete -c godot -l doctool -d "Dump the engine API reference to the given path in XML format, merging if existing files are found" -r complete -c godot -l no-docbase -d "Disallow dumping the base types (used with --doctool)" complete -c godot -l build-solutions -d "Build the scripting solutions (e.g. for C# projects)" diff --git a/misc/hooks/pre-commit-make-rst b/misc/hooks/pre-commit-make-rst index 38b397c494..7d115f1d13 100755 --- a/misc/hooks/pre-commit-make-rst +++ b/misc/hooks/pre-commit-make-rst @@ -9,4 +9,4 @@ if [[ "$py_ver" != "3" ]]; then PYTHON+=3 fi -$PYTHON doc/tools/make_rst.py doc/classes modules --dry-run +$PYTHON doc/tools/make_rst.py doc/classes modules --dry-run --color diff --git a/misc/scripts/check_ci_log.py b/misc/scripts/check_ci_log.py index 2c75b83bd7..1e5a12eeb4 100755 --- a/misc/scripts/check_ci_log.py +++ b/misc/scripts/check_ci_log.py @@ -25,6 +25,8 @@ if ( file_contents.find("Program crashed with signal") != -1 or file_contents.find("Dumping the backtrace") != -1 or file_contents.find("Segmentation fault (core dumped)") != -1 + or file_contents.find("Aborted (core dumped)") != -1 + or file_contents.find("terminate called without an active exception") != -1 ): print("FATAL ERROR: Godot has been crashed.") sys.exit(52) diff --git a/misc/scripts/clang_format.sh b/misc/scripts/clang_format.sh index ba30ca8924..2b7179f5be 100755 --- a/misc/scripts/clang_format.sh +++ b/misc/scripts/clang_format.sh @@ -21,6 +21,8 @@ while read -r f; do continue elif [[ "$f" == "platform/android/java/lib/src/org/godotengine/godot/gl/EGLLogWrapper"* ]]; then continue + elif [[ "$f" == "platform/android/java/lib/src/org/godotengine/godot/utils/ProcessPhoenix"* ]]; then + continue fi python misc/scripts/copyright_headers.py "$f" diff --git a/misc/scripts/codespell.sh b/misc/scripts/codespell.sh index 7c5f824b5e..f99c5d22b2 100644 --- a/misc/scripts/codespell.sh +++ b/misc/scripts/codespell.sh @@ -1,5 +1,5 @@ #!/bin/sh -SKIP_LIST="./thirdparty,*.gen.*,*.po,*.pot,package-lock.json,./core/string/locales.h,./DONORS.md,./misc/scripts/codespell.sh" -IGNORE_LIST="ba,childs,complies,curvelinear,expct,fave,findn,gird,inout,lod,nd,numer,ois,ro,statics,te,varn" +SKIP_LIST="./thirdparty,*.gen.*,*.po,*.pot,package-lock.json,./core/string/locales.h,./DONORS.md,./misc/dist/linux/org.godotengine.Godot.desktop,./misc/scripts/codespell.sh" +IGNORE_LIST="ba,childs,complies,curvelinear,expct,fave,findn,gird,inout,lod,nd,numer,ois,ro,statics,te,varius,varn" codespell -w -q 3 -S "${SKIP_LIST}" -L "${IGNORE_LIST}" |