1
0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-28 00:21:48 +03:00

scripts: generate_visualc_files: remove temporary Everest path fixes

Remove temporary path fixes for Everest's headers that were introduced
in #10225. Only the new and correct path of the header files is kept.

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti
2025-06-19 11:29:11 +02:00
parent 8e95ba94c6
commit 8e8dc11406

View File

@ -49,20 +49,9 @@ my $test_header_dir = 'framework/tests/include/test';
my $test_drivers_header_dir = 'framework/tests/include/test/drivers'; my $test_drivers_header_dir = 'framework/tests/include/test/drivers';
my $test_drivers_source_dir = 'framework/tests/src/drivers'; my $test_drivers_source_dir = 'framework/tests/src/drivers';
# This is a dirty patch to allow mbedtls#10091 to be merged without updating my @thirdparty_header_dirs = qw(
# tf-psa-crypto to psa#235. Once psa#235 will be merged, this dirty fix can tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest
# be removed. );
# The same holds also for @include_directories below.
my @thirdparty_header_dirs;
if (-d "tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest") {
@thirdparty_header_dirs = qw(
tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest
);
} else {
@thirdparty_header_dirs = qw(
tf-psa-crypto/drivers/everest/include/everest
);
}
my @thirdparty_source_dirs = qw( my @thirdparty_source_dirs = qw(
tf-psa-crypto/drivers/everest/library tf-psa-crypto/drivers/everest/library
tf-psa-crypto/drivers/everest/library/kremlib tf-psa-crypto/drivers/everest/library/kremlib
@ -72,36 +61,19 @@ my @thirdparty_source_dirs = qw(
# Directories to add to the include path. # Directories to add to the include path.
# Order matters in case there are files with the same name in more than # Order matters in case there are files with the same name in more than
# one directory: the compiler will use the first match. # one directory: the compiler will use the first match.
my @include_directories; my @include_directories = qw(
if (-d "tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest") { include
@include_directories = qw( tf-psa-crypto/include
include tf-psa-crypto/drivers/builtin/include
tf-psa-crypto/include tf-psa-crypto/drivers/everest/include/
tf-psa-crypto/drivers/builtin/include tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest
tf-psa-crypto/drivers/everest/include/ tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest/vs2013
tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest/kremlib
tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest/vs2013 tests/include
tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest/kremlib tf-psa-crypto/tests/include
tests/include framework/tests/include
tf-psa-crypto/tests/include framework/tests/programs
framework/tests/include );
framework/tests/programs
);
} else {
@include_directories = qw(
include
tf-psa-crypto/include
tf-psa-crypto/drivers/builtin/include
tf-psa-crypto/drivers/everest/include/
tf-psa-crypto/drivers/everest/include/everest
tf-psa-crypto/drivers/everest/include/everest/vs2013
tf-psa-crypto/drivers/everest/include/everest/kremlib
tests/include
tf-psa-crypto/tests/include
framework/tests/include
framework/tests/programs
);
}
my $include_directories = join(';', map {"../../$_"} @include_directories); my $include_directories = join(';', map {"../../$_"} @include_directories);
# Directories to add to the include path when building the libraries, but not # Directories to add to the include path when building the libraries, but not