From 898be348ba5e87e7eff26d1f2165258b03ff1189 Mon Sep 17 00:00:00 2001
From: Zane Shelley <zshelle@us.ibm.com>
Date: Thu, 13 Sep 2012 14:49:05 -0500
Subject: Fixed addCopyright.pl so does not add trailing whitespace

Change-Id: I75827ed028d7273b1ef590779df23fc89a65f567
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1735
Tested-by: Jenkins Server
Reviewed-by: Mark W. Wenning <wenning@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
---
 src/build/tools/addCopyright.pl | 68 ++++++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 31 deletions(-)

(limited to 'src/build/tools/addCopyright.pl')

diff --git a/src/build/tools/addCopyright.pl b/src/build/tools/addCopyright.pl
index 26d98b9ee..022b12214 100755
--- a/src/build/tools/addCopyright.pl
+++ b/src/build/tools/addCopyright.pl
@@ -1,27 +1,26 @@
 #!/usr/bin/perl
-#  IBM_PROLOG_BEGIN_TAG
-#  This is an automatically generated prolog.
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
 #
-#  $Source: src/build/tools/addCopyright.pl $
+# $Source: src/build/tools/addCopyright.pl $
 #
-#  IBM CONFIDENTIAL
+# IBM CONFIDENTIAL
 #
-#  COPYRIGHT International Business Machines Corp. 2011-2012
+# COPYRIGHT International Business Machines Corp. 2011-2012
 #
-#  p1
+# p1
 #
-#  Object Code Only (OCO) source materials
-#  Licensed Internal Code Source Materials
-#  IBM HostBoot Licensed Internal Code
+# Object Code Only (OCO) source materials
+# Licensed Internal Code Source Materials
+# IBM HostBoot Licensed Internal Code
 #
-#  The source code for this program is not published or other-
-#  wise divested of its trade secrets, irrespective of what has
-#  been deposited with the U.S. Copyright Office.
+# The source code for this program is not published or otherwise
+# divested of its trade secrets, irrespective of what has been
+# deposited with the U.S. Copyright Office.
 #
-#  Origin: 30
+# Origin: 30
 #
-#  IBM_PROLOG_END_TAG
-
+# IBM_PROLOG_END_TAG
 
 #################################### ABOUT ####################################
 # Forked from:                                                                #
@@ -115,7 +114,7 @@ my  @Files                  =   ();
 
 my  $rc                     =   0;
 
-# NOTE: $OLD_DELIMITER_END is a subset of $DELIMITER_END so must match 
+# NOTE: $OLD_DELIMITER_END is a subset of $DELIMITER_END so must match
 #       $DELIMITER_END first in order to return the entire string.
 my $g_end_del_re = "($DELIMITER_END|$OLD_DELIMITER_END)";
 my $g_prolog_re  = "($DELIMITER_BEGIN)((.|\n)+?)$g_end_del_re";
@@ -782,12 +781,12 @@ sub removeCopyrightBlock( $$ )
         # Don't wipe the the '#!' line at the top.
         $data = removeProlog( $data, '\#', '' );
     }
-     else
-     {
-         print  STDOUT  "ERROR: Don't know how to remove old block from $filetype file.\n";
-         close  OUTPUT;
-         return RC_INVALID_FILETYPE;
-     }
+    else
+    {
+        print  STDOUT  "ERROR: Don't know how to remove old block from $filetype file.\n";
+        close  OUTPUT;
+        return RC_INVALID_FILETYPE;
+    }
 
     print   OUTPUT  $data;
 
@@ -831,12 +830,12 @@ sub addEmptyCopyrightBlock( $$$ )
     select( OUTPUT );               ## new default filehandle for print
     if ("Assembly" eq $filetype)
     {
-        print OUTPUT "# $DELIMITER_BEGIN $DELIMITER_END \n";
+        print OUTPUT "# $DELIMITER_BEGIN $DELIMITER_END\n";
     }
     elsif ( ("Makefile"    eq $filetype) or
             ("PrdRuleFile" eq $filetype) )
     {
-        print OUTPUT "# $DELIMITER_BEGIN $DELIMITER_END \n";
+        print OUTPUT "# $DELIMITER_BEGIN $DELIMITER_END\n";
     }
     elsif (("Autoconf" eq $filetype) or
            ("Automake" eq $filetype) or
@@ -857,7 +856,7 @@ sub addEmptyCopyrightBlock( $$$ )
         {
             print OUTPUT $line;
         }
-        print OUTPUT "# $DELIMITER_BEGIN $DELIMITER_END \n";
+        print OUTPUT "# $DELIMITER_BEGIN $DELIMITER_END\n";
         unless ($line =~ m/^#!/)
         {
             print OUTPUT $line;
@@ -876,7 +875,7 @@ sub addEmptyCopyrightBlock( $$$ )
     }
     elsif ("MofFile" eq $filetype)
     {
-        print OUTPUT "// $DELIMITER_BEGIN $DELIMITER_END \n";
+        print OUTPUT "// $DELIMITER_BEGIN $DELIMITER_END\n";
     }
     elsif ("xml" eq $filetype )
     {
@@ -906,7 +905,6 @@ sub addEmptyCopyrightBlock( $$$ )
     {
         ## leave the files around for debug
         unlink( $savedbgfile ) or die " $? can't delete $savedbgfile: $!";
-
     }
 }
 
@@ -922,7 +920,7 @@ sub addPrologComments($$$)
     $data = '';
     for my $line ( @lines )
     {
-        # If there is an block comment end tag, fill the end of the line with 
+        # If there is an block comment end tag, fill the end of the line with
         # spaces.
         if ( $end )
         {
@@ -950,9 +948,17 @@ sub addPrologComments($$$)
         }
         else
         {
-            $line = "$begin $line";
-            $line = "$line $end" if ( $end );
-            $line = "$line\n";
+            if ( not $end and not $line )
+            {
+                # Compensate for blank lines with no end delimeter.
+                $line = "$begin\n";
+            }
+            else
+            {
+                $line = "$begin $line";
+                $line = "$line $end" if ( $end );
+                $line = "$line\n";
+            }
         }
 
         $data .= $line;
-- 
cgit v1.2.1