Closes PR ada/5856 and PR ada/6919 !

2002-11-14  Nathanael Nerode  <neroden@gcc.gnu.org>
	Closes PR ada/5856 and PR ada/6919 !
	* bindgen.adb: Remove all references to Public_Version.
	* comperr.adb: Remove all references to Public_Version and
	GNATPRO_Version; correct bug reporting instructions.
	* comperr.ads: Change to match bug box.
	* gnatvsn.ads: Remove all references to Public version and
	GNATPRO version.

From-SVN: r59115

5 files changed, 18 insertions, 174 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 74b959d..169c7bf 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,12 @@
+2002-11-14  Nathanael Nerode  <neroden@gcc.gnu.org>
+	Closes PR ada/5856 and PR ada/6919 !
+	* bindgen.adb: Remove all references to Public_Version.
+	* comperr.adb: Remove all references to Public_Version and
+	GNATPRO_Version; correct bug reporting instructions.
+	* comperr.ads: Change to match bug box.
+	* gnatvsn.ads: Remove all references to Public version and
+	GNATPRO version.
+
 2002-11-13  Nathanael Nerode  <neroden@gcc.gnu.org>
 	PR ada/6919
 	* adaint.c (__gnat_tmp_name): Remove buffer overflow bug on
diff --git a/gcc/ada/bindgen.adb b/gcc/ada/bindgen.adb
index 20765c7..ace6c2f 100644
--- a/gcc/ada/bindgen.adb
+++ b/gcc/ada/bindgen.adb
@@ -159,10 +159,6 @@ package body Bindgen is
    procedure Move_Linker_Option (From : Natural; To : Natural);
    --  Move routine for sorting linker options
 
-   procedure Public_Version_Warning;
-   --  Emit a warning concerning the use of the Public version under
-   --  certain circumstances. See details in body.
-
    procedure Set_Char (C : Character);
    --  Set given character in Statement_Buffer at the Last + 1 position
    --  and increment Last by one to reflect the stored character.
@@ -1682,8 +1678,6 @@ package body Bindgen is
    ---------------------
 
    procedure Gen_Output_File (Filename : String) is
-      Public_Version : constant Boolean := Gnat_Version_Type = "PUBLIC ";
-      --  Set true if this is the public version of GNAT
 
    begin
       --  Override Ada_Bind_File and Bind_Main_Program for Java since
@@ -1711,12 +1705,6 @@ package body Bindgen is
          end if;
       end loop;
 
-      --  Get the time stamp of the former bind for public version warning
-
-      if Public_Version then
-         Record_Time_From_Last_Bind;
-      end if;
-
       --  Generate output file in appropriate language
 
       if Ada_Bind_File then
@@ -1725,12 +1713,6 @@ package body Bindgen is
          Gen_Output_File_C (Filename);
       end if;
 
-      --  Periodically issue a warning when the public version is used on
-      --  big projects
-
-      if Public_Version then
-         Public_Version_Warning;
-      end if;
    end Gen_Output_File;
 
    -------------------------
@@ -2728,74 +2710,6 @@ package body Bindgen is
    end Move_Linker_Option;
 
    ----------------------------
