Copyright-updating script now retains non-NYU/UIowa copyrights in files if present.

diff --git a/contrib/update-copyright.pl b/contrib/update-copyright.pl
index f3c4248ac25dd24f7582b0a57525e9dda9e69ed5..2a581698c5a1123fd02c682346b163b84546663d 100755 (executable)
--- a/contrib/update-copyright.pl
+++ b/contrib/update-copyright.pl
@@ -48,13 +48,6 @@ my $standard_template = <<EOF;
  ** information.\\endverbatim
 EOF
 
-my $public_template = <<EOF;
- ** This file is part of the CVC4 project.
- ** Copyright (c) $years  New York University and The University of Iowa
- ** See the file COPYING in the top-level source directory for licensing
- ** information.\\endverbatim
-EOF
-
 ## end config ##
 
 use strict;
@@ -164,17 +157,25 @@ sub handleFile {
     print $OUT " ** Original author: $author\n";
     print $OUT " ** Major contributors: $major_contributors\n";
     print $OUT " ** Minor contributors (to current version): $minor_contributors\n";
-    print $OUT $standard_template;
-    print $OUT " **\n";
+    my $comment_stub = "";
     while(my $line = <$IN>) {
+      if($line =~ /\b[Cc]opyright\b/ && $line !~ /\bNew York University and The University of Iowa\b/) {
+        # someone else holds this copyright
+        print $OUT $line;
+      }
       last if $line =~ /^ \*\*\s*$/;
       if($line =~ /\*\//) {
-        print $OUT " ** [[ Add lengthier description here ]]\n";
-        print $OUT " ** \\todo document this file\n";
-        print $OUT $line;
+        $comment_stub = " ** [[ Add lengthier description here ]]\n\
+ ** \\todo document this file\n\
+$line";
         last;
       }
     }
+    print $OUT $standard_template;
+    print $OUT " **\n";
+    if($comment_stub) {
+      print $OUT $comment_stub;
+    }
   } else {
     my $line = $_;
     print "adding\n";