From bf3a267775b5a69a11ba610cce31d4ca1b98df2c Mon Sep 17 00:00:00 2001 From: Thanassis Tsiodras Date: Sun, 30 Apr 2017 10:56:06 +0200 Subject: [PATCH] Fix target arch and hardcoded PATHs in compilation flags. --- Demo_ExternalLib/DeploymentView.aadl | 2 +- Demo_ExternalLib/InterfaceView.aadl | 4 ++-- Demo_ExternalLib/build-script.sh | 9 +++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Demo_ExternalLib/DeploymentView.aadl b/Demo_ExternalLib/DeploymentView.aadl index f094f64..dac9475 100644 --- a/Demo_ExternalLib/DeploymentView.aadl +++ b/Demo_ExternalLib/DeploymentView.aadl @@ -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 diff --git a/Demo_ExternalLib/InterfaceView.aadl b/Demo_ExternalLib/InterfaceView.aadl index 697ca09..baeacbe 100644 --- a/Demo_ExternalLib/InterfaceView.aadl +++ b/Demo_ExternalLib/InterfaceView.aadl @@ -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; diff --git a/Demo_ExternalLib/build-script.sh b/Demo_ExternalLib/build-script.sh index 987ff65..611fc2d 100755 --- a/Demo_ExternalLib/build-script.sh +++ b/Demo_ExternalLib/build-script.sh @@ -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 \ -- GitLab