-   -- Public_Version_Warning --
-   ----------------------------
-
-   procedure Public_Version_Warning is
-
-      Time : Int := Time_From_Last_Bind;
-
-      --  Constants to help defining periods
-
-      Hour : constant := 60;
-      Day  : constant := 24 * Hour;
-
-      Never : constant := Integer'Last;
-      --  Special value indicating no warnings should be given
-
-      --  Constants defining when the warning is issued. Programs with more
-      --  than Large Units will issue a warning every Period_Large amount of
-      --  time. Smaller programs will generate a warning every Period_Small
-      --  amount of time.
-
-      Large : constant := 20;
-      --  Threshold for considering a program small or large
-
-      Period_Large : constant := Day;
-      --  Periodic warning time for large programs
-
-      Period_Small : constant := Never;
-      --  Periodic warning time for small programs
-
-      Nb_Unit : Int;
-
-   begin
-      --  Compute the number of units that are not GNAT internal files
-
-      Nb_Unit := 0;
-      for A in ALIs.First .. ALIs.Last loop
-         if not Is_Internal_File_Name (ALIs.Table (A).Sfile) then
-            Nb_Unit := Nb_Unit + 1;
-         end if;
-      end loop;
-
-      --  Do not emit the message if the last message was emitted in the
-      --  specified period taking into account the number of units.
-
-      if Nb_Unit < Large and then Time <= Period_Small then
-         return;
-
-      elsif Time <= Period_Large then
-         return;
-      end if;
-
-      Write_Eol;
-      Write_Str ("IMPORTANT NOTICE:");
-      Write_Eol;
-      Write_Str ("    This version of GNAT is unsupported"
-        &                        " and comes with absolutely no warranty.");
-      Write_Eol;
-      Write_Str ("    If you intend to evaluate or use GNAT for building "
-        &                                       "commercial applications,");
-      Write_Eol;
-      Write_Str ("    please consult http://www.gnat.com/ for information");
-      Write_Eol;
-      Write_Str ("    on the GNAT Professional product line.");
-      Write_Eol;
-      Write_Eol;
-   end Public_Version_Warning;
-
-   ----------------------------
    -- Resolve_Binder_Options --
    ----------------------------
 
diff --git a/gcc/ada/comperr.adb b/gcc/ada/comperr.adb
index 8d3eb51..71368e6 100644
--- a/gcc/ada/comperr.adb
+++ b/gcc/ada/comperr.adb
@@ -7,7 +7,7 @@
 --                                 B o d y                                  --
 --                                                                          --
 --                                                                          --
---          Copyright (C) 1992-2001 Free Software Foundation, Inc.          --
+--          Copyright (C) 1992-2002 Free Software Foundation, Inc.          --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -78,14 +78,7 @@ package body Comperr is
       --  The procedures below output a "bug box" with information about
       --  the cause of the compiler abort and about the preferred method
       --  of reporting bugs. The default is a bug box appropriate for
-      --  the FSF version of GNAT, but there are specializations for
-      --  the GNATPRO and Public releases by Ada Core Technologies.
-
-      Public_Version  : constant Boolean := Gnat_Version_Type = "PUBLIC ";
-      --  Set True for the public version of GNAT
-
-      GNATPRO_Version : constant Boolean := Gnat_Version_Type = "GNATPRO";
-      --  Set True for the GNATPRO version of GNAT
+      --  the FSF version of GNAT.
 
       procedure End_Line;
       --  Add blanks up to column 76, and then a final vertical bar
@@ -265,31 +258,11 @@ package body Comperr is
             --  Otherwise we use the standard fixed text
 
             else
-               if Public_Version or GNATPRO_Version then
-                  Write_Str
-                    ("| Please submit bug report by email " &
-                     "to report@gnat.com.");
-                  End_Line;
-
-               else
-                  Write_Str
-                    ("| Please submit bug report by email " &
-                    "to gcc-bugs@gcc.gnu.org.");
-                  End_Line;
-               end if;
-
                Write_Str
-                 ("| Use a subject line meaningful to you" &
-                  " and us to track the bug.");
+                 ("| Please submit a bug report; see" &
+                 " http://gcc.gnu.org/bugs.html.");
                End_Line;
 
-               if GNATPRO_Version then
-                  Write_Str
-                    ("| (include your customer number #nnn " &
-                     "in the subject line).");
-                  End_Line;
-               end if;
-
                Write_Str
                  ("| Include the entire contents of this bug " &
                   "box in the report.");
@@ -305,30 +278,9 @@ package body Comperr is
                End_Line;
 
                Write_Str
-                 ("| (concatenated together with no headers between files).");
+                 ("| concatenated together with no headers between files.");
                End_Line;
 
