Navigation

Changeset 2646

Timestamp:

04/26/08 15:09:46 (9 months ago)

Author:

maxr

Message:

ada: check directory separator at the end of GELA_INCLUDE_PATH environment
and -I option

Files:

r2645	r2646
16	16	Search_Path : Unbounded_Wide_String;
17	17	Path_Separator : constant Wide_String := (1 => Wide_Character'Val (10));
	18	File_Separator : constant Wide_Character := '/';
18	19
19	20	------------------------
…	…
24	25	use Ada.Strings.Wide_Unbounded;
25	26	begin
26		Search_Path := Search_Path & Path & Path_Separator;
	27	if Path'Length > 0 and then Path (Path'Last) /= File_Separator then
	28	Search_Path := Search_Path & Path & File_Separator & Path_Separator;
	29	else
	30	Search_Path := Search_Path & Path & Path_Separator;
	31	end if;
27	32	end Add_To_Search_Path;
28	33
…	…
47	52	Lib : constant Wide_String := To_Wide_String (Gela_Lib_Path);
48	53	begin
49		Search_Path := W.To_Unbounded_Wide_String (Lib & Path_Separator);
	54	Search_Path := W.Null_Unbounded_Wide_String;
	55	Add_To_Search_Path (Lib);
50	56	end Clear_Search_Path;
51	57
…	…
67	73
68	74	function Gela_Lib_Path return String is
69		~~Separator : constant Character := '/';~~
70		~~Path : constant String := Env;~~
71	75	begin
72		if Path'Length > 0 and then Path (Path'Last) /= Separator then
73		return Path & Separator;
74		else
75		return Env;
76		end if;
	76	return Env;
77	77	end Gela_Lib_Path;
78	78