Cleanup and removed last remains of Id

jwillemsen · jwillemsen · commit d3825129b2e6 · 2015-01-07T18:54:26.000+01:00
diff --git a/docs/html/CDT6.html b/docs/html/CDT6.html
@@ -4,8 +4,6 @@
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
   <meta http-equiv="Content-Style-Type" content="text/css">
-  <meta name="id" content=
-  "">
   <link rel="STYLESHEET" href="MakeProjectCreator.css" charset="ISO-8859-1"
   type="text/css">
 
diff --git a/docs/html/MakeProjectCreator.html b/docs/html/MakeProjectCreator.html
@@ -6,8 +6,6 @@
   "HTML Tidy for Linux (vers 1 September 2005), see www.w3.org">
       <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
         <meta http-equiv="Content-Style-Type" content="text/css">
-          <meta name="id" content=
-  "">
             <link rel="STYLESHEET" href="MakeProjectCreator.css" charset="ISO-8859-1"
             type="text/css">
 
diff --git a/docs/html/RpmSpec.html b/docs/html/RpmSpec.html
@@ -4,8 +4,6 @@
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
   <meta http-equiv="Content-Style-Type" content="text/css">
-  <meta name="id" content=
-  "">
   <link rel="STYLESHEET" href="MakeProjectCreator.css" charset="ISO-8859-1"
   type="text/css">
 
@@ -33,7 +31,7 @@ <h3 class="Head2">Background/Abstract</h3>
     workspace declarations (<samp>.mwc</samp> files).  Consequently,
     workspace files utilizing these new features are not
     backwards-compatible with prior releases of MPC.</li>
-    
+
     <li class="body">Since RPM is primarily Linux-based, RpmSpec only
     officially supports use on Linux-based systems.  It <em>may</em>
     work on platforms for which an RPM port exists, but such success
@@ -71,7 +69,7 @@ <h3 class="Head2">Usage</h3>
     Inter-project dependencies that exist between any projects known to
     the top-level workspace automatically turn into inter-package
     dependencies in RPMs.
-    
+
    <h4>Generic workflow</h4>
     <div align="center">
    <img src="rpmworkflow.png" alt="rpm workflow"/>
@@ -121,14 +119,14 @@ <h4><a name="mwcnotes"></a>Creating Workspaces</h4>
    Details on the variables allowed in the <samp>specific</samp>
    clause can be found in the <a href="../templates/rpmspec.txt">
    <samp>$MPC_ROOT/docs/templates/rpmspec.txt</samp></a> file.
-   
+
    <p>If you use workspaces as a part of
    building right now, you may wish to write additional
    workspace files specifically for packaging via RPM.
 
    <h4><a name="installready"></a>Making Projects
    <em>Install-Ready</em></h4>
-   
+
    MPC-assisted packaging requires some attention from the developer
    in order to yield its full potential.  What this means is that in
    order for a project to avail itself to be packaged, it must take
@@ -180,7 +178,7 @@ <h4><a name="scriptnotes"></a>Notes on Generated Script</h4>
      architecture, instead presuming that whatever toolchain is
      needed can be found in the PATH or is specified in the
      <code>.spec</code> file.</li>
-     
+
      <li>The script performs a build/install activity for each package.
    Installation is not into the running system, but rather into a
    "fake" area.  Installation is necessary to satisfy inter-package
@@ -190,7 +188,7 @@ <h4><a name="scriptnotes"></a>Notes on Generated Script</h4>
    <samp>specific</samp> clause, typically in the top-level
    workspace.</li>
 
-   
+
    </ol>
 </div>
 
diff --git a/docs/html/WB26.html b/docs/html/WB26.html
@@ -4,8 +4,6 @@
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
   <meta http-equiv="Content-Style-Type" content="text/css">
-  <meta name="id" content=
-  "">
   <link rel="STYLESHEET" href="MakeProjectCreator.css" charset="ISO-8859-1"
   type="text/css">
 
diff --git a/docs/html/WB30.html b/docs/html/WB30.html
@@ -4,8 +4,6 @@
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
   <meta http-equiv="Content-Style-Type" content="text/css">
