7b3603c6d8
Resolve merge conflicts by performing the following actions: - Reject changes to deleted files. - Reject changes to generate_errors.pl and generate_visualc_files.pl. Don't add an 'include-crypto' option which would attempt to use the non-existent crypto submodule. - list-identifiers.sh had the `--internal` option added to it, which lists identifiers only in internal headers. Add PSA-specific internal headers to list-identifiers.sh. * origin/development: (40 commits) Document the scripts behaviour further Use check_output instead of Popen all.sh: Require i686-w64-mingw32-gcc version >= 6 generate_visualc_files.pl: add mbedtls source shadowing by crypto generate_errors.pl: refactor and simplify the code Start unused variable with underscore Correct documentation generate_errors.pl: typo fix revert changes to generate_features.pl and generate_query_config.pl Check that the report directory is a directory Use namespaces instead of full classes Fix pylint issues Don't put abi dumps in subfolders Add verbose switch to silence all output except the final report Fetch the remote crypto branch, rather than cloning it Prefix internal functions with underscore Add RepoVersion class to make handling of many arguments easier Reduce indentation levels Improve documentation Use optional arguments for setting repositories ... |
||
|---|---|---|
| .. | ||
| data_files | ||
| abi_check.py | ||
| apidoc_full.sh | ||
| bump_version.sh | ||
| config.pl | ||
| ecc-heap.sh | ||
| find-mem-leak.cocci | ||
| footprint.sh | ||
| generate_errors.pl | ||
| generate_features.pl | ||
| generate_psa_constants.py | ||
| generate_query_config.pl | ||
| generate_visualc_files.pl | ||
| massif_max.pl | ||
| output_env.sh | ||
| rename.pl | ||
| rm-calloc-cast.cocci | ||
| tmp_ignore_makefiles.sh | ||