Commit 7dff0c74 by Arnaud Charlet Committed by Arnaud Charlet

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
parent 4bd5f767
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> 2015-02-24 Thomas Schwinge <thomas@codesourcery.com>
PR libgomp/64625 PR libgomp/64625
......
...@@ -2593,9 +2593,9 @@ The following three attributes can be used only in an aggregate project: ...@@ -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 the attribute agg1'Project_Path, nor is agg1 influenced by
agg2'Project_Path. 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 | -- | Agg1.gpr |-=--includes--=-->| Agg2.gpr |
-- | 'project_path| | 'project_path | -- | 'project_path| | 'project_path |
...@@ -2616,8 +2616,6 @@ The following three attributes can be used only in an aggregate project: ...@@ -2616,8 +2616,6 @@ The following three attributes can be used only in an aggregate project:
-- | R.gpr | | R'.gpr | -- | R.gpr | | R'.gpr |
-- +-------+ +---------+ -- +-------+ +---------+
.. image:: project-manager-figure.png
When looking for p.gpr, both aggregates find the same physical file on When looking for p.gpr, both aggregates find the same physical file on
the disk. However, it might happen that with their different project the disk. However, it might happen that with their different project
paths, both aggregate projects would in fact find a different r.gpr. paths, both aggregate projects would in fact find a different r.gpr.
......
...@@ -135,11 +135,9 @@ their thread support. ...@@ -135,11 +135,9 @@ their thread support.
The default run-time library (when GNAT is installed) is *rts-native*. The default run-time library (when GNAT is installed) is *rts-native*.
This default run time is selected by the means of soft links. 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) -- $(target-dir)
-- | -- |
-- +--- adainclude----------+ -- +--- adainclude----------+
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
@copying @copying
@quotation @quotation
GNAT User's Guide for Native Platforms , February 22, 2015 GNAT User's Guide for Native Platforms , March 01, 2015
AdaCore AdaCore
...@@ -19532,28 +19532,28 @@ agg2'Project_Path. ...@@ -19532,28 +19532,28 @@ agg2'Project_Path.
This can potentially lead to errors. Consider the following example: This can potentially lead to errors. Consider the following example:
@c -- @example
@c -- +---------------+ +----------------+ --
@c -- | Agg1.gpr |-=--includes--=-->| Agg2.gpr | -- +---------------+ +----------------+
@c -- | 'project_path| | 'project_path | -- | Agg1.gpr |-=--includes--=-->| Agg2.gpr |
@c -- | | | | -- | 'project_path| | 'project_path |
@c -- +---------------+ +----------------+ -- | | | |
@c -- : : -- +---------------+ +----------------+
@c -- includes includes -- : :
@c -- : : -- includes includes
@c -- v v -- : :
@c -- +-------+ +---------+ -- v v
@c -- | P.gpr |<---------- withs --------| Q.gpr | -- +-------+ +---------+
@c -- +-------+---------\ +---------+ -- | P.gpr |<---------- withs --------| Q.gpr |
@c -- | | -- +-------+---------\ +---------+
@c -- withs | -- | |
@c -- | | -- withs |
@c -- v v -- | |
@c -- +-------+ +---------+ -- v v
@c -- | R.gpr | | R'.gpr | -- +-------+ +---------+
@c -- +-------+ +---------+ -- | R.gpr | | R'.gpr |
-- +-------+ +---------+
@image{project-manager-figure,,,,png} @end example
When looking for p.gpr, both aggregates find the same physical file on When looking for p.gpr, both aggregates find the same physical file on
the disk. However, it might happen that with their different project 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}. ...@@ -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. This default run time is selected by the means of soft links.
For example on x86-linux: For example on x86-linux:
@quotation @example
--
@image{rtlibrary-structure,,,,png} -- $(target-dir)
@end quotation -- |
-- +--- adainclude----------+
@c -- -- | |
@c -- $(target-dir) -- +--- adalib-----------+ |
@c -- | -- | | |
@c -- +--- adainclude----------+ -- +--- rts-native | |
@c -- | | -- | | | |
@c -- +--- adalib-----------+ | -- | +--- adainclude <---+
@c -- | | | -- | | |
@c -- +--- rts-native | | -- | +--- adalib <----+
@c -- | | | | -- |
@c -- | +--- adainclude <---+ -- +--- rts-sjlj
@c -- | | | -- |
@c -- | +--- adalib <----+ -- +--- adainclude
@c -- | -- |
@c -- +--- rts-sjlj -- +--- adalib
@c -- | @end example
@c -- +--- adainclude
@c -- |
@c -- +--- adalib
If the @emph{rts-sjlj} library is to be selected on a permanent basis, If the @emph{rts-sjlj} library is to be selected on a permanent basis,
these soft links can be modified with the following commands: these soft links can be modified with the following commands:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment