From 884ab5c071c405b6794c98ad77bf96451ef5090c Mon Sep 17 00:00:00 2001 From: Daniela Genius <genius@debussy.soc.lip6.fr> Date: Thu, 16 Feb 2017 12:30:24 +0100 Subject: [PATCH] modifications dans config.xml et Makefile.forsoclib pour faire fonctionner TTool "restructure" --- MPSoC/Makefile.forsoclib | 5 ++++- bin/config.xml | 4 ++-- ttool.exe | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/MPSoC/Makefile.forsoclib b/MPSoC/Makefile.forsoclib index ff16e54661..60cb76d277 100755 --- a/MPSoC/Makefile.forsoclib +++ b/MPSoC/Makefile.forsoclib @@ -16,7 +16,10 @@ export PATH updateruntime: cp src/*.c mutekh/libavatar/ cp src/*.h mutekh/libavatar/include/ -# cp src/Makefile mutekh/libavatar/ + cp mutekh/libmwmr/*.c mutekh/examples/avatar + cp mutekh/libmwmr/*.c mutekh/libavatar + cp mutekh/libmwmr/include/mwmr/mwmr.h mutekh/examples/avatar + cp mutekh/libmwmr/include/mwmr/mwmr.h mutekh/libavatar updategeneratedcode: cp src/defs.h mutekh/examples/avatar diff --git a/bin/config.xml b/bin/config.xml index bbae106e0e..f64ad6ae86 100755 --- a/bin/config.xml +++ b/bin/config.xml @@ -48,7 +48,7 @@ <ProVerifVerifierHost data="localhost" /> <AVATARExecutableCodeDirectory data="../executablecode/" /> <AVATARMPSoCCodeDirectory data="../MPSoC/" /> -<AVATARMPSoCCompileCommand data="make -C ../MPSoC updategeneratedcode compilesoclib" /> +<AVATARMPSoCCompileCommand data="make -C ../MPSoC updateruntime updategeneratedcode compilesoclib" /> <AVATARExecutableCodeHost data="localhost"/> <AVATARExecutableCodeCompileCommand data="make -C ../executablecode" /> <AVATARExecutableCodeExecuteCommand data="../executablecode/run.x" /> @@ -63,7 +63,7 @@ <ExternalCommand2Host data="localhost"/> <ExternalCommand2 data="/packages/uppaal(4.0.11/uppaal ../uppaal/spec.xml"/> -<LastOpenFile data="/users/enseig/genius/modeling-dg/miniAsynchronousDeploy2DD.xml"/> +<LastOpenFile data="/users/enseig/genius/modeling-dg/miniAsynchronousDeploy.xml"/> diff --git a/ttool.exe b/ttool.exe index 6379af8f6a..8fb3d730f7 100755 --- a/ttool.exe +++ b/ttool.exe @@ -2,6 +2,6 @@ java -version cd bin; -java -Xmx1024m -Djavax.net.ssl.trustStore=ServerKeyStore -Djavax.net.ssl.trustStorePassword=123456 -jar ttool.jar -config config-daniela.xml -experimental -debug -avatar -uppaal -launcher +java -Xmx1024m -Djavax.net.ssl.trustStore=ServerKeyStore -Djavax.net.ssl.trustStorePassword=123456 -jar ttool.jar -config config.xml -experimental -debug -avatar -uppaal -launcher -- GitLab