mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-21 01:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

util/add-depends.pl: Adapt to localized /showIncludes output

Browse Source 
It was discovered that MSVC has localized /showIncludes output.
Fortunately, it still seems to follow the same generic format, so we
can adapt the regular expression to make it language agnostic.

Fixes #14994

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/15006)
This commit is contained in:
Richard Levitte 2021-04-26 09:28:12 +02:00
parent 2e535eb50a
commit 3babc1e468
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
util/add-depends.pl
View File

@ -169,6 +169,14 @@ my %procedures = (
#
# Note: including file: {whatever header file}
#
# This output is localized, so for example, the German pack gives
# us this:
#
# Hinweis: Einlesen der Datei: {whatever header file}
#
# To accomodate, we need to use a very general regular expression
# to parse those lines.
#
# Since there's no object file name at all in that information,
# we must construct it ourselves.
@ -179,7 +187,7 @@ my %procedures = (
# warnings, so we simply discard anything that doesn't start with
# the Note:
if (/^Note: including file: */) {
if (/^[^:]*: [^:]*: */) {
(my $tail = $') =~ s/\s*\R$//;
# VC gives us absolute paths for all include files, so to
@ -206,11 +214,10 @@ my %procedures = (
},
'embarcadero' =>
sub {
# With Embarcadero C++Builder's preprocessor (cpp32.exe) the -Hp
# flag gives us the preprocessed output annotated with the following
# note whenever a #include file is read:
# With Embarcadero C++Builder's preprocessor (cpp32.exe) the -Sx -Hp
# flags give us the list of #include files read, like the following:
#
# Including ->->{whatever header file}
# Including ->->{whatever header file}
#
# where each "->" indicates the nesting level of the #include. The
# logic here is otherwise the same as the 'VC' scheme.