gnat1drv.adb, [...]: Output the copyright message on a separate line from the version...

	* gnat1drv.adb, gnatbind.adb, gnatchop.adb, gnatfind.adb, gnatlink.adb,
	gnatls.adb, gnatxref.adb, gprep.adb: Output the copyright message on a
	separate line from the version message.

From-SVN: r90910

diff --git a/gcc/ada/gnat1drv.adb b/gcc/ada/gnat1drv.adb
index 0c2b939b5462d78257ef18d287de3fe8cb5b6fa3..eccb6bb9226ce838962ed259ea199d281746b3dc 100644 (file)
--- a/gcc/ada/gnat1drv.adb
+++ b/gcc/ada/gnat1drv.adb
@@ -170,7 +170,8 @@ begin
          Write_Eol;
          Write_Str ("GNAT ");
          Write_Str (Gnat_Version_String);
-         Write_Str (" Copyright 1992-2004 Free Software Foundation, Inc.");
+         Write_Eol;
+         Write_Str ("Copyright 1992-2004 Free Software Foundation, Inc.");
          Write_Eol;
       end if;
 

diff --git a/gcc/ada/gnatbind.adb b/gcc/ada/gnatbind.adb
index 48c23f07eb87dda03c4d8122214e138695e9ff94..a64990ec590cefc1214545b3dfb81bde517d17c9 100644 (file)
--- a/gcc/ada/gnatbind.adb
+++ b/gcc/ada/gnatbind.adb
@@ -480,7 +480,8 @@ begin
       Write_Eol;
       Write_Str ("GNATBIND ");
       Write_Str (Gnat_Version_String);
-      Write_Str (" Copyright 1995-2004 Free Software Foundation, Inc.");
+      Write_Eol;
+      Write_Str ("Copyright 1995-2004 Free Software Foundation, Inc.");
       Write_Eol;
    end if;
 

diff --git a/gcc/ada/gnatchop.adb b/gcc/ada/gnatchop.adb
index 29bb2e9225f2a77c418caed95a1c5af641654ba6..0c5a25227af824d78bd9260594142989382573c9 100644 (file)
--- a/gcc/ada/gnatchop.adb
+++ b/gcc/ada/gnatchop.adb
@@ -1145,10 +1145,10 @@ procedure Gnatchop is
                --  tools write to standard output ???
 
                Put (Standard_Error, "GNATCHOP ");
-               Put (Standard_Error, Gnatvsn.Gnat_Version_String);
+               Put_Line (Standard_Error, Gnatvsn.Gnat_Version_String);
                Put_Line
                  (Standard_Error,
-                  " Copyright 1998-2004, Ada Core Technologies Inc.");
+                  "Copyright 1998-2004, Ada Core Technologies Inc.");
 
             when 'w' =>
                Overwrite_Files := True;

diff --git a/gcc/ada/gnatfind.adb b/gcc/ada/gnatfind.adb
index c59ae499106e7f3c14e2d96eeff3d570d0de7577..44abac594c29892eea1de6630321e4ddb60e0e62 100644 (file)
--- a/gcc/ada/gnatfind.adb
+++ b/gcc/ada/gnatfind.adb
@@ -238,8 +238,8 @@ procedure Gnatfind is
 
    procedure Write_Usage is
    begin
-      Put_Line ("GNATFIND " & Gnatvsn.Gnat_Version_String
-                & " Copyright 1998-2004, Ada Core Technologies Inc.");
+      Put_Line ("GNATFIND " & Gnatvsn.Gnat_Version_String);
+      Put_Line ("Copyright 1998-2004, Ada Core Technologies Inc.");
       Put_Line ("Usage: gnatfind pattern[:sourcefile[:line[:column]]] "
                 & "[file1 file2 ...]");
       New_Line;

diff --git a/gcc/ada/gnatlink.adb b/gcc/ada/gnatlink.adb
index 5d30a57c709d483da1d639a8698b3c358a916474..19728a86d886d74dcc259b08f25cfbc03b0d7531 100644 (file)
--- a/gcc/ada/gnatlink.adb
+++ b/gcc/ada/gnatlink.adb
@@ -1278,7 +1278,8 @@ procedure Gnatlink is
          Write_Eol;
          Write_Str ("GNATLINK ");
          Write_Str (Gnat_Version_String);
-         Write_Str (" Copyright 1995-2004 Free Software Foundation, Inc");
+         Write_Eol;
+         Write_Str ("Copyright 1995-2004 Free Software Foundation, Inc");
          Write_Eol;
       end if;
    end Write_Header;

diff --git a/gcc/ada/gnatls.adb b/gcc/ada/gnatls.adb
index cdc924cb418b38e849565df00181d891f9bdcd50..a2dd0a1ac49fcf7bba45a54a88a48557b5dc8a8c 100644 (file)
--- a/gcc/ada/gnatls.adb
+++ b/gcc/ada/gnatls.adb
@@ -1484,7 +1484,8 @@ begin
       Write_Eol;
       Write_Str ("GNATLS ");
       Write_Str (Gnat_Version_String);
-      Write_Str (" Copyright 1997-2004 Free Software Foundation, Inc.");
+      Write_Eol;
+      Write_Str ("Copyright 1997-2004 Free Software Foundation, Inc.");
       Write_Eol;
       Write_Eol;
       Write_Str ("Source Search Path:");

diff --git a/gcc/ada/gnatxref.adb b/gcc/ada/gnatxref.adb
index d7b668d9bf530cf524a8caf23702dc92177af570..513127817a4664f29edc1ec9b1337182b22ea35c 100644 (file)
--- a/gcc/ada/gnatxref.adb
+++ b/gcc/ada/gnatxref.adb
@@ -209,8 +209,8 @@ procedure Gnatxref is
 
    procedure Write_Usage is
    begin
-      Put_Line ("GNATXREF " & Gnatvsn.Gnat_Version_String
-                & " Copyright 1998-2004, Ada Core Technologies Inc.");
+      Put_Line ("GNATXREF " & Gnatvsn.Gnat_Version_String);
+      Put_Line ("Copyright 1998-2004, Ada Core Technologies Inc.");
       Put_Line ("Usage: gnatxref [switches] file1 file2 ...");
       New_Line;
       Put_Line ("  file ... list of source files to xref, " &

diff --git a/gcc/ada/gprep.adb b/gcc/ada/gprep.adb
index fdd1f8ba25bba0463583aeb431ebf7649baae908..53b2bd6f46f720193023e787d1164cfb299dbee7 100644 (file)
--- a/gcc/ada/gprep.adb
+++ b/gcc/ada/gprep.adb
@@ -45,7 +45,6 @@ with GNAT.Command_Line;
 with GNAT.Directory_Operations; use GNAT.Directory_Operations;
 with GNAT.OS_Lib;               use GNAT.OS_Lib;
 
-
 package body GPrep is
 
    Copyright_Displayed : Boolean := False;
@@ -133,9 +132,8 @@ package body GPrep is
    procedure Display_Copyright is
    begin
       if not Copyright_Displayed then
-         Write_Line ("GNAT Preprocessor " &
-                     Gnatvsn.Gnat_Version_String &
-                     " Copyright 1996-2004 Free Software Foundation, Inc.");
+         Write_Line ("GNAT Preprocessor " & Gnatvsn.Gnat_Version_String);
+         Write_Line ("Copyright 1996-2004 Free Software Foundation, Inc.");
          Copyright_Displayed := True;
       end if;
    end Display_Copyright;