-               if not GNATPRO_Version then
-                  Write_Str
-                    ("| (use plain ASCII or MIME attachment).");
-                  End_Line;
-
-                  Write_Str
-                    ("| See gnatinfo.txt for full info on procedure " &
-                     "for submitting bugs.");
-                  End_Line;
-
-               else
-                  Write_Str
-                    ("| (use plain ASCII or MIME attachment, or FTP "
-                     & "to your customer directory).");
-                  End_Line;
-
-                  Write_Str
-                    ("| See README.GNATPRO for full info on procedure " &
-                     "for submitting bugs.");
-                  End_Line;
-               end if;
             end if;
          end;
 
diff --git a/gcc/ada/comperr.ads b/gcc/ada/comperr.ads
index ede0e27..e235f01 100644
--- a/gcc/ada/comperr.ads
+++ b/gcc/ada/comperr.ads
@@ -7,7 +7,7 @@
 --                                 S p e c                                  --
 --                                                                          --
 --                                                                          --
---          Copyright (C) 1992-2000 Free Software Foundation, Inc.          --
+--          Copyright (C) 1992-2002 Free Software Foundation, Inc.          --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -55,30 +55,13 @@ package Comperr is
    --  When comperr generates the "bug box". The first two lines contain
    --  information on the version number, type of abort, and source location.
 
-   --  Normally the remaining text is one of the following two forms
-   --  depending on the version number (p identifies public versions):
+   --  Normally the remaining text is of the following form:
 
-   --    Please submit bug report by email to report@gnat.com.
-   --    Use a subject line meaningful to you and us to track the bug.
-   --    (include your customer number #nnn in the subject line).
+   --    Please submit a bug report; see http://gcc.gnu.org/bugs.html.
    --    Include the entire contents of this bug box in the report.
    --    Include the exact gcc or gnatmake command that you entered.
    --    Also include sources listed below in gnatchop format
-   --    (concatenated together with no headers between files).
-   --    (use plain ASCII or MIME attachment,
-   --    or FTP to your customer directory).
-   --    See README.GNATPRO for full info on procedure for submitting bugs.
-
-   --  or (public version case)
-
-   --    Please submit bug report by email to report@gnat.com.
-   --    Use a subject line meaningful to you and us to track the bug.
-   --    (include your customer number #nnn in the subject line).
-   --    Include the entire contents of this bug box in the report.
-   --    Include the exact gcc or gnatmake command that you entered.
-   --    Also include sources listed below in gnatchop format
-   --    (concatenated together with no headers between files).
-   --    See gnatinfo.txt for full info on procedure for submitting bugs.
+   --    concatenated together with no headers between files.
 
    --  However, an alternative mechanism exists for easily substituting
    --  different text for this message. Compiler_Abort checks for the
diff --git a/gcc/ada/gnatvsn.ads b/gcc/ada/gnatvsn.ads
index d82b79a..b15c10c 100644
--- a/gcc/ada/gnatvsn.ads
+++ b/gcc/ada/gnatvsn.ads
@@ -53,20 +53,6 @@ package Gnatvsn is
    --       and the bug box generated by Comperr will give information on
    --       how to report bugs and list the "no warranty" information.
    --
-   --    "GNATPRO"
-   --       GNAT Professional version. This version of GNAT is supported
-   --       by Ada Core Technologies. The binder will not output the
-   --       usual "no warranty" messages, and the bug box generated by
-   --       package Comperr will give instructions on bug submission
-   --       that include references to customer number, ftp site etc.
-   --
-   --    "PUBLIC "
-   --       GNAT Public version. This is a public version of GNAT, released
-   --       by Ada Core Technologies and intended for educational use.
-   --       The binder will output informational messages, and the bug box
-   --       generated by the package Comperr will give appropriate bug
-   --       submission instructions that do not reference customer number etc.
-   --
    --  These are the only allowable settings for this string
 
    Ver_Len_Max : constant := 32;