modifications dans config.xml et Makefile.forsoclib pour faire fonctionner TTool "restructure"

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

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"/>
 
 
 

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