update for new windows build proceedures

(cherry picked from commit 5e47b4200ed81b8e18e165fe3a626d9992003db4)
(cherry picked from commit f7456a34472f122ba699dd78aef338f254443d52)

diff --git a/util/merge_copyrights b/util/merge_copyrights
index 36f77f31dc45821fcb948e20957feabee29ca917..d29b5e2380ae32b38e87df33348a71e30fb31dc4 100644 (file)
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -100,7 +100,11 @@ while (<CHANGES>) {
            $file_types{$_} = "CONF-SH";
        } elsif ($base =~ /\.(db|hint)$/) {
            $file_types{$_} = "ZONE";
-       } elsif ($base =~ /(\/\.gitignore|\.gif|\.jpg|\.dsp|\.dsw|\.mak)$/i) {
+       } elsif ($base =~ /(\/\.gitignore|\.(gif|jpg))$/i) {
+           $file_types{$_} = "X";
+       } elsif ($base =~ /\.(def|dep|dsp|dsw|mak|sln)$/i) {
+           $file_types{$_} = "X";
+       } elsif ($base =~ /\.(vcxproj(|\.(user|filters)))$/i) {
            $file_types{$_} = "X";
        } elsif ($base =~ /\.rnc$/i) {
            $file_types{$_} = "RNC";