[
Note: the previous related change was rejected due to a too large
patch file attached. The mail was:
This is another step in removing VMS code, and also a step in converting the
documentation to the rest/sphinx format.
The xgnatugn preprocessing step will also soon be removed.
2014-08-01 Ben Brosgol <bros...@adacore.com>
* gnat_ugn.texi, projects.texi, xgnatugn.adb: Removed all VMS
conditionalization from gnat_ugn.texi and projects.texi, and updated
(considerably simplified) xgnatugn.adb, to be removed soon.
]
Following up from previous doc clean ups (see above), this change removes the
preprocessing step needed to generate gnat_ugn.info.
Tested on x86_64-pc-linux-gnu, committed on trunk
2014-08-01 Arnaud Charlet <char...@adacore.com>
* ug_words, xgnatugn.adb, gcc-interface/Make-lang.in: Remove
xgnatugn.adb and ug_words.
Index: ug_words
===================================================================
--- ug_words (revision 213263)
+++ ug_words (working copy)
@@ -1,271 +0,0 @@
-b_ ^ B_
-b~ ^ B__
-cc1 ^ CC1
-Cc1 ^ CC1
-emacs ^ EMACS
-Emacs ^ EMACS
-gdb ^ GDB
-Gdb ^ GDB
-gnat1 ^ GNAT1
-Gnat1 ^ GNAT1
-gnatbind ^ GNAT BIND
-Gnatbind ^ GNAT BIND
-gnatcheck ^ GNAT CHECK
-Gnatcheck ^ GNAT CHECK
-gnatchop ^ GNAT CHOP
-Gnatchop ^ GNAT CHOP
-gnatclean ^ GNAT CLEAN
-Gnatclean ^ GNAT CLEAN
-gnatelim ^ GNAT ELIM
-Gnatelim ^ GNAT ELIM
-gnatf ^ GNAT XREF
-Gnatf ^ GNAT XREF
-gnatfind ^ GNAT FIND
-Gnatfind ^ GNAT FIND
-gnatkr ^ GNAT KRUNCH
-Gnatkr ^ GNAT KRUNCH
-gnatlink ^ GNAT LINK
-Gnatlink ^ GNAT LINK
-gnatls ^ GNAT LIST
-Gnatls ^ GNAT LIST
-gnatmake ^ GNAT MAKE
-Gnatmake ^ GNAT MAKE
-gnatmetric ^ GNAT METRIC
-Gnatmetric ^ GNAT METRIC
-gnatname ^ GNAT NAME
-Gnatname ^ GNAT NAME
-gnatpp ^ GNAT PRETTY
-Gnatpp ^ GNAT PRETTY
-gnatprep ^ GNAT PREPROCESS
-Gnatprep ^ GNAT PREPROCESS
-gnatstub ^ GNAT STUB
-Gnatstub ^ GNAT STUB
-gnatxref ^ GNAT XREF
-Gnatxref ^ GNAT XREF
-gcc ^ GNAT COMPILE
-gcc -c ^ GNAT COMPILE
--fno-inline ^ /INLINE=SUPPRESS
--fstack-check ^ /CHECKS=STACK
--fno-strict-aliasing ^ /OPTIMIZE=NO_STRICT_ALIASING
--gnata ^ /CHECKS=ASSERTIONS
--gnatA ^ /NO_GNAT_ADC
--gnatb ^ /REPORT_ERRORS=BRIEF
--gnatB ^ /ASSUME_VALID
--gnatc ^ /NOLOAD
--gnatct ^ /NOLOAD /TREE_OUTPUT
--gnatdc ^ /TRACE_UNITS
--gnatdO ^ /REPORT_ERRORS=IMMEDIATE
--gnatC ^ /COMPRESS_NAMES
--gnatDG ^ /XDEBUG /EXPAND_SOURCEA
--gnatD ^ /XDEBUG
--gnateA ^ /ALIASING_CHECK
--gnatec ^ /CONFIGURATION_PRAGMAS_FILE
--gnated ^ /DISABLE_ATOMIC_SYNCHRONIZATION
--gnateD ^ /SYMBOL_PREPROCESSING
--gnateE ^ /EXTRA_EXCEPTION_INFORMATION
--gnatef ^ /FULL_PATH_IN_BRIEF_MESSAGES
--gnateF ^ /FLOAT_OVERFLOW_CHECK
--gnateG ^ /GENERATE_PROCESSED_SOURCE
--gnatei ^ /MAX_INSTANTIATIONS=
--gnateI ^ /MULTI_UNIT_INDEX=
--gnatel ^ /ELABORATION_INFO_MESSAGES
--gnateL ^ /NOELABORATION_INFO_MESSAGES
--gnatem ^ /MAPPING_FILE
--gnatep ^ /DATA_PREPROCESSING
--gnateP ^ /CATEGORIZATION_WARNINGS
--gnateS ^ /SCO_OUTPUT
--gnatet ^ /WRITE_TARGET_DEPENDENT_INFO
--gnateT ^ /READ_TARGET_DEPENDENT_INFO
--gnateu ^ /IGNORE_UNRECOGNIZED
--gnateV ^ /PARAMETER_VALIDITY_CHECK
--gnateY ^ /IGNORE_STYLE_CHECKS_PRAGMAS
--gnatE ^ /CHECKS=ELABORATION
--gnatf ^ /REPORT_ERRORS=FULL
--gnatF ^ /UPPERCASE_EXTERNALS
--gnatg ^ /STYLE_CHECKS=GNAT
--gnatG ^ /EXPAND_SOURCE
--gnatk ^ /FILE_NAME_MAX_LENGTH
--gnatl ^ /LIST
--gnatL ^ /LONGJMP_SETJMP
--gnatj ^ /JUSTIFY_MESSAGES
--gnatj0 ^ /NO_JUSTIFY_MESSAGES
--gnatjnn ^ /JUSTIFY_MESSAGES=nn
--gnatL ^ /INTERSPERSE_SOURCE
--gnatm ^ /ERROR_LIMIT
--gnatm2 ^ /ERROR_LIMIT=2
--gnatn ^ /INLINE=PRAGMA
--gnatn1 ^ /INLINE=PRAGMA_LEVEL_1
--gnatn2 ^ /INLINE=PRAGMA_LEVEL_2
--gnatN ^ /INLINE=FULL
--gnato ^ /CHECKS=OVERFLOW
--gnato? ^ /OVERFLOW_CHECKS=?
--gnato?? ^ /OVERFLOW_CHECKS=??
--gnatp ^ /CHECKS=SUPPRESS_ALL
--gnat-p ^ /CHECKS=UNSUPPRESS_ALL
--gnatP ^ /POLLING
--gnatR ^ /REPRESENTATION_INFO
--gnatR0 ^ /REPRESENTATION_INFO=NONE
--gnatR1 ^ /REPRESENTATION_INFO=ARRAYS
--gnatR2 ^ /REPRESENTATION_INFO=OBJECTS
--gnatR3 ^ /REPRESENTATION_INFO=SYMBOLIC
--gnatq ^ /TRY_SEMANTICS
--gnatQ ^ /FORCE_ALI
--gnatr ^ /TREAT_RESTRICTIONS_AS_WARNINGS
--gnats ^ /SYNTAX_ONLY
--gnatS ^ /PRINT_STANDARD
--gnatt ^ /TREE_OUTPUT
--gnatu ^ /UNITS_LIST
--gnatU ^ /UNIQUE_ERROR_TAG
--gnatv ^ /REPORT_ERRORS=VERBOSE
--gnatV ^ /VALIDITY_CHECKING
--gnatVa ^ /VALIDITY_CHECKING=ALL
--gnatVc ^ /VALIDITY_CHECKING=COPIES
--gnatVd ^ /VALIDITY_CHECKING=DEFAULT
--gnatVE ^ /VALIDITY_CHECKING=NOCOMPONENTS
--gnatVe ^ /VALIDITY_CHECKING=COMPONENTS
--gnatVD ^ /VALIDITY_CHECKING=NODEFAULT
--gnatVf ^ /VALIDITY_CHECKING=FLOATS
--gnatVi ^ /VALIDITY_CHECKING=IN_PARAMS
--gnatVm ^ /VALIDITY_CHECKING=MOD_PARAMS
--gnatVn ^ /VALIDITY_CHECKING=NONE
--gnatVo ^ /VALIDITY_CHECKING=OPERANDS
--gnatVp ^ /VALIDITY_CHECKING=PARAMETERS
--gnatVr ^ /VALIDITY_CHECKING=RETURNS
--gnatVs ^ /VALIDITY_CHECKING=SUBSCRIPTS
--gnatVt ^ /VALIDITY_CHECKING=TESTS
--gnatw ^ /WARNINGS
--gnatwa ^ /WARNINGS=OPTIONAL
--gnatwA ^ /WARNINGS=NOOPTIONAL
--gnatw.a ^ /WARNINGS=FAILING_ASSERTIONS
--gnatw.A ^ /WARNINGS=NO_FAILING_ASSERTIONS
--gnatwb ^ /WARNINGS=BAD_FIXED_VALUES
--gnatwB ^ /WARNINGS=NO_BAD_FIXED_VALUES
--gnatw.b ^ /WARNINGS=BIASED_REPRESENTATION
--gnatw.B ^ /WARNINGS=NO_BIASED_REPRESENTATION
--gnatwc ^ /WARNINGS=CONDITIONALS
--gnatwC ^ /WARNINGS=NOCONDITIONALS
--gnatw.c ^ /WARNINGS=MISSING_COMPONENT_CLAUSES
--gnatw.C ^ /WARNINGS=NOMISSING_COMPONENT_CLAUSES
--gnatw.d ^ /WARNINGS=TAG_WARNINGS
--gnatw.D ^ /WARNINGS=NOTAG_WARNINGS
--gnatwd ^ /WARNINGS=IMPLICIT_DEREFERENCE
--gnatwD ^ /WARNINGS=NOIMPLICIT_DEREFERENCE
--gnatwe ^ /WARNINGS=ERRORS
--gnatw.e ^ /WARNINGS=EVERY
--gnatwf ^ /WARNINGS=UNREFERENCED_FORMALS
--gnatwF ^ /WARNINGS=NOUNREFERENCED_FORMALS
--gnatwg ^ /WARNINGS=UNRECOGNIZED_PRAGMAS
--gnatwG ^ /WARNINGS=NOUNRECOGNIZED_PRAGMAS
--gnatwh ^ /WARNINGS=HIDING
--gnatwH ^ /WARNINGS=NOHIDING
--gnatw.h ^ /WARNINGS=AVOIDGAPS
--gnatw.H ^ /WARNINGS=NOAVOIDGAPS
--gnatwi ^ /WARNINGS=IMPLEMENTATION
--gnatwI ^ /WARNINGS=NOIMPLEMENTATION
--gnatw.i ^ /WARNINGS=OVERLAPPING_ACTUALS
--gnatw.I ^ /WARNINGS=NOOVERLAPPING_ACTUALS
--gnatwj ^ /WARNINGS=OBSOLESCENT
--gnatwJ ^ /WARNINGS=NOOBSOLESCENT
--gnatwk ^ /WARNINGS=CONSTANT_VARIABLES
--gnatwK ^ /WARNINGS=NOCONSTANT_VARIABLES
--gnatw.k ^ /WARNINGS=STANDARD_REDEFINITION
--gnatw.K ^ /WARNINGS=NOSTANDARD_REDEFINITION
--gnatwl ^ /WARNINGS=ELABORATION
--gnatwL ^ /WARNINGS=NOELABORATION
--gnatwl ^ /WARNINGS=INHERITED_ASPECTS
--gnatwL ^ /WARNINGS=NOINHERITED_ASPECTS
--gnatwm ^ /WARNINGS=MODIFIED_UNREF
--gnatwM ^ /WARNINGS=NOMODIFIED_UNREF
--gnatw.m ^ /WARNINGS=SUSPICIOUS_MODULUES
--gnatw.M ^ /WARNINGS=NOSUSPICIOUS_MODULUES
--gnatwn ^ /WARNINGS=NORMAL
--gnatw.n ^ /WARNINGS=ATOMIC_SYNCHRONIZATION
--gnatw.N ^ /WARNINGS=NOATOMIC_SYNCHRONIZATION
--gnatwo ^ /WARNINGS=OVERLAYS
--gnatwO ^ /WARNINGS=NOOVERLAYS
--gnatw.o ^ /WARNINGS=OUT_PARAM_UNREF
--gnatw.O ^ /WARNINGS=NOOUT_PARAM_UNREF
--gnatwp ^ /WARNINGS=INEFFECTIVE_INLINE
--gnatwP ^ /WARNINGS=NOINEFFECTIVE_INLINE
--gnatw.p ^ /WARNINGS=PARAMETER_ORDER
--gnatw.P ^ /WARNINGS=NO_PARAMETER_ORDER
--gnatw.h ^ /WARNINGS=OVERRIDING_SIZE
--gnatw.H ^ /WARNINGS=NOOVERRIDING_SIZE
--gnatw.k ^ /WARNINGS=STANDARD_REDEFINITION
--gnatw.K ^ /WARNINGS=NOSTANDARD_REDEFINITION
--gnatwq ^ /WARNINGS=MISSING_PARENS
--gnatwQ ^ /WARNINGS=NOMISSING_PARENS
--gnatwr ^ /WARNINGS=REDUNDANT
--gnatwR ^ /WARNINGS=NOREDUNDANT
--gnatws ^ /WARNINGS=SUPPRESS
--gnatw.s ^ /WARNINGS=OVERRIDING_SIZE
--gnatw.S ^ /WARNINGS=NOOVERRIDING_SIZE
--gnatwt ^ /WARNINGS=DELETED_CODE
--gnatwT ^ /WARNINGS=NODELETED_CODE
--gnatw.t ^ /WARNINGS=SUSPICIOUS_CONTRACT
--gnatw.T ^ /WARNINGS=NOSUSPICIOUS_CONTRACT
--gnatwu ^ /WARNINGS=UNUSED
--gnatwU ^ /WARNINGS=NOUNUSED
--gnatw.u ^ /WARNINGS=UNORDERED_ENUMERATIONS
--gnatw.U ^ /WARNINGS=NOUNORDERED_ENUMERATIONS
--gnatwv ^ /WARNINGS=VARIABLES_UNINITIALIZED
--gnatwV ^ /WARNINGS=NOVARIABLES_UNINITIALIZED
--gnatw.v ^ /WARNINGS=REVERSE_BIT_ORDER
--gnatw.V ^ /WARNINGS=NOREVERSE_BIT_ORDER
--gnatww ^ /WARNINGS=LOWBOUND_ASSUMED
--gnatwW ^ /WARNINGS=NOLOWBOUND_ASSUMED
--gnatw.w ^ /WARNINGS=WARNINGS_OFF_PRAGMAS
--gnatw.W ^ /WARNINGS=NOWARNINGS_OFF_PRAGMAS
--gnatwx ^ /WARNINGS=IMPORT_EXPORT_PRAGMAS
--gnatwX ^ /WARNINGS=NOIMPORT_EXPORT_PRAGMAS
--gnatw.x ^ /WARNINGS=LOCAL_RAISE_HANDLING
--gnatw.X ^ /WARNINGS=NOLOCAL_RAISE_HANDLING
--gnatwy ^ /WARNINGS=ADA_COMPATIBILITY
--gnatwY ^ /WARNINGS=NOADA_COMPATIBILITY
--gnatw.y ^ /WARNINGS=WHY_SPEC_NEEDS_BODY
--gnatw.Y ^ /WARNINGS=NOWHY_SPEC_NEEDS_BODY
--gnatwz ^ /WARNINGS=UNCHECKED_CONVERSIONS
--gnatwZ ^ /WARNINGS=NOUNCHECKED_CONVERSIONS
--gnatw.z ^ /WARNINGS=SIZE_ALIGNMENT
--gnatw.Z ^ /WARNINGS=NOSIZE_ALIGNMENT
--gnatW8 ^ /WIDE_CHARACTER_ENCODING=UTF8
--gnatW? ^ /WIDE_CHARACTER_ENCODING=?
--gnaty ^ /STYLE_CHECKS
--gnatyO ^ /STYLE_CHECKS=OVERRIDING_INDICATORS
--gnatyy ^ /STYLE_CHECKS=ALL_BUILTIN
--gnatZ ^ /ZERO_COST_EXCEPTIONS
--gnatzc ^ /DISTRIBUTION_STUBS=CALLER
--gnatzr ^ /DISTRIBUTION_STUBS=RECEIVER
--gnat83 ^ /83
--gnat95 ^ /95
--gnat05 ^ /05
--gnat2005 ^ /2005
--gnat12 ^ /12
--gnat2012 ^ /2012
--gnatx ^ /XREF=SUPPRESS
--gnatX ^ /EXTENSIONS_ALLOWED
---RTS ^ /RUNTIME_SYSTEM
-switch ^ qualifier
-switches ^ qualifiers
-Switch ^ Qualifier
-Switches ^ Qualifiers
-stdout ^ SYS$OUTPUT
-stderr ^ SYS$ERROR
--bargs ^ /BINDER_QUALIFIERS
--cargs ^ /COMPILER_QUALIFIERS
--largs ^ /LINKER_QUALIFIERS
--margs ^ /MAKE_QUALIFIERS
--aIDIR ^ /SOURCE_SEARCH=direc
--aODIR ^ /OBJECT_SEARCH=direc
--IDIR ^ /SEARCH=direc
--nostdinc ^ /NOSTD_INCLUDES
--nostdlib ^ /NOSTD_LIBRARIES
--pFILE ^ /PROJECT=file
--O0 ^ /OPTIMIZE=NONE
--O1 ^ /OPTIMIZE=SOME
--O2 ^ /OPTIMIZE=ALL
--O3 ^ /OPTIMIZE=INLINING
--H32 ^ /32_MALLOC
--H64 ^ /64_MALLOC
--Wall ^ /WARNINGS=ALL_GCC
--Wuninitialized ^ /WARNINGS=UNINITIALIZED
Index: xgnatugn.adb
===================================================================
--- xgnatugn.adb (revision 213427)
+++ xgnatugn.adb (working copy)
@@ -1,55 +0,0 @@
-------------------------------------------------------------------------------
--- --
--- GNAT SYSTEM UTILITIES --
--- --
--- X G N A T U G N --
--- --
--- B o d y --
--- --
--- Copyright (C) 2003-2014, 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- --
--- ware Foundation; either version 3, or (at your option) any later ver- --
--- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
--- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
--- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --
--- for more details. You should have received a copy of the GNU General --
--- Public License distributed with GNAT; see file COPYING3. If not, go to --
--- http://www.gnu.org/licenses for a complete copy of the license. --
--- --
-------------------------------------------------------------------------------
-
--- This is a temporary version whose only purpose is to work with
--- Makefile.gnat6
--- Its main previous purpose (to handle VMS-specific wording in
--- gnat_ugn.texi and projects.texi) is not applicable, since there is
--- no longer a VMS-specific version of the User's Guide.
-
--- The program is invoked as follows:
-
--- xgnatugn <target> <in-file> <word-list> <out-file>
-
--- In this temporary version, the program simply copies <in-file>
--- to <out-file> and ignores the <target> and <word-list> arguments
-
-with Ada.Command_Line; use Ada.Command_Line;
-with Ada.Text_IO; use Ada.Text_IO;
-
-procedure Xgnatugn is
-
- Max_Line_Length : constant := 5000;
- Line : String (1 .. Max_Line_Length);
- Last : Natural;
- File1, File2 : File_Type;
-
-begin
-
- Open (File1, Mode => In_File, Name => Argument (2));
- Create (File2, Mode => Out_File, Name => Argument (4));
-
- while not End_Of_File (File1) loop
- Get_Line (File1, Line, Last);
- Put_Line (File2, Line (1 .. Last));
- end loop;
-end Xgnatugn;
Index: gcc-interface/Make-lang.in
===================================================================
--- gcc-interface/Make-lang.in (revision 213427)
+++ gcc-interface/Make-lang.in (working copy)
@@ -654,26 +654,7 @@
# Generate documentation.
-ada/doctools/xgnatugn$(build_exeext): ada/xgnatugn.adb
- -$(MKDIR) ada/doctools
- $(CP) $^ ada/doctools
- cd ada/doctools && gnatmake -q xgnatugn
-
-# Note that doc/gnat_ugn.texi and doc/projects.texi do not depend on
-# xgnatugn being built so we can distribute a pregenerated doc/gnat_ugn.info
-
-doc/gnat_ugn.texi: $(srcdir)/ada/gnat_ugn.texi $(srcdir)/ada/ug_words \
- doc/projects.texi $(gcc_docdir)/include/gcc-common.texi gcc-vers.texi
- $(MAKE) ada/doctools/xgnatugn$(build_exeext)
- ada/doctools/xgnatugn unw $(srcdir)/ada/gnat_ugn.texi \
- $(srcdir)/ada/ug_words doc/gnat_ugn.texi
-
-doc/projects.texi: $(srcdir)/ada/projects.texi
- $(MAKE) ada/doctools/xgnatugn$(build_exeext)
- ada/doctools/xgnatugn unw $(srcdir)/ada/projects.texi \
- $(srcdir)/ada/ug_words doc/projects.texi
-
-doc/gnat_ugn.info: doc/gnat_ugn.texi \
+doc/gnat_ugn.info: ada/gnat_ugn.texi ada/projects.texi \
$(gcc_docdir)/include/fdl.texi $(gcc_docdir)/include/gcc-common.texi
\
gcc-vers.texi
if [ x$(BUILD_INFO) = xinfo ]; then \
@@ -698,8 +679,7 @@
-I$(srcdir)/ada -o $@ $<; \
else true; fi
-ADA_INFOFILES = doc/gnat_ugn.info doc/gnat_ugn.texi \
- doc/gnat_rm.info doc/gnat-style.info
+ADA_INFOFILES = doc/gnat_ugn.info doc/gnat_rm.info doc/gnat-style.info
ada.info: $(ADA_INFOFILES)
@@ -732,7 +712,8 @@
ada.install-html:
-doc/gnat_ugn.dvi: doc/gnat_ugn.texi $(gcc_docdir)/include/fdl.texi \
+doc/gnat_ugn.dvi: ada/gnat_ugn.texi ada/projects.texi \
+ $(gcc_docdir)/include/fdl.texi \
$(gcc_docdir)/include/gcc-common.texi gcc-vers.texi
$(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $<
@@ -743,7 +724,8 @@
doc/gnat-style.dvi: ada/gnat-style.texi $(gcc_docdir)/include/fdl.texi
$(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $<
-doc/gnat_ugn.pdf: doc/gnat_ugn.texi $(gcc_docdir)/include/fdl.texi \
+doc/gnat_ugn.pdf: ada/gnat_ugn.texi ada/projects.texi \
+ $(gcc_docdir)/include/fdl.texi \
$(gcc_docdir)/include/gcc-common.texi gcc-vers.texi
$(TEXI2PDF) -c -I $(abs_docdir)/include -o $@ $<
