Commit 1724557a by Geert Bosch Committed by Geert Bosch

xnmake.adb (XNmake): Fix handling of -s/-b options.

	* xnmake.adb (XNmake): Fix handling of -s/-b options.  No longer
	use '/' as switch character, allowing for absolute file names.

From-SVN: r46146
parent 6d2f8887
2001-10-10 Geert Bosch <bosch@gnat.com>
* xnmake.adb (XNmake): Fix handling of -s/-b options. No longer
use '/' as switch character, allowing for absolute file names.
2001-10-09 Joseph S. Myers <jsm28@cam.ac.uk> 2001-10-09 Joseph S. Myers <jsm28@cam.ac.uk>
* 4gintnam.ads, Make-lang.in, Makefile.in, config-lang.in: Update * 4gintnam.ads, Make-lang.in, Makefile.in, config-lang.in: Update
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- $Revision: 1.27 $ -- $Revision$
-- -- -- --
-- Copyright (C) 1992-2001 Free Software Foundation, Inc. -- -- Copyright (C) 1992-2001 Free Software Foundation, Inc. --
-- -- -- --
...@@ -105,7 +105,6 @@ procedure XNmake is ...@@ -105,7 +105,6 @@ procedure XNmake is
GetT_Rev : Pattern := BreakX ('$') & "$Rev" & "ision: " & GetT_Rev : Pattern := BreakX ('$') & "$Rev" & "ision: " &
Break (' ') * Temp_Rev; Break (' ') * Temp_Rev;
Body_Only : Pattern := BreakX (' ') * X & Span (' ') & "-- body only"; Body_Only : Pattern := BreakX (' ') * X & Span (' ') & "-- body only";
Spec_Only : Pattern := BreakX (' ') * X & Span (' ') & "-- spec only"; Spec_Only : Pattern := BreakX (' ') * X & Span (' ') & "-- spec only";
...@@ -208,7 +207,7 @@ procedure XNmake is ...@@ -208,7 +207,7 @@ procedure XNmake is
begin begin
-- Capture our revision (following line updated by RCS) -- Capture our revision (following line updated by RCS)
Match ("$Revision: 1.27 $", "$Rev" & "ision: " & Break (' ') * XNmake_Rev); Match ("$Revision$", "$Rev" & "ision: " & Break (' ') * XNmake_Rev);
Lineno := 0; Lineno := 0;
NWidth := 28; NWidth := 28;
...@@ -219,7 +218,7 @@ begin ...@@ -219,7 +218,7 @@ begin
Arg : constant String := Argument (ArgN); Arg : constant String := Argument (ArgN);
begin begin
if Arg (1) = '/' or else Arg (1) = '-' then if Arg (1) = '-' then
if Arg'Length = 2 if Arg'Length = 2
and then (Arg (2) = 'b' or else Arg (2) = 'B') and then (Arg (2) = 'b' or else Arg (2) = 'B')
then then
...@@ -248,10 +247,10 @@ begin ...@@ -248,10 +247,10 @@ begin
raise Err; raise Err;
elsif Given_File /= Nul then elsif Given_File /= Nul then
if FileS = Nul then if FileB = Nul then
FileS := Given_File; FileS := Given_File;
elsif FileB = Nul then elsif FileS = Nul then
FileB := Given_File; FileB := Given_File;
else else
......
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