-  <meta name="id" content=
-  "">
   <link rel="STYLESHEET" href="MakeProjectCreator.css" charset="ISO-8859-1"
   type="text/css">
 
diff --git a/docs/templates/automake.txt b/docs/templates/automake.txt
@@ -1,4 +1,3 @@
-//
 // Current as of 2/2/2007
 // This defines the role of all the template variables specific to the
 // 'automake' project type.
diff --git a/docs/templates/bmake.txt b/docs/templates/bmake.txt
@@ -1,4 +1,3 @@
-//
 // Current as of 9/25/2006
 // This defines the role of all the template variables specific to the
 // 'bmake' project type.
diff --git a/docs/templates/cc.txt b/docs/templates/cc.txt
@@ -1,4 +1,3 @@
-//
 // Current as of 9/26/2006
 // This defines the role of all the template variables specific to the
 // 'cc' project type.
diff --git a/docs/templates/cdt6cproject.txt b/docs/templates/cdt6cproject.txt
@@ -1,4 +1,3 @@
-//
 // Document template variables for templates templates/cdt6cproject.mpd.
 // Please try to keep this alphabetically sorted.
 //
diff --git a/docs/templates/cdt6project.txt b/docs/templates/cdt6project.txt
@@ -1,4 +1,3 @@
-//
 // Document template variables for templates templates/cdt6project.mpd.
 // Please try to keep this alphabetically sorted.
 //
diff --git a/docs/templates/common.txt b/docs/templates/common.txt
@@ -1,4 +1,3 @@
-//
 // Document template variables that are common to all or most templates.
 // Please try to keep this alphabetically sorted.
 //
diff --git a/docs/templates/ghs.txt b/docs/templates/ghs.txt
@@ -1,4 +1,3 @@
-//
 bsp = If a bsp is necessary, this variable should be set to the bsp name.
 exceptions = This controls whether exceptions are used or not.  It is on by default.
 libext = Similar to the common lib_ext except that this one is normally left to the default.
diff --git a/docs/templates/make.net.txt b/docs/templates/make.net.txt
@@ -1,4 +1,3 @@
-//
 // Current as of 8/5/2009 - Happy Birthday Molly!
 // This defines the role of all the template variables specific to the
 // 'make' project type using the csharp language.
diff --git a/docs/templates/make.txt b/docs/templates/make.txt
@@ -1,4 +1,3 @@
-//
 // Current as of 1/14/2010
 // This defines the role of all the template variables specific to the
 // 'make' project type.
diff --git a/docs/templates/rpmspec.txt b/docs/templates/rpmspec.txt
@@ -1,5 +1,3 @@
-//
-//
 // Document template variables for -type rpmspec
 // Please try to keep this alphabetically sorted.
 //
diff --git a/docs/templates/vc10.txt b/docs/templates/vc10.txt
@@ -1,4 +1,3 @@
-//
 // Document template variables for templates templates\vc10.mpd.
 // Please try to keep this alphabetically sorted.
 //
diff --git a/docs/templates/vc7.txt b/docs/templates/vc7.txt
@@ -1,4 +1,3 @@
-//
 // Current as of 3/23/2010
 // This defines the role of all the template variables specific to the
 // 'vc7' and 'vc71' project types.
diff --git a/docs/templates/vc7csharp.txt b/docs/templates/vc7csharp.txt
@@ -1,4 +1,3 @@
-//
 // Current as of 10/26/2006
 // This defines the role of all the template variables specific to the
 // 'vc7' and 'vc71' project types with the csharp language.
diff --git a/docs/templates/vc7java.txt b/docs/templates/vc7java.txt
@@ -1,4 +1,3 @@
-//
 // Current as of 11/15/2007
 // This defines the role of all the template variables specific to the
 // 'vc7' and 'vc71' project types with the java language.
diff --git a/docs/templates/vc7vb.txt b/docs/templates/vc7vb.txt
@@ -1,4 +1,3 @@
-//
 // Current as of 10/26/2006
 // This defines the role of all the template variables specific to the
 // 'vc7' and 'vc71' project types with the vb language.
