diff options
| author | Rich Salz <rsalz@openssl.org> | 2018-03-22 10:21:33 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2018-03-22 10:53:22 -0400 |
| commit | 8390062853513e1b42cac98078db184bc6100ca7 (patch) | |
| tree | 78860aba4103eb313e2e58b2e0bfffc05baa38bf /apps | |
| parent | b9499cf8de17d1d7efd4ad135beb74d5dec8e120 (diff) | |
Fix resource files
Add it to apps as well as libraries.
Fix the copyright year generation.
Thanks to user RTT for pointing this out.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5704)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/build.info | 5 | ||||
| -rw-r--r-- | apps/progs.pl | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/apps/build.info b/apps/build.info index e72437330e..4a11a18fbe 100644 --- a/apps/build.info +++ b/apps/build.info @@ -23,6 +23,11 @@ IF[{- !$disabled{apps} -}] INCLUDE[openssl]=.. ../include DEPEND[openssl]=libapps.a ../libssl +IF[{- $config{target} =~ /^(?:Cygwin|mingw|VC-)/ -}] + GENERATE[openssl.rc]=../util/mkrc.pl openssl + SOURCE[openssl]=openssl.rc +ENDIF + {- join("\n ", map { (my $x = $_) =~ s|\.c$|.o|; "DEPEND[$x]=progs.h" } @apps_openssl_src) -} GENERATE[progs.h]=progs.pl $(APPS_OPENSSL) diff --git a/apps/progs.pl b/apps/progs.pl index f832467b57..8b9a95bcad 100644 --- a/apps/progs.pl +++ b/apps/progs.pl @@ -17,12 +17,14 @@ use configdata qw/@disablables %unified_info/; my %commands = (); my $cmdre = qr/^\s*int\s+([a-z_][a-z0-9_]*)_main\(\s*int\s+argc\s*,/; my $apps_openssl = shift @ARGV; +my $YEAR = [localtime()]->[5] + 1900; # because the program apps/openssl has object files as sources, and # they then have the corresponding C files as source, we need to chain # the lookups in %unified_info my @openssl_source = map { @{$unified_info{sources}->{$_}} } + grep { /\.o$/ } @{$unified_info{sources}->{$apps_openssl}}; foreach my $filename (@openssl_source) { @@ -36,12 +38,12 @@ foreach my $filename (@openssl_source) { @ARGV = sort keys %commands; -print <<'EOF'; +print <<"EOF"; /* * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-$YEAR The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy |