Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
Ocarina
Commits
31ea7763
Commit
31ea7763
authored
Sep 21, 2016
by
yoogx
Browse files
* Handle whitespace in Ocarina installation directory when
generating makefile. For issue OpenAADL/polyorb-hi-c#1
parent
a2a41006
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/backends/ocarina-backends-build_utils.adb
View file @
31ea7763
...
...
@@ -1395,9 +1395,9 @@ package body Ocarina.Backends.Build_Utils is
if
Is_Directory
(
Get_Name_String
(
Dir_Name
))
then
-- We create a makefile iff. the current system is the
-- root system. In the case of ther system,
e.g. case
-- of a deep hierarchy with systems inside
systems, no
-- source has been generated.
-- root system. In the case of
o
ther system
s
,
--
e.g. case
of a deep hierarchy with systems inside
--
systems, no
source has been generated.
Enter_Directory
(
Dir_Name
);
...
...
@@ -1602,9 +1602,9 @@ package body Ocarina.Backends.Build_Utils is
PID
:
Unsigned_Long_Long
:=
0
;
begin
-- The following part is very specific to PolyORB-HI-C and especially
-- to the code generator for Xtratum. It creates a Makefile to make
-- the final Makefile that integrates all partitions together.
-- The following part is very specific to PolyORB-HI-C and especially
-- to the code generator for Xtratum. It creates a Makefile to make
-- the final Makefile that integrates all partitions together.
if
Get_Current_Backend_Kind
/=
PolyORB_HI_C
then
return
;
...
...
@@ -1649,7 +1649,10 @@ package body Ocarina.Backends.Build_Utils is
Write_Line
(
"###################################################"
);
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
;
...
...
src/backends/ocarina-backends-po_hi_c.adb
View file @
31ea7763
...
...
@@ -290,7 +290,10 @@ package body Ocarina.Backends.PO_HI_C is
Write_Eol
;
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="
);
if
Length
(
User_Source_Dirs
)
>
0
then
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment