Handle perl files

14 files changed, 7 insertions, 30 deletions

diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-common.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-common.pl
index 098f07f48d3..3a562ad9b9f 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-common.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-common.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl5
 #
-#$Id$
-#
 
 1;
 
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-manage.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-manage.pl
index 77d2495a741..e9d28e8fecf 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-manage.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-manage.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl5
 #
-#$Id$
-#
 
 push(@INC, "$wd/bin");
 require('WebStone-common.pl');
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-run.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-run.pl
index 28efe90c4d5..716cebfa602 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-run.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-run.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl5
 #
-#$Id$
-#
 
 $testbed = "conf/testbed";
 
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-setup.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-setup.pl
index 5588f6cdd1f..fcf41e632b2 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-setup.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-setup.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl5
 #
-#$Id$
-#
 
 push(@INC, "$wd/bin");
 require('WebStone-common.pl');
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/killbench.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/killbench.pl
index db9b0368632..42c616a79e0 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/killbench.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/killbench.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl5
 #
-#$Id$
-#
 
 push(@INC, "$wd/bin");
 require('WebStone-common.pl');
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/mine-logs.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/mine-logs.pl
index c1bdb727fba..6e14d731bfc 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/mine-logs.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/mine-logs.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl
 #
-#$Id$
-#
 #  mine-logs.pl:
 #       script to transform access logs into WebStone workload
 #
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/move-filelist.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/move-filelist.pl
index eb263a04bf5..0155b83f972 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/move-filelist.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/move-filelist.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl5
 #
-#$Id$
-#
 
 push(@INC, "$wd/bin");
 require('WebStone-common.pl');
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/move-runs.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/move-runs.pl
index 3412f992008..a4ca528f034 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/move-runs.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/move-runs.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl5
 #
-#$Id$
-#
 
 push(@INC, "$wd/bin");
 require('WebStone-common.pl');
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/runbench.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/runbench.pl
index fdd12e4d530..81071504f1a 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/runbench.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/runbench.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl5
 #
-#$Id$
-#
 
 push(@INC, "$wd/bin");
 require('WebStone-common.pl');
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/view-results.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/view-results.pl
index ac375746e8a..7ff961efcca 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/view-results.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/view-results.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl5
 #
-#$Id$
-#
 push(@INC, "$wd/bin");
 require('WebStone-common.pl');
 
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/write-testbed.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/write-testbed.pl
index c6fc280b023..2935b9f56fe 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/write-testbed.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/write-testbed.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl5
 #
-#$Id$
-#
 # write new values from form to $wd/conf/testbed, and run WebStone
 #
 
diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/wscollect.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/wscollect.pl
index 27ef003655f..b2f14428477 100755
--- a/ACE/apps/JAWS/clients/WebSTONE/bin/wscollect.pl
+++ b/ACE/apps/JAWS/clients/WebSTONE/bin/wscollect.pl
@@ -1,7 +1,5 @@
 #!/pkg/gnu/bin//perl
 #
-#$Id$
-#
 # $Header$
 # updated version of the old wscollect script which goes through
 # webstone run directories and summarizes the output in tabular
diff --git a/ACE/bin/FOCUS/FOCUS.pl b/ACE/bin/FOCUS/FOCUS.pl
index b037b928b20..9237976db27 100755
--- a/ACE/bin/FOCUS/FOCUS.pl
+++ b/ACE/bin/FOCUS/FOCUS.pl
@@ -27,8 +27,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 #
 # @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
 #
-# $Id$
-#
 ########################################################################
 use Getopt::Long;
 
diff --git a/ACE/bin/zap_svn_id.pl b/ACE/bin/zap_svn_id.pl
index 59b313879a1..78ed63c55f7 100755
--- a/ACE/bin/zap_svn_id.pl
+++ b/ACE/bin/zap_svn_id.pl
@@ -2,19 +2,17 @@ eval '(exit $?0)' && eval 'exec perl -pi -S $0 ${1+"$@"}'
     & eval 'exec perl -0 -S $0 $argv:q'
     if 0;
 
-# $Id$
-#
 # You may want to run the "find" command with this script, which maybe
 # something like this:
 #
-# find . -type f \( -name "*.inl" -o -name "*.h" -o -name "*.cpp" -o -name "*.mpc" -o -name "*.idl" -o -name "*.conf" -o -name "*.mpb" -o -name "*.hpp" \) -print | xargs $ACE_ROOT/bin/zap_svn_id.pl
+# find . -type f \( -name "*.inl" -o -name "*.h" -o -name "*.cpp" -o -name "*.mpc" -o -name "*.idl" -o -name "*.conf" -o -name "*.mpb" -o -name "*.hpp" -o -name "*.pl"  \) -print | xargs $ACE_ROOT/bin/zap_svn_id.pl
 
 # The first three lines above let this script run without specifying the
 # full path to perl, as long as it is in the user's PATH.
 # Taken from perlrun man page.
 
 # Replace the old cvs-id tag with nothing
-BEGIN{undef $/;} s/cvs-id    : //smg;
+BEGIN{undef $/;} s///smg;
 # Replace a single doxygen style with two spaces before the Id with one space
 BEGIN{undef $/;} s/ \*\n \*  \$Id\$\n \*\n/ \*\n \* \$Id\$\n \*\n/smg;
 # Replace a three line doxygen style Id tag with just line *
@@ -47,3 +45,8 @@ BEGIN{undef $/;} s/\/\*\n \* \$Id\$\n \*\n/\/\*\n/smg;
 BEGIN{undef $/;} s/\/\* \$Id\$ \*\/\n\n//smg;
 # Replace a one line c++-style id tag with an empty line below that with nothing
 BEGIN{undef $/;} s/\/\* \$Id\$ \*\/\n//smg;
+# Replace a three perl style Id tag with just line #
+BEGIN{undef $/;} s/ \#\n \# \$Id\$\n \#\n/ \#\n/smg;
+BEGIN{undef $/;} s/\#\n\# \$Id\$\n\#\n/\#\n/smg;
+BEGIN{undef $/;} s/ \#\n \#\$Id\$\n \#\n/ \#\n/smg;
+BEGIN{undef $/;} s/\#\n\#\$Id\$\n\#\n/\#\n/smg;