wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Windows: don't install __DECC_*.H

Browse source 
This adds the possibility to exclude files by regexp in util/copy.pl

Partial fix for #3254

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6303)
This commit is contained in:
Richard Levitte 2018-05-19 07:09:19 +02:00
parent 6439e343fa
commit 246bd8fd05
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Configurations/windows-makefile.tmpl
View file

@ -412,7 +412,8 @@ install_dev:
@"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\ms\applink.c" \
"$(INSTALLTOP)\include\openssl"
@rem {- output_on() unless grep { $_ eq "OPENSSL_USE_APPLINK" } @{$config{defines}}; "" -}
@"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\include\openssl\*.h" \
@"$(PERL)" "$(SRCDIR)\util\copy.pl" "-exclude_re=/__DECC_" \
"$(SRCDIR)\include\openssl\*.h" \
"$(INSTALLTOP)\include\openssl"
@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(BLDDIR)\include\openssl\*.h \
"$(INSTALLTOP)\include\openssl"

10
util/copy.pl
View file

@ -18,6 +18,7 @@ use Fcntl;
my $stripcr = 0;
my $arg;
my @excludes = ();
foreach $arg (@ARGV) {
if ($arg eq "-stripcr")
@ -25,11 +26,16 @@ foreach $arg (@ARGV) {
$stripcr = 1;
next;
}
if ($arg =~ /^-exclude_re=(.*)$/)
{
push @excludes, $1;
next;
}
$arg =~ s|\\|/|g; # compensate for bug/feature in cygwin glob...
$arg = qq("$arg") if ($arg =~ /\s/); # compensate for bug in 5.10...
foreach (glob $arg)
foreach my $f (glob $arg)
{
push @filelist, $_;
push @filelist, $f unless grep { $f =~ /$_/ } @excludes;
}
}