Fix copyright in MSFT VersionInfo#5704
Fix copyright in MSFT VersionInfo#5704richsalz wants to merge 4 commits intoopenssl:masterfrom richsalz:fix-mkrc
Conversation
richsalz
added
branch: master
levitte
dismissed
their stale review
No, wait, there's something not quite right here
apps/build.info
Outdated
There was a problem hiding this comment.
Appveyor shows us that this creates a "surprising" disturbance... this section in apps/progs.pl needs to be rewritten by inserting a grep in the middle, like this:
diff --git a/apps/progs.pl b/apps/progs.pl
index f832467b57..f16bc10fac 100644
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -23,6 +23,7 @@ my $apps_openssl = shift @ARGV;
# the lookups in %unified_info
my @openssl_source =
map { @{$unified_info{sources}->{$_}} }
+ grep { /\.o$/ }
@{$unified_info{sources}->{$apps_openssl}};
foreach my $filename (@openssl_source) {There was a problem hiding this comment.
done, and also updated copyright year generation. please reconfirm.
levitte
left a comment
levitte
left a comment
There was a problem hiding this comment.
Only as long as the CIs run fine
levitte
removed
the
approval: review pending
|
I have a build recipe wrong. Look at https://ci.appveyor.com/project/openssl/openssl/build/master.16660/job/o6at0feo36hmiesn#L1669 or https://ci.appveyor.com/project/openssl/openssl/build/master.16660/job/o6at0feo36hmiesn#L375 No equivalent line shows up for openssl. Where and how does the output redirection happen? What's wrong with apps/build.info? |
|
Try this patch: diff --git a/Configure b/Configure
index 0934088d2d..ce33f488d6 100755
--- a/Configure
+++ b/Configure
@@ -2015,6 +2015,13 @@ EOF
$o = cleanfile($buildd, $o, $blddir);
$unified_info{sources}->{$ddest}->{$o} = 1;
$unified_info{sources}->{$o}->{$s} = 1;
+ } elsif ($s =~ /\.rc$/) {
+ # We also recognise resource files
+ my $o = $_;
+ $o =~ s/\.rc$/.res/; # Resource configuration
+ my $o = cleanfile($buildd, $o, $blddir);
+ $unified_info{sources}->{$ddest}->{$o} = 1;
+ $unified_info{sources}->{$o}->{$s} = 1;
} else {
$unified_info{sources}->{$ddest}->{$s} = 1;
} |
|
What was wrong was that .rc files was only recognised in SHARED_SOURCE, not in SOURCE. The diff I just submitted fixes that |
|
pushed and watching the CI's now ... |
Also add rc file to openssl app Thanks to user RTT for pointing this out.
|
it builds and passes (and was confirmed by RTT), but I'll wait for an explicit reconfirm. |
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 <[email protected]> (Merged from #5704)
|
Not backporting; fixed in master. |
|
Apparently this broke the mingw build: |
|
Regarding generation of source files with copyright year from current time: |
|
Why do you hope it's not run automatically? |
|
I wonder why MingW broke with this, but the other rc files didn't cause an error. Do you have a complete build log you can send me? |
It appears to me as if you have a book where every time you open I am not a lawyer but to me that looks like it makes the whole copy-right |
|
What are the odds that a whole year goes by when progs.pl doesn't change, or no new apps source file is added? Pretty small I'd say. |
|
I don't have mingw myself, but I saw that in the travis build after this got merged: i686-w64-mingw32-gcc: i86_64-w64-mingw32-gcc: |
|
Yes, as I said I am not a lawyer... |
|
Oh, interesting thing is that the resource file wasn't ever included when linking the .dlls on MinGW or Cygwin... Looking at it, it looks like a very simple fix... |
|
Like just remove cygwin and mingw from the patterns? I'll do a PR for that, if you're not already on it. :) |
|
No, the other way around, make sure that the support in |
|
See #5730 |
3 participants
Also add rc file to openssl app
Thanks to user RTT for pointing this out.