diff options
| author | Arnaud Charlet <charlet@adacore.com> | 2015-03-01 10:16:20 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2015-03-01 11:16:20 +0100 |
| commit | 7dff0c749a68341bdeb4e7854fc5e033a987e7e3 (patch) | |
| tree | 5d1b8be5158de1e262ae1744bf36183bf17e4f17 | |
| parent | 4bd5f767e6f29e585f7dc048889baf1ec33357b2 (diff) | |
| download | gcc-7dff0c749a68341bdeb4e7854fc5e033a987e7e3.zip gcc-7dff0c749a68341bdeb4e7854fc5e033a987e7e3.tar.gz gcc-7dff0c749a68341bdeb4e7854fc5e033a987e7e3.tar.bz2 | |
re PR ada/65259 (Failure to build Ada DVI and PDF documentation)
PR ada/65259
* doc/gnat_ugn/gnat_project_manager.rst,
doc/gnat_ugn/platform_specific_information.rst: Remove reference to
image, too troublesome with texi format.
* gnat_ugn.texi: Regenerate.
From-SVN: r221087
| -rw-r--r-- | gcc/ada/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/ada/doc/gnat_ugn/gnat_project_manager.rst | 6 | ||||
| -rw-r--r-- | gcc/ada/doc/gnat_ugn/platform_specific_information.rst | 6 | ||||
| -rw-r--r-- | gcc/ada/gnat_ugn.texi | 89 |
4 files changed, 56 insertions, 54 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 6aaf747..5deda8f 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,12 @@ +2015-03-01 Arnaud Charlet <charlet@adacore.com> + + PR ada/65259 + + * doc/gnat_ugn/gnat_project_manager.rst, + doc/gnat_ugn/platform_specific_information.rst: Remove reference to + image, too troublesome with texi format. + * gnat_ugn.texi: Regenerate. + 2015-02-24 Thomas Schwinge <thomas@codesourcery.com> PR libgomp/64625 diff --git a/gcc/ada/doc/gnat_ugn/gnat_project_manager.rst b/gcc/ada/doc/gnat_ugn/gnat_project_manager.rst index 70d3c28..b4964f6 100644 --- a/gcc/ada/doc/gnat_ugn/gnat_project_manager.rst +++ b/gcc/ada/doc/gnat_ugn/gnat_project_manager.rst @@ -2593,9 +2593,9 @@ The following three attributes can be used only in an aggregate project: the attribute agg1'Project_Path, nor is agg1 influenced by agg2'Project_Path. - This can potentially lead to errors. Consider the following example: + This can potentially lead to errors. Consider the following example:: - .. -- + -- -- +---------------+ +----------------+ -- | Agg1.gpr |-=--includes--=-->| Agg2.gpr | -- | 'project_path| | 'project_path | @@ -2616,8 +2616,6 @@ The following three attributes can be used only in an aggregate project: -- | R.gpr | | R'.gpr | -- +-------+ +---------+ - .. image:: project-manager-figure.png - When looking for p.gpr, both aggregates find the same physical file on the disk. However, it might happen that with their different project paths, both aggregate projects would in fact find a different r.gpr. diff --git a/gcc/ada/doc/gnat_ugn/platform_specific_information.rst b/gcc/ada/doc/gnat_ugn/platform_specific_information.rst index dc3dfec..b31670c 100644 --- a/gcc/ada/doc/gnat_ugn/platform_specific_information.rst +++ b/gcc/ada/doc/gnat_ugn/platform_specific_information.rst @@ -135,11 +135,9 @@ their thread support. The default run-time library (when GNAT is installed) is *rts-native*. This default run time is selected by the means of soft links. -For example on x86-linux: +For example on x86-linux:: - .. image:: rtlibrary-structure.png - -.. -- + -- -- $(target-dir) -- | -- +--- adainclude----------+ diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi index 49740e7..3099556 100644 --- a/gcc/ada/gnat_ugn.texi +++ b/gcc/ada/gnat_ugn.texi @@ -21,7 +21,7 @@ @copying @quotation -GNAT User's Guide for Native Platforms , February 22, 2015 +GNAT User's Guide for Native Platforms , March 01, 2015 AdaCore @@ -19532,28 +19532,28 @@ agg2'Project_Path. This can potentially lead to errors. Consider the following example: -@c -- -@c -- +---------------+ +----------------+ -@c -- | Agg1.gpr |-=--includes--=-->| Agg2.gpr | -@c -- | 'project_path| | 'project_path | -@c -- | | | | -@c -- +---------------+ +----------------+ -@c -- : : -@c -- includes includes -@c -- : : -@c -- v v -@c -- +-------+ +---------+ -@c -- | P.gpr |<---------- withs --------| Q.gpr | -@c -- +-------+---------\ +---------+ -@c -- | | -@c -- withs | -@c -- | | -@c -- v v -@c -- +-------+ +---------+ -@c -- | R.gpr | | R'.gpr | -@c -- +-------+ +---------+ - -@image{project-manager-figure,,,,png} +@example +-- +-- +---------------+ +----------------+ +-- | Agg1.gpr |-=--includes--=-->| Agg2.gpr | +-- | 'project_path| | 'project_path | +-- | | | | +-- +---------------+ +----------------+ +-- : : +-- includes includes +-- : : +-- v v +-- +-------+ +---------+ +-- | P.gpr |<---------- withs --------| Q.gpr | +-- +-------+---------\ +---------+ +-- | | +-- withs | +-- | | +-- v v +-- +-------+ +---------+ +-- | R.gpr | | R'.gpr | +-- +-------+ +---------+ +@end example When looking for p.gpr, both aggregates find the same physical file on the disk. However, it might happen that with their different project @@ -29588,29 +29588,26 @@ The default run-time library (when GNAT is installed) is @emph{rts-native}. This default run time is selected by the means of soft links. For example on x86-linux: -@quotation - -@image{rtlibrary-structure,,,,png} -@end quotation - -@c -- -@c -- $(target-dir) -@c -- | -@c -- +--- adainclude----------+ -@c -- | | -@c -- +--- adalib-----------+ | -@c -- | | | -@c -- +--- rts-native | | -@c -- | | | | -@c -- | +--- adainclude <---+ -@c -- | | | -@c -- | +--- adalib <----+ -@c -- | -@c -- +--- rts-sjlj -@c -- | -@c -- +--- adainclude -@c -- | -@c -- +--- adalib +@example +-- +-- $(target-dir) +-- | +-- +--- adainclude----------+ +-- | | +-- +--- adalib-----------+ | +-- | | | +-- +--- rts-native | | +-- | | | | +-- | +--- adainclude <---+ +-- | | | +-- | +--- adalib <----+ +-- | +-- +--- rts-sjlj +-- | +-- +--- adainclude +-- | +-- +--- adalib +@end example If the @emph{rts-sjlj} library is to be selected on a permanent basis, these soft links can be modified with the following commands: |