diff --git a/docs/templates/vc8.txt b/docs/templates/vc8.txt
@@ -1,4 +1,3 @@
-//
 // Current as of 5/30/2008
 // This defines the role of all the template variables specific to the
 // 'vc8' project type.
diff --git a/docs/templates/vc8csharp.txt b/docs/templates/vc8csharp.txt
@@ -1,4 +1,3 @@
-//
 // Current as of 10/26/2006
 // This defines the role of all the template variables specific to the
 // 'vc8' project type with the csharp language.
diff --git a/docs/templates/vc8java.txt b/docs/templates/vc8java.txt
@@ -1,4 +1,3 @@
-//
 // Current as of 3/05/2007
 // This defines the role of all the template variables specific to the
 // 'vc8' project type with the java language.
diff --git a/docs/templates/vc8vb.txt b/docs/templates/vc8vb.txt
@@ -1,4 +1,3 @@
-//
 // Current as of 10/26/2006
 // This defines the role of all the template variables specific to the
 // 'vc8' project type with the vb language.
diff --git a/docs/templates/wb26.txt b/docs/templates/wb26.txt
@@ -1,4 +1,3 @@
-//
 // Document template variables for templates templates/wb26.mpd.
 // Please try to keep this alphabetically sorted.
 //
diff --git a/docs/templates/wb26wrmakefile.txt b/docs/templates/wb26wrmakefile.txt
@@ -1,4 +1,3 @@
-//
 // Document template variables for templates templates/wb26wrmakefile.mpd.
 // Please try to keep this alphabetically sorted.
 //
diff --git a/docs/templates/wb26wrproject.txt b/docs/templates/wb26wrproject.txt
@@ -1,4 +1,3 @@
-//
 // Document template variables for templates templates/wb26wrproject.mpd.
 // Please try to keep this alphabetically sorted.
 //
diff --git a/docs/templates/wix.txt b/docs/templates/wix.txt
@@ -1,4 +1,3 @@
-//
 // Current as of 8/10/2009
 // This defines the role of all the template variables specific to the
 // 'wix' project type.
