Commit 31ea7763 authored by yoogx's avatar yoogx
Browse files

* Handle whitespace in Ocarina installation directory when

          generating makefile.

          For issue OpenAADL/polyorb-hi-c#1
parent a2a41006
...@@ -1395,9 +1395,9 @@ package body Ocarina.Backends.Build_Utils is ...@@ -1395,9 +1395,9 @@ package body Ocarina.Backends.Build_Utils is
if Is_Directory (Get_Name_String (Dir_Name)) then if Is_Directory (Get_Name_String (Dir_Name)) then
-- We create a makefile iff. the current system is the -- We create a makefile iff. the current system is the
-- root system. In the case of ther system, e.g. case -- root system. In the case of other systems,
-- of a deep hierarchy with systems inside systems, no -- e.g. case of a deep hierarchy with systems inside
-- source has been generated. -- systems, no source has been generated.
Enter_Directory (Dir_Name); Enter_Directory (Dir_Name);
...@@ -1602,9 +1602,9 @@ package body Ocarina.Backends.Build_Utils is ...@@ -1602,9 +1602,9 @@ package body Ocarina.Backends.Build_Utils is
PID : Unsigned_Long_Long := 0; PID : Unsigned_Long_Long := 0;
begin begin
-- The following part is very specific to PolyORB-HI-C and especially -- The following part is very specific to PolyORB-HI-C and especially
-- to the code generator for Xtratum. It creates a Makefile to make -- to the code generator for Xtratum. It creates a Makefile to make
-- the final Makefile that integrates all partitions together. -- the final Makefile that integrates all partitions together.
if Get_Current_Backend_Kind /= PolyORB_HI_C then if Get_Current_Backend_Kind /= PolyORB_HI_C then
return; return;
...@@ -1649,7 +1649,10 @@ package body Ocarina.Backends.Build_Utils is ...@@ -1649,7 +1649,10 @@ package body Ocarina.Backends.Build_Utils is
Write_Line ("###################################################"); Write_Line ("###################################################");
Write_Eol; Write_Eol;
Write_Line ("RUNTIME_PATH=" & Get_Runtime_Path ("polyorb-hi-c")); -- The following syntax esapces whitespace in the path
Write_Line ("RUNTIME_PATH=$(shell echo """
& Get_Runtime_Path ("polyorb-hi-c")
& """ | sed 's/ /\\ /g')");
Write_Eol; Write_Eol;
......
...@@ -290,7 +290,10 @@ package body Ocarina.Backends.PO_HI_C is ...@@ -290,7 +290,10 @@ package body Ocarina.Backends.PO_HI_C is
Write_Eol; Write_Eol;
end if; end if;
Write_Line ("RUNTIME_PATH=" & Get_Runtime_Path ("polyorb-hi-c")); -- The following syntax esapces whitespace in the path
Write_Line ("RUNTIME_PATH=$(shell echo """
& Get_Runtime_Path ("polyorb-hi-c")
& """ | sed 's/ /\\ /g')");
Write_Str ("USER_SOURCES_DIRS="); Write_Str ("USER_SOURCES_DIRS=");
if Length (User_Source_Dirs) > 0 then if Length (User_Source_Dirs) > 0 then
......
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