Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
regression-suites
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
TASTE
regression-suites
Commits
bf3a2677
Commit
bf3a2677
authored
Apr 30, 2017
by
Thanassis Tsiodras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix target arch and hardcoded PATHs in compilation flags.
parent
0d01ff6e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
Demo_ExternalLib/DeploymentView.aadl
Demo_ExternalLib/DeploymentView.aadl
+1
-1
Demo_ExternalLib/InterfaceView.aadl
Demo_ExternalLib/InterfaceView.aadl
+2
-2
Demo_ExternalLib/build-script.sh
Demo_ExternalLib/build-script.sh
+9
-0
No files found.
Demo_ExternalLib/DeploymentView.aadl
View file @
bf3a2677
...
...
@@ -41,7 +41,7 @@ SUBCOMPONENTS
Taste::coordinates => "1078 892 2282 1498";
Deployment::Port_Number => 0;
};
x86_linux32 : PROCESSOR ocarina_processors_x86::x86.
native
{
x86_linux32 : PROCESSOR ocarina_processors_x86::x86.
linux32
{
Taste::coordinates => "927 719 2433 1584";
};
PROPERTIES
...
...
Demo_ExternalLib/InterfaceView.aadl
View file @
bf3a2677
...
...
@@ -45,10 +45,10 @@ END Function1;
SYSTEM IMPLEMENTATION Function1.others
SUBCOMPONENTS
flagsToCompileWith : DATA DataView::TASTE_Directive {
Taste::FS_Default_Value => "compiler-option:""-I
~/tool-src/testSuites/Demo_ExternalLib
/contrib/headers/""";
Taste::FS_Default_Value => "compiler-option:""-I
$PRJ_FOLDER
/contrib/headers/""";
};
flagsToLinkWith : DATA DataView::TASTE_Directive {
Taste::FS_Default_Value => "linker-option:""-L
~/tool-src/testSuites/Demo_ExternalLib
/contrib/lib/ -lsomelib""";
Taste::FS_Default_Value => "linker-option:""-L
$PRJ_FOLDER
/contrib/lib/ -lsomelib""";
};
PI1_impl : SUBPROGRAM interfaceview::FV::Function1::PI_PI1.others {
Compute_Execution_Time => 0 ms .. 0 ms;
...
...
Demo_ExternalLib/build-script.sh
View file @
bf3a2677
...
...
@@ -46,6 +46,15 @@ then
else
OUTPUTDIR
=
binary
fi
# This is the env var used to specify the link folder base
# inside InterfaceView.aadl:
#
# Taste::FS_Default_Value => "linker-option:""-L $PRJ_FOLDER/contrib/lib/ -lsomelib""";
#
export
PRJ_FOLDER
=
$(
pwd
)
assert-builder-ocarina.py
\
--fast
\
--debug
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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