This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
ada patch: Correct bug box, remove ACT-specific references (Take 2)
- From: Nathanael Nerode <neroden at twcny dot rr dot com>
- To: gcc-patches at gcc dot gnu dot org
- Cc: bosch at gnat dot com
- Date: Thu, 14 Nov 2002 13:20:03 -0500
- Subject: ada patch: Correct bug box, remove ACT-specific references (Take 2)
Second try.
* 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.
Index: bindgen.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/bindgen.adb,v
retrieving revision 1.8
diff -c -3 -r1.8 bindgen.adb
*** bindgen.adb 23 Oct 2002 07:33:22 -0000 1.8
--- bindgen.adb 14 Nov 2002 18:16:13 -0000
***************
*** 159,168 ****
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.
--- 159,164 ----
***************
*** 1682,1689 ****
---------------------
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
--- 1678,1683 ----
***************
*** 1711,1722 ****
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
--- 1705,1710 ----
***************
*** 1725,1736 ****
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;
-------------------------
--- 1713,1718 ----
***************
*** 2726,2799 ****
begin
Linker_Options.Table (To) := Linker_Options.Table (From);
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 --
--- 2708,2713 ----
Index: comperr.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/comperr.adb,v
retrieving revision 1.6
diff -c -3 -r1.6 comperr.adb
*** comperr.adb 23 Oct 2002 07:33:22 -0000 1.6
--- comperr.adb 14 Nov 2002 18:16:13 -0000
***************
*** 7,13 ****
-- B o d y --
-- --
-- --
! -- Copyright (C) 1992-2001 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- --
--- 7,13 ----
-- B o d y --
-- --
-- --
! -- 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,91 ****
-- 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
procedure End_Line;
-- Add blanks up to column 76, and then a final vertical bar
--- 78,84 ----
-- 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.
procedure End_Line;
-- Add blanks up to column 76, and then a final vertical bar
***************
*** 265,295 ****
-- 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.");
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.");
--- 258,268 ----
-- Otherwise we use the standard fixed text
else
Write_Str
! ("| Please submit a bug report; see" &
! " http://gcc.gnu.org/bugs.html.";);
End_Line;
Write_Str
("| Include the entire contents of this bug " &
"box in the report.");
***************
*** 305,334 ****
End_Line;
Write_Str
! ("| (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;
--- 278,286 ----
End_Line;
Write_Str
! ("| concatenated together with no headers between files.");
End_Line;
end if;
end;
Index: comperr.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/comperr.ads,v
retrieving revision 1.3
diff -c -3 -r1.3 comperr.ads
*** comperr.ads 23 Oct 2002 07:33:22 -0000 1.3
--- comperr.ads 14 Nov 2002 18:16:13 -0000
***************
*** 7,13 ****
-- S p e c --
-- --
-- --
! -- Copyright (C) 1992-2000 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- --
--- 7,13 ----
-- S p e c --
-- --
-- --
! -- 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,84 ****
-- 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):
! -- 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).
! -- (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.
-- However, an alternative mechanism exists for easily substituting
-- different text for this message. Compiler_Abort checks for the
--- 55,67 ----
-- 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 of the following form:
! -- 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.
-- However, an alternative mechanism exists for easily substituting
-- different text for this message. Compiler_Abort checks for the
Index: gnatvsn.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/gnatvsn.ads,v
retrieving revision 1.127
diff -c -3 -r1.127 gnatvsn.ads
*** gnatvsn.ads 23 Oct 2002 07:33:25 -0000 1.127
--- gnatvsn.ads 14 Nov 2002 18:16:14 -0000
***************
*** 53,72 ****
-- 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;
--- 53,58 ----