lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

Merge pull request #10225 from valeriosetti/issue229-mbedtls

Browse Source 
[development] Move Everest headers to a private subdirectory (1/2)
This commit is contained in:
Manuel Pégourié-Gonnard
2025-06-19 06:47:21 +00:00
committed by GitHub
parent 48552b620d 2d7ded653f
commit 4ccde0c8e5
2 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework

Submodule framework updated: 1a83e0c84d...977db0c8bc

36
scripts/generate_visualc_files.pl
View File

@ -49,9 +49,20 @@ 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';
my @thirdparty_header_dirs = qw( # This is a dirty patch to allow mbedtls#10091 to be merged without updating
# tf-psa-crypto to psa#235. Once psa#235 will be merged, this dirty fix can
# 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 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
@ -61,7 +72,23 @@ 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 = qw( my @include_directories;
if (-d "tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest") {
@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/tf-psa-crypto/private/everest
tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest/vs2013
tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest/kremlib
tests/include
tf-psa-crypto/tests/include
framework/tests/include
framework/tests/programs
);
} else {
@include_directories = qw(
include include
tf-psa-crypto/include tf-psa-crypto/include
tf-psa-crypto/drivers/builtin/include tf-psa-crypto/drivers/builtin/include
@ -73,7 +100,8 @@ my @include_directories = qw(
tf-psa-crypto/tests/include tf-psa-crypto/tests/include
framework/tests/include framework/tests/include
framework/tests/programs 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