From b7469acf1c7f70bebd703bb25120f18e509f90f3 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Fri, 5 Jul 2019 07:03:39 +0000 Subject: [PATCH] [Ada] GNAT UGN: refresh doc on installing from the cmd line on Windows 2019-07-05 Arnaud Charlet gcc/ada/ * doc/gnat_ugn/platform_specific_information.rst: Refresh doc on installing from the command line on Windows. Remove obsolete part. * gnat_ugn.texi: Regenerate. From-SVN: r273126 --- gcc/ada/ChangeLog | 7 +++++ .../platform_specific_information.rst | 30 ++++--------------- gcc/ada/gnat_ugn.texi | 3 -- 3 files changed, 13 insertions(+), 27 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index eb040231d95..002d535c450 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2019-07-05 Arnaud Charlet + + * doc/gnat_ugn/platform_specific_information.rst: Refresh doc on + installing from the command line on Windows. Remove obsolete + part. + * gnat_ugn.texi: Regenerate. + 2019-07-05 Vasiliy Fofanov * libgnat/a-wichha.ads (Is_Alphanumeric): Replace comment with diff --git a/gcc/ada/doc/gnat_ugn/platform_specific_information.rst b/gcc/ada/doc/gnat_ugn/platform_specific_information.rst index 53f4d98d74f..13993b86ad1 100644 --- a/gcc/ada/doc/gnat_ugn/platform_specific_information.rst +++ b/gcc/ada/doc/gnat_ugn/platform_specific_information.rst @@ -260,7 +260,7 @@ This section describes topics that are specific to the Microsoft Windows platforms. -.. only:: PRO or GPL +.. only:: PRO .. rubric:: Installing from the Command Line @@ -273,32 +273,15 @@ platforms. line you should pass parameter :switch:`/S` (and, optionally, :switch:`/D=`) as command-line arguments. -.. only:: PRO - - For example, for an unattended installation of - GNAT 7.0.2 into the default directory - ``C:\\GNATPRO\\7.0.2`` you would run: - - :: - - gnatpro-7.0.2-i686-pc-mingw32-bin.exe /S - - To install into a custom directory, say, ``C:\\TOOLS\\GNATPRO\\7.0.2``: - - :: - - gnatpro-7.0.2-i686-pc-mingw32-bin /S /D=C:\TOOLS\GNATPRO\7.0.2 - -.. only:: GPL - For example, for an unattended installation of - GNAT 2012 into ``C:\\GNAT\\2012``: + GNAT 19.2 into the default directory :file:`C:\\GNATPRO\\19.2` you + would run:: - :: + gnatpro-19.2-x86-windows-bin /S - gnat-gpl-2012-i686-pc-mingw32-bin /S /D=C:\GNAT\2012 + To install into a custom directory, say, :file:`C:\\TOOLS\\GNATPRO\\19.2`:: -.. only:: PRO or GPL + gnatpro-19.2-x86-windows-bin /S /D=C:\TOOLS\GNATPRO\19.2 You can use the same syntax for all installers. @@ -306,7 +289,6 @@ platforms. associations, so such activities need to be done by hand. - .. _Using_GNAT_on_Windows: Using GNAT on Windows diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi index 8551a17bd85..5ace5cfe97e 100644 --- a/gcc/ada/gnat_ugn.texi +++ b/gcc/ada/gnat_ugn.texi @@ -23901,9 +23901,6 @@ This section describes topics that are specific to the Microsoft Windows platforms. - - - @menu * Using GNAT on Windows:: * Using a network installation of GNAT:: -- 2.30.2