diff --git a/modules/BCB2007WorkspaceCreator.pm b/modules/BCB2007WorkspaceCreator.pm
@@ -51,7 +51,6 @@ sub pre_workspace {
 
   ## Optionally print the workspace comment
 #  $self->print_workspace_comment($fh,
-#            '<!--  -->', $crlf,
 #            '<!-- MPC Command -->', $crlf,
 #            '<!-- ', $self->create_command_line_string($0, @ARGV), ' -->',
 #            $crlf);
diff --git a/modules/BCB2009WorkspaceCreator.pm b/modules/BCB2009WorkspaceCreator.pm
@@ -27,7 +27,6 @@ sub pre_workspace {
 
   ## Optionally print the workspace comment
 #  $self->print_workspace_comment($fh,
-#            '<!--  -->', $crlf,
 #            '<!-- MPC Command -->', $crlf,
 #            '<!-- ', $self->create_command_line_string($0, @ARGV), ' -->',
 #            $crlf);
diff --git a/modules/BDS4WorkspaceCreator.pm b/modules/BDS4WorkspaceCreator.pm
@@ -51,7 +51,6 @@ sub pre_workspace {
 
   ## Optionally print the workspace comment
   $self->print_workspace_comment($fh,
-            '<!--  -->', $crlf,
             '<!-- MPC Command -->', $crlf,
             '<!-- ', $self->create_command_line_string($0, @ARGV), ' -->',
             $crlf);
diff --git a/modules/EM3WorkspaceCreator.pm b/modules/EM3WorkspaceCreator.pm
@@ -38,8 +38,6 @@ sub pre_workspace {
 
   ## Optionally print the workspace comment
   $self->print_workspace_comment($fh,
-            '#', $crlf,
-            '# ', $crlf,
             '#', $crlf,
             '# This file was generated by MPC.  Any changes made directly to', $crlf,
             '# this file will be lost the next time it is generated.', $crlf,
diff --git a/modules/HTMLWorkspaceCreator.pm b/modules/HTMLWorkspaceCreator.pm
@@ -38,7 +38,6 @@ sub pre_workspace {
 
   ## Next, goes the workspace comment
   $self->print_workspace_comment($fh,
-            '<!--  -->', $crlf,
             '<!-- MPC Command: -->', $crlf,
             '<!-- ', $self->create_command_line_string($0, @ARGV),' -->', $crlf);
 
diff --git a/modules/RpmSpecWorkspaceCreator.pm b/modules/RpmSpecWorkspaceCreator.pm
@@ -228,7 +228,6 @@ sub post_workspace {
     # comment will go in the %changelog section of the .spec
     $self->print_workspace_comment($fh, map {$_ . "\n"} (
       "* $now This file was generated by MPC.",
-      '  ',
       '  Any changes made directly to this file will',
       '  be lost the next time it is generated.',
       '  MPC Command:', '  ' . $self->create_command_line_string($0, @ARGV)));
@@ -245,7 +244,6 @@ sub post_workspace {
     "# $now",
     '# This file was generated by MPC.  Any changes made directly to',
     '# this file will be lost the next time it is generated.',
-    '# ',
     '# MPC Command:', '# ' . $self->create_command_line_string($0, @ARGV)));
 
   my $script = get_script();
diff --git a/modules/VC10WorkspaceCreator.pm b/modules/VC10WorkspaceCreator.pm
@@ -30,7 +30,6 @@ sub pre_workspace {
             'Microsoft Visual Studio Solution File, Format Version 11.00', $crlf;
   $self->print_workspace_comment($fh,
             '# Visual Studio 2010', $crlf,
-            '# ', $crlf,
             '#', $crlf,
             '# This file was generated by MPC.  Any changes made directly to', $crlf,
             '# this file will be lost the next time it is generated.', $crlf,
diff --git a/modules/VC11WorkspaceCreator.pm b/modules/VC11WorkspaceCreator.pm
@@ -30,7 +30,6 @@ sub pre_workspace {
             'Microsoft Visual Studio Solution File, Format Version 11.00', $crlf;
   $self->print_workspace_comment($fh,
             '# Visual Studio 2011', $crlf,
-            '# ', $crlf,
             '#', $crlf,
             '# This file was generated by MPC.  Any changes made directly to', $crlf,
             '# this file will be lost the next time it is generated.', $crlf,
diff --git a/modules/VC12WorkspaceCreator.pm b/modules/VC12WorkspaceCreator.pm
@@ -30,7 +30,6 @@ sub pre_workspace {
             'Microsoft Visual Studio Solution File, Format Version 12.00', $crlf;
   $self->print_workspace_comment($fh,
             '# Visual Studio 2012', $crlf,
-            '# ', $crlf,
             '#', $crlf,
             '# This file was generated by MPC.  Any changes made directly to', $crlf,
             '# this file will be lost the next time it is generated.', $crlf,
diff --git a/modules/VC14WorkspaceCreator.pm b/modules/VC14WorkspaceCreator.pm
@@ -30,7 +30,6 @@ sub pre_workspace {
             'Microsoft Visual Studio Solution File, Format Version 14.00', $crlf;
   $self->print_workspace_comment($fh,
             '# Visual Studio 2014', $crlf,
-            '# ', $crlf,
             '#', $crlf,
             '# This file was generated by MPC.  Any changes made directly to', $crlf,
             '# this file will be lost the next time it is generated.', $crlf,
diff --git a/modules/VC6WorkspaceCreator.pm b/modules/VC6WorkspaceCreator.pm
@@ -46,8 +46,6 @@ sub pre_workspace {
 
   ## Optionally print the workspace comment
   $self->print_workspace_comment($fh,
-            '#', $crlf,
-            '# ', $crlf,
             '#', $crlf,
             '# This file was generated by MPC.  Any changes made directly to', $crlf,
             '# this file will be lost the next time it is generated.', $crlf,
diff --git a/modules/VC71WorkspaceCreator.pm b/modules/VC71WorkspaceCreator.pm
@@ -32,8 +32,6 @@ sub pre_workspace {
 
   ## Optionally print the workspace comment
   $self->print_workspace_comment($fh,
-            '#', $crlf,
-            '# ', $crlf,
             '#', $crlf,
             '# This file was generated by MPC.  Any changes made directly to', $crlf,
             '# this file will be lost the next time it is generated.', $crlf,
diff --git a/modules/VC7WorkspaceCreator.pm b/modules/VC7WorkspaceCreator.pm
@@ -57,8 +57,6 @@ sub pre_workspace {
 
   ## Optionally print the workspace comment
   $self->print_workspace_comment($fh,
-            '#', $crlf,
-            '# ', $crlf,
             '#', $crlf,
             '# This file was generated by MPC.  Any changes made directly to', $crlf,
             '# this file will be lost the next time it is generated.', $crlf,
diff --git a/modules/VC9WorkspaceCreator.pm b/modules/VC9WorkspaceCreator.pm
@@ -30,7 +30,6 @@ sub pre_workspace {
             'Microsoft Visual Studio Solution File, Format Version 10.00', $crlf;
   $self->print_workspace_comment($fh,
             '# Visual Studio 2008', $crlf,
-            '# ', $crlf,
             '#', $crlf,
             '# This file was generated by MPC.  Any changes made directly to', $crlf,
             '# this file will be lost the next time it is generated.', $crlf,
diff --git a/modules/WB26WorkspaceCreator.pm b/modules/WB26WorkspaceCreator.pm
@@ -37,10 +37,6 @@ sub workspace_file_name {
   return 'org.eclipse.core.resources.prefs';
 }
 
-sub get_id_for_comment {
-  return '';
-}
-
 sub get_project_prefix {
   return '';
 }
@@ -54,8 +50,6 @@ sub pre_workspace {
             '#----------------------------------------------------------------------------', $crlf,
             '#       WindRiver Workbench generator', $crlf,
             '#', $crlf,
-            '# ', $self->get_id_for_comment(), $crlf,
-            '#', $crlf,
             '# This file was generated by MPC.  Any changes made directly to', $crlf,
             '# this file will be lost the next time it is generated.', $crlf,
             '# This file should be placed in the .metadata/.plugins/org.eclipse.core.runtime/.settings directory', $crlf,
@@ -115,8 +109,6 @@ sub list_file_body {
             '#----------------------------------------------------------------------------', $crlf,
             '#       WindRiver Workbench generator', $crlf,
             '#', $crlf,
-            '# ', $self->get_id_for_comment() , $crlf,
-            '#', $crlf,
             '# This file was generated by MPC.  Any changes made directly to', $crlf,
             '# this file will be lost the next time it is generated.', $crlf,
             '# MPC Command:', $crlf,
diff --git a/modules/WB30WorkspaceCreator.pm b/modules/WB30WorkspaceCreator.pm
@@ -22,10 +22,6 @@ use vars qw(@ISA);
 # Subroutine Section
 # ************************************************************
 
-sub get_id_for_comment {
-  return '';
-}
-
 sub get_project_prefix {
   return 'wb_';
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-//`
`2`	`1`	`// Current as of 2/2/2007`
`3`	`2`	`// This defines the role of all the template variables specific to the`
`4`	`3`	`// 'automake' project type.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-//`
`2`	`1`	`// Current as of 9/25/2006`
`3`	`2`	`// This defines the role of all the template variables specific to the`
`4`	`3`	`// 'bmake' project type.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-//`
`2`	`1`	`// Current as of 9/26/2006`
`3`	`2`	`// This defines the role of all the template variables specific to the`
`4`	`3`	`// 'cc' project type.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-//`
`2`	`1`	`// Document template variables for templates templates/cdt6cproject.mpd.`
`3`	`2`	`// Please try to keep this alphabetically sorted.`
`4`	`3`	`//`
-Original file line number
+Diff line change
@@ @@ -1,4 +1,3 @@ @@
 -//
 // Document template variables for templates templates/cdt6project.mpd.
 // Please try to keep this alphabetically sorted.
 //