From 861d5dd084064a6532906578f8be60b84f041b84 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 3 Nov 2013 16:02:19 +0100 Subject: [PATCH] spell out -classpath with all letters as it seems to break on kfreebsd when written only -cp --- doc/doxygen/bindings.doc | 6 +++--- examples/java/async/CMakeLists.txt | 2 +- examples/java/async/async.tesh | 2 +- examples/java/bittorrent/CMakeLists.txt | 2 +- examples/java/bittorrent/bittorrent.tesh | 2 +- examples/java/chord/CMakeLists.txt | 2 +- examples/java/chord/chord.tesh | 2 +- examples/java/cloud/CMakeLists.txt | 2 +- examples/java/cloud/cloud.tesh | 2 +- examples/java/commTime/CMakeLists.txt | 2 +- examples/java/commTime/commtime.tesh | 2 +- examples/java/io/CMakeLists.txt | 2 +- examples/java/kademlia/CMakeLists.txt | 2 +- examples/java/kademlia/kademlia.tesh | 2 +- examples/java/master_slave_bypass/CMakeLists.txt | 2 +- examples/java/master_slave_bypass/bypass.tesh | 2 +- examples/java/master_slave_kill/CMakeLists.txt | 2 +- examples/java/master_slave_kill/kill.tesh | 2 +- examples/java/masterslave/CMakeLists.txt | 2 +- examples/java/masterslave/masterslave.tesh | 2 +- examples/java/migration/CMakeLists.txt | 2 +- examples/java/migration/migration.tesh | 2 +- examples/java/mutualExclusion/CMakeLists.txt | 2 +- examples/java/mutualExclusion/mutualexclusion.tesh | 2 +- examples/java/pingPong/CMakeLists.txt | 2 +- examples/java/pingPong/pingpong.tesh | 2 +- examples/java/priority/CMakeLists.txt | 2 +- examples/java/priority/priority.tesh | 2 +- examples/java/startKillTime/CMakeLists.txt | 2 +- examples/java/startKillTime/startKillTime.tesh | 2 +- examples/java/suspend/CMakeLists.txt | 2 +- examples/java/suspend/suspend.tesh | 2 +- examples/java/tracing/CMakeLists.txt | 2 +- examples/java/tracing/tracingPingPong.tesh | 2 +- examples/scala/master_slave_bypass/CMakeLists.txt | 2 +- examples/scala/master_slave_bypass/bypass.tesh | 2 +- examples/scala/master_slave_kill/CMakeLists.txt | 2 +- examples/scala/master_slave_kill/kill.tesh | 2 +- examples/scala/masterslave/CMakeLists.txt | 2 +- examples/scala/masterslave/masterslave.tesh | 2 +- 40 files changed, 42 insertions(+), 42 deletions(-) diff --git a/doc/doxygen/bindings.doc b/doc/doxygen/bindings.doc index b0e900e6d6..2ad4cd396d 100644 --- a/doc/doxygen/bindings.doc +++ b/doc/doxygen/bindings.doc @@ -93,7 +93,7 @@ Be careful on Mac, this variable is called `DYLD_LIBRARY_PATH` and not $ export SIMGRID_ROOT="$HOME/Install/simgrid/" # change it to the path where you installed the SimGrid library $ export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$SIMGRID_ROOT/lib $ cd examples -$ java -cp .:../simgrid.jar basic/BasicTest platform.xml basic/basicDeployment.xml +$ java -classpath .:../simgrid.jar basic/BasicTest platform.xml basic/basicDeployment.xml ~~~~ If you want to make these settings permanent even after a reboot, you @@ -205,14 +205,14 @@ displayed automatically. ~~~~{.sh} export LD_LIBRARY_PATH=/path/to/simgrid.so:/path/to/libsimgrid-java.so cd examples -$PATH_TO_COROUTINE_JVM/java -cp .:../simgrid.jar masterslave.Masterslave masterslave/ masterslaveDeployment.xml platform.xml +$PATH_TO_COROUTINE_JVM/java -classpath .:../simgrid.jar masterslave.Masterslave masterslave/ masterslaveDeployment.xml platform.xml ~~~~ Note that you may have to adjust the "coro.stacksPerThread" configuration option to run large simulations. The default is 100 and you want to increase it to run more processes. ~~~~{.sh} -$ $PATH_TO_COROUTINE_JVM/java -Dcoro.stacksPerThread=$STACKS_NUMBER -cp .:../simgrid.jar basic/BasicTest platform.xml basic/basicDeployment.xml +$ $PATH_TO_COROUTINE_JVM/java -Dcoro.stacksPerThread=$STACKS_NUMBER -classpath .:../simgrid.jar basic/BasicTest platform.xml basic/basicDeployment.xml ~~~~ If you reach the point where the creation of new simulated processes diff --git a/examples/java/async/CMakeLists.txt b/examples/java/async/CMakeLists.txt index c2e64e8eb7..b150f79d37 100644 --- a/examples/java/async/CMakeLists.txt +++ b/examples/java/async/CMakeLists.txt @@ -14,7 +14,7 @@ if(enable_java) COMMENT "Building ${example}..." OUTPUT ${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} - COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} + COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled diff --git a/examples/java/async/async.tesh b/examples/java/async/async.tesh index 6083344065..72c3ab7a84 100644 --- a/examples/java/async/async.tesh +++ b/examples/java/async/async.tesh @@ -2,7 +2,7 @@ ! output sort ! timeout 30 -$ java -cp ${classpath:=.} async/AsyncTest ${srcdir:=.}/platform.xml ${srcdir:=.}/async/asyncDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ java -classpath ${classpath:=.} async/AsyncTest ${srcdir:=.}/platform.xml ${srcdir:=.}/async/asyncDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (10:async.Slave@Robert) Receiving on 'slave_8' > [ 0.000000] (11:async.Slave@Sirois) Receiving on 'slave_9' > [ 0.000000] (12:async.Slave@Monique) Receiving on 'slave_10' diff --git a/examples/java/bittorrent/CMakeLists.txt b/examples/java/bittorrent/CMakeLists.txt index 23e37732fe..ef9e1ab1b2 100644 --- a/examples/java/bittorrent/CMakeLists.txt +++ b/examples/java/bittorrent/CMakeLists.txt @@ -16,7 +16,7 @@ if(enable_java) COMMENT "Building ${example}..." OUTPUT ${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} - COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} + COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled diff --git a/examples/java/bittorrent/bittorrent.tesh b/examples/java/bittorrent/bittorrent.tesh index 1fa670c5fd..8d74f587dc 100644 --- a/examples/java/bittorrent/bittorrent.tesh +++ b/examples/java/bittorrent/bittorrent.tesh @@ -3,7 +3,7 @@ ! output sort ! timeout 15 -$ java -cp ${classpath:=.} bittorrent/Bittorrent ${srcdir:=.}/platform.xml ${srcdir:=.}/bittorrent/bittorrent.xml +$ java -classpath ${classpath:=.} bittorrent/Bittorrent ${srcdir:=.}/platform.xml ${srcdir:=.}/bittorrent/bittorrent.xml > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up. > [5000.832370] [jmsg/INFO] MSG_main finished; Cleaning up the simulation... > [Boivin:bittorrent.Peer:(2) 0.000000] [jmsg/INFO] Hi, I'm joining the network with id 2 diff --git a/examples/java/chord/CMakeLists.txt b/examples/java/chord/CMakeLists.txt index ddab502534..48b04399e2 100644 --- a/examples/java/chord/CMakeLists.txt +++ b/examples/java/chord/CMakeLists.txt @@ -18,7 +18,7 @@ if(enable_java) COMMENT "Building ${example}..." OUTPUT ${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} - COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} + COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled diff --git a/examples/java/chord/chord.tesh b/examples/java/chord/chord.tesh index 2e1f474d43..dbc5d0ad1c 100644 --- a/examples/java/chord/chord.tesh +++ b/examples/java/chord/chord.tesh @@ -2,7 +2,7 @@ ! output sort -$ java -cp ${classpath:=.} chord/Chord ${srcdir:=.}/platform.xml ${srcdir:=.}/chord/chord.xml +$ java -classpath ${classpath:=.} chord/Chord ${srcdir:=.}/platform.xml ${srcdir:=.}/chord/chord.xml > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up. > [652.540924] [jmsg/INFO] MSG_main finished; Cleaning up the simulation... > [Boivin:chord.Node:(7) 0.000000] [jmsg/INFO] Joining the ring with id 8 knowing node 1 diff --git a/examples/java/cloud/CMakeLists.txt b/examples/java/cloud/CMakeLists.txt index a02cc47ec0..555cc8419c 100644 --- a/examples/java/cloud/CMakeLists.txt +++ b/examples/java/cloud/CMakeLists.txt @@ -13,7 +13,7 @@ if(enable_java) COMMENT "Building ${example}..." OUTPUT ${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} - COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} + COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled diff --git a/examples/java/cloud/cloud.tesh b/examples/java/cloud/cloud.tesh index 1f958c233d..c8c05d1548 100644 --- a/examples/java/cloud/cloud.tesh +++ b/examples/java/cloud/cloud.tesh @@ -2,7 +2,7 @@ ! output sort -$ java -cp ${classpath:=.} cloud/Cloud ${srcdir:=.}/platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ java -classpath ${classpath:=.} cloud/Cloud ${srcdir:=.}/platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (10:Slave 8@Jean_Yves) Receiving on slave_8 > [ 0.000000] (11:Slave 9@Fafard) Receiving on slave_9 > [ 0.000000] (1:Master@Jacquelin) Launched 10 VMs diff --git a/examples/java/commTime/CMakeLists.txt b/examples/java/commTime/CMakeLists.txt index 2ca1a7ab4a..7ff9534431 100644 --- a/examples/java/commTime/CMakeLists.txt +++ b/examples/java/commTime/CMakeLists.txt @@ -13,7 +13,7 @@ if(enable_java) COMMENT "Building ${example}..." OUTPUT ${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} - COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} + COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled diff --git a/examples/java/commTime/commtime.tesh b/examples/java/commTime/commtime.tesh index 1e50976fdf..02fc316e56 100644 --- a/examples/java/commTime/commtime.tesh +++ b/examples/java/commTime/commtime.tesh @@ -3,7 +3,7 @@ ! output sort ! timeout 15 -$ java -cp ${classpath:=.} commTime/CommTimeTest ${srcdir:=.}/platform.xml ${srcdir:=.}/commTime/commTimeDeployment.xml +$ java -classpath ${classpath:=.} commTime/CommTimeTest ${srcdir:=.}/platform.xml ${srcdir:=.}/commTime/commTimeDeployment.xml > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up. > [7016.452828] [jmsg/INFO] MSG_main finished; Cleaning up the simulation... > [Bellemarre:commTime.Slave:(15) 0.000000] [jmsg/INFO] Receiving on 'slave_13' diff --git a/examples/java/io/CMakeLists.txt b/examples/java/io/CMakeLists.txt index fe437f00fd..3f77d90121 100644 --- a/examples/java/io/CMakeLists.txt +++ b/examples/java/io/CMakeLists.txt @@ -11,7 +11,7 @@ if(enable_java) COMMENT "Building ${example}..." OUTPUT ${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} - COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} + COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled diff --git a/examples/java/kademlia/CMakeLists.txt b/examples/java/kademlia/CMakeLists.txt index fbfe46671a..e7807e80b1 100644 --- a/examples/java/kademlia/CMakeLists.txt +++ b/examples/java/kademlia/CMakeLists.txt @@ -21,7 +21,7 @@ if(enable_java) COMMENT "Building ${example}..." OUTPUT ${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} - COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} + COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled diff --git a/examples/java/kademlia/kademlia.tesh b/examples/java/kademlia/kademlia.tesh index c368309adb..6c232c0def 100644 --- a/examples/java/kademlia/kademlia.tesh +++ b/examples/java/kademlia/kademlia.tesh @@ -2,7 +2,7 @@ ! output sort -$ java -cp ${classpath:=.} kademlia/Kademlia ${srcdir:=.}/platform.xml ${srcdir:=.}/kademlia/kademlia.xml +$ java -classpath ${classpath:=.} kademlia/Kademlia ${srcdir:=.}/platform.xml ${srcdir:=.}/kademlia/kademlia.xml > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up. > [900.000000] [jmsg/INFO] MSG_main finished; Cleaning up the simulation... > [Boivin:kademlia.Node:(2) 0.000000] [jmsg/INFO] Hi, I'm going to join the network with the id 1! diff --git a/examples/java/master_slave_bypass/CMakeLists.txt b/examples/java/master_slave_bypass/CMakeLists.txt index 808bb24921..4660c437dc 100644 --- a/examples/java/master_slave_bypass/CMakeLists.txt +++ b/examples/java/master_slave_bypass/CMakeLists.txt @@ -13,7 +13,7 @@ if(enable_java) COMMENT "Building ${example}..." OUTPUT ${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} - COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} + COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled diff --git a/examples/java/master_slave_bypass/bypass.tesh b/examples/java/master_slave_bypass/bypass.tesh index cf1bee4f7c..8e05ea21c2 100644 --- a/examples/java/master_slave_bypass/bypass.tesh +++ b/examples/java/master_slave_bypass/bypass.tesh @@ -2,7 +2,7 @@ ! output sort -$ java -cp ${classpath:=.} master_slave_bypass/MsBypass ${srcdir:=.}/master_slave_bypass/platform.xml +$ java -classpath ${classpath:=.} master_slave_bypass/MsBypass ${srcdir:=.}/master_slave_bypass/platform.xml > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up. > [0.013010] [jmsg/INFO] MSG_main finished; Cleaning up the simulation... > [alice:process2:(2) 0.000000] [jmsg/INFO] Slave Hello! diff --git a/examples/java/master_slave_kill/CMakeLists.txt b/examples/java/master_slave_kill/CMakeLists.txt index 95d4ad87db..6dc692a034 100644 --- a/examples/java/master_slave_kill/CMakeLists.txt +++ b/examples/java/master_slave_kill/CMakeLists.txt @@ -13,7 +13,7 @@ if(enable_java) COMMENT "Building ${example}..." OUTPUT ${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} - COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} + COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled diff --git a/examples/java/master_slave_kill/kill.tesh b/examples/java/master_slave_kill/kill.tesh index f22d582f9e..78868a18c1 100644 --- a/examples/java/master_slave_kill/kill.tesh +++ b/examples/java/master_slave_kill/kill.tesh @@ -2,7 +2,7 @@ ! output sort -$ java -cp ${classpath:=.} master_slave_kill/MsKill ${srcdir:=.}/master_slave_kill/platform.xml +$ java -classpath ${classpath:=.} master_slave_kill/MsKill ${srcdir:=.}/master_slave_kill/platform.xml > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up. > [0.013010] [jmsg/INFO] MSG_main finished; Cleaning up the simulation... > [alice:slave:(2) 0.000000] [jmsg/INFO] Slave Hello! diff --git a/examples/java/masterslave/CMakeLists.txt b/examples/java/masterslave/CMakeLists.txt index cccca32d97..8f83bfc2b1 100644 --- a/examples/java/masterslave/CMakeLists.txt +++ b/examples/java/masterslave/CMakeLists.txt @@ -14,7 +14,7 @@ if(enable_java) COMMENT "Building ${example}..." OUTPUT ${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} - COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} + COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled diff --git a/examples/java/masterslave/masterslave.tesh b/examples/java/masterslave/masterslave.tesh index 77a09b54fe..ee1d2074b8 100644 --- a/examples/java/masterslave/masterslave.tesh +++ b/examples/java/masterslave/masterslave.tesh @@ -2,7 +2,7 @@ ! output sort -$ java -cp ${classpath:=.} masterslave/Masterslave ${srcdir:=.}/platform.xml ${srcdir:=.}/masterslave/masterslaveDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ java -classpath ${classpath:=.} masterslave/Masterslave ${srcdir:=.}/platform.xml ${srcdir:=.}/masterslave/masterslaveDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:masterslave.Master@Jacquelin) Hello! Got 7 slaves and 5 tasks to process > [ 0.000000] (2:masterslave.Forwarder@Jackson) Receiving on 'slave_0' > [ 0.000000] (3:masterslave.Forwarder@Casavant) Receiving on 'slave_1' diff --git a/examples/java/migration/CMakeLists.txt b/examples/java/migration/CMakeLists.txt index 2f372eff93..7bd6bb9cad 100644 --- a/examples/java/migration/CMakeLists.txt +++ b/examples/java/migration/CMakeLists.txt @@ -12,7 +12,7 @@ if(enable_java) COMMENT "Building ${example}..." OUTPUT ${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} - COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} + COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled diff --git a/examples/java/migration/migration.tesh b/examples/java/migration/migration.tesh index 66bd4f5e95..131e9a3493 100644 --- a/examples/java/migration/migration.tesh +++ b/examples/java/migration/migration.tesh @@ -2,7 +2,7 @@ ! output sort -$ java -cp ${classpath:=.} migration/Migration ${srcdir:=.}/platform.xml ${srcdir:=.}/migration/migrationDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ java -classpath ${classpath:=.} migration/Migration ${srcdir:=.}/platform.xml ${srcdir:=.}/migration/migrationDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:migration.Emigrant@Jacquelin) I'll look for a new job on another machine where the grass is greener. > [ 0.000000] (1:migration.Emigrant@Boivin) Yeah, found something to do > [ 1.000000] (2:migration.Policeman@Boivin) Wait a bit before migrating the emigrant. diff --git a/examples/java/mutualExclusion/CMakeLists.txt b/examples/java/mutualExclusion/CMakeLists.txt index b74eecc794..2019a30626 100644 --- a/examples/java/mutualExclusion/CMakeLists.txt +++ b/examples/java/mutualExclusion/CMakeLists.txt @@ -15,7 +15,7 @@ if(enable_java) COMMENT "Building ${example}..." OUTPUT ${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} - COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} + COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled diff --git a/examples/java/mutualExclusion/mutualexclusion.tesh b/examples/java/mutualExclusion/mutualexclusion.tesh index 202b00c488..5446fffae6 100644 --- a/examples/java/mutualExclusion/mutualexclusion.tesh +++ b/examples/java/mutualExclusion/mutualexclusion.tesh @@ -2,7 +2,7 @@ ! output sort -$ java -cp ${classpath:=.} mutualExclusion/MutexCentral ${srcdir:=.}/mutualExclusion/ring3.xml ${srcdir:=.}/mutualExclusion/mutex_centralized_deployment.xml +$ java -classpath ${classpath:=.} mutualExclusion/MutexCentral ${srcdir:=.}/mutualExclusion/ring3.xml ${srcdir:=.}/mutualExclusion/mutex_centralized_deployment.xml > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up. > [0.007806] [jmsg/INFO] MSG_main finished; Cleaning up the simulation... > [Host 0:mutualExclusion.Coordinator:(1) 0.001301] [jmsg/INFO] Got a request from mutualExclusion.Node. Queue empty: grant it diff --git a/examples/java/pingPong/CMakeLists.txt b/examples/java/pingPong/CMakeLists.txt index 7a951e5db1..07e750ae43 100644 --- a/examples/java/pingPong/CMakeLists.txt +++ b/examples/java/pingPong/CMakeLists.txt @@ -13,7 +13,7 @@ if(enable_java) COMMENT "Building ${example}..." OUTPUT ${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} - COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} + COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled diff --git a/examples/java/pingPong/pingpong.tesh b/examples/java/pingPong/pingpong.tesh index a3db44a1b0..ed35110362 100644 --- a/examples/java/pingPong/pingpong.tesh +++ b/examples/java/pingPong/pingpong.tesh @@ -2,7 +2,7 @@ ! output sort -$ java -cp ${classpath:=.} pingPong/PingPongTest ${srcdir:=.}/platform.xml ${srcdir:=.}/pingPong/pingPongDeployment.xml +$ java -classpath ${classpath:=.} pingPong/PingPongTest ${srcdir:=.}/platform.xml ${srcdir:=.}/pingPong/pingPongDeployment.xml > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up. > [1.048882] [jmsg/INFO] MSG_main finished; Cleaning up the simulation... > [Boivin:pingPong.Receiver:(2) 0.000000] [jmsg/INFO] hello! diff --git a/examples/java/priority/CMakeLists.txt b/examples/java/priority/CMakeLists.txt index b897df1cf0..202d0e58e1 100644 --- a/examples/java/priority/CMakeLists.txt +++ b/examples/java/priority/CMakeLists.txt @@ -11,7 +11,7 @@ if(enable_java) COMMENT "Building ${example}..." OUTPUT ${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} - COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} + COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled diff --git a/examples/java/priority/priority.tesh b/examples/java/priority/priority.tesh index 86228972fc..1a0b8adc45 100644 --- a/examples/java/priority/priority.tesh +++ b/examples/java/priority/priority.tesh @@ -2,7 +2,7 @@ ! output sort -$ java -cp ${classpath:=.} priority/Priority ${srcdir:=.}/platform.xml ${srcdir:=.}/priority/priorityDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ java -classpath ${classpath:=.} priority/Priority ${srcdir:=.}/platform.xml ${srcdir:=.}/priority/priorityDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:priority.Test@Fafard) Hello! Running a task of size 7.6296E7 with priority 1.0 > [ 0.000000] (2:priority.Test@Fafard) Hello! Running a task of size 7.6296E7 with priority 2.0 > [ 0.833332] (2:priority.Test@Fafard) Goodbye now! diff --git a/examples/java/startKillTime/CMakeLists.txt b/examples/java/startKillTime/CMakeLists.txt index 97a28eb717..4030159621 100644 --- a/examples/java/startKillTime/CMakeLists.txt +++ b/examples/java/startKillTime/CMakeLists.txt @@ -12,7 +12,7 @@ if(enable_java) COMMENT "Building ${example}..." OUTPUT ${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} - COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} + COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled diff --git a/examples/java/startKillTime/startKillTime.tesh b/examples/java/startKillTime/startKillTime.tesh index 747b724334..be741fd5b1 100644 --- a/examples/java/startKillTime/startKillTime.tesh +++ b/examples/java/startKillTime/startKillTime.tesh @@ -1,5 +1,5 @@ #! tesh -$ java -cp ${classpath:=.} startKillTime/StartKillTime ${srcdir:=.}/platform.xml ${srcdir:=.}/startKillTime/deployment_start_kill.xml +$ java -classpath ${classpath:=.} startKillTime/StartKillTime ${srcdir:=.}/platform.xml ${srcdir:=.}/startKillTime/deployment_start_kill.xml > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up. > [Jacquelin:startKillTime.Master:(1) 0.000000] [jmsg/INFO] Hello! > [Boivin:startKillTime.Slave:(2) 1.000000] [jmsg/INFO] Hello! diff --git a/examples/java/suspend/CMakeLists.txt b/examples/java/suspend/CMakeLists.txt index abf841b11e..42cec94b84 100644 --- a/examples/java/suspend/CMakeLists.txt +++ b/examples/java/suspend/CMakeLists.txt @@ -12,7 +12,7 @@ if(enable_java) COMMENT "Building ${example}..." OUTPUT ${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} - COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} + COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled diff --git a/examples/java/suspend/suspend.tesh b/examples/java/suspend/suspend.tesh index 1bd9dea3f7..897db64832 100644 --- a/examples/java/suspend/suspend.tesh +++ b/examples/java/suspend/suspend.tesh @@ -1,7 +1,7 @@ #! tesh ! output sort -$ java -cp ${classpath:=.} suspend/Suspend ${srcdir:=.}/platform.xml ${srcdir:=.}/suspend/suspendDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ java -classpath ${classpath:=.} suspend/Suspend ${srcdir:=.}/platform.xml ${srcdir:=.}/suspend/suspendDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:suspend.DreamMaster@Jacquelin) Let's create a lazy guy. > [ 0.000000] (1:suspend.DreamMaster@Jacquelin) Let's wait a little bit... > [ 0.000000] (2:Lazy@Jacquelin) Nobody's watching me ? Let's go to sleep. diff --git a/examples/java/tracing/CMakeLists.txt b/examples/java/tracing/CMakeLists.txt index e07314bc57..562f1614dd 100644 --- a/examples/java/tracing/CMakeLists.txt +++ b/examples/java/tracing/CMakeLists.txt @@ -13,7 +13,7 @@ if(enable_java) COMMENT "Building ${example}..." OUTPUT ${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} - COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR} + COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled diff --git a/examples/java/tracing/tracingPingPong.tesh b/examples/java/tracing/tracingPingPong.tesh index 9cb2458d3e..9c7bd25a9b 100644 --- a/examples/java/tracing/tracingPingPong.tesh +++ b/examples/java/tracing/tracingPingPong.tesh @@ -2,7 +2,7 @@ ! output sort -$ java -cp ${classpath:=.} tracing/TracingTest ${srcdir:=.}/platform.xml ${srcdir:=.}/tracing/tracingPingPongDeployment.xml --cfg=tracing:yes --cfg=tracing/filename:simulation.trace --cfg=tracing/platform:yes +$ java -classpath ${classpath:=.} tracing/TracingTest ${srcdir:=.}/platform.xml ${srcdir:=.}/tracing/tracingPingPongDeployment.xml --cfg=tracing:yes --cfg=tracing/filename:simulation.trace --cfg=tracing/platform:yes > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up. > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'simulation.trace' diff --git a/examples/scala/master_slave_bypass/CMakeLists.txt b/examples/scala/master_slave_bypass/CMakeLists.txt index c44c0aa88c..ad451aef53 100644 --- a/examples/scala/master_slave_bypass/CMakeLists.txt +++ b/examples/scala/master_slave_bypass/CMakeLists.txt @@ -13,7 +13,7 @@ if(enable_scala) COMMENT "Building ${example}..." OUTPUT ${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} - COMMAND ${SCALA_COMPILE} -cp ${SIMGRID_JAR} + COMMAND ${SCALA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled diff --git a/examples/scala/master_slave_bypass/bypass.tesh b/examples/scala/master_slave_bypass/bypass.tesh index 6b28603de1..95bfebb531 100644 --- a/examples/scala/master_slave_bypass/bypass.tesh +++ b/examples/scala/master_slave_bypass/bypass.tesh @@ -1,7 +1,7 @@ #! tesh ! output sort -$ java -cp ${classpath:=.} master_slave_bypass/MsBypass ${srcdir:=.}/master_slave_bypass/platform.xml +$ java -classpath ${classpath:=.} master_slave_bypass/MsBypass ${srcdir:=.}/master_slave_bypass/platform.xml > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up. > [0.013010] [jmsg/INFO] MSG_main finished; Cleaning up the simulation... > [alice:process2:(2) 0.000000] [jmsg/INFO] Slave Hello! diff --git a/examples/scala/master_slave_kill/CMakeLists.txt b/examples/scala/master_slave_kill/CMakeLists.txt index bdc19ec66e..ebd2979efd 100644 --- a/examples/scala/master_slave_kill/CMakeLists.txt +++ b/examples/scala/master_slave_kill/CMakeLists.txt @@ -13,7 +13,7 @@ if(enable_scala) COMMENT "Building ${example}..." OUTPUT ${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} - COMMAND ${SCALA_COMPILE} -cp ${SIMGRID_JAR} + COMMAND ${SCALA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled diff --git a/examples/scala/master_slave_kill/kill.tesh b/examples/scala/master_slave_kill/kill.tesh index f22d582f9e..78868a18c1 100644 --- a/examples/scala/master_slave_kill/kill.tesh +++ b/examples/scala/master_slave_kill/kill.tesh @@ -2,7 +2,7 @@ ! output sort -$ java -cp ${classpath:=.} master_slave_kill/MsKill ${srcdir:=.}/master_slave_kill/platform.xml +$ java -classpath ${classpath:=.} master_slave_kill/MsKill ${srcdir:=.}/master_slave_kill/platform.xml > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up. > [0.013010] [jmsg/INFO] MSG_main finished; Cleaning up the simulation... > [alice:slave:(2) 0.000000] [jmsg/INFO] Slave Hello! diff --git a/examples/scala/masterslave/CMakeLists.txt b/examples/scala/masterslave/CMakeLists.txt index 634590e3c9..5c2bcccb3d 100644 --- a/examples/scala/masterslave/CMakeLists.txt +++ b/examples/scala/masterslave/CMakeLists.txt @@ -14,7 +14,7 @@ if(enable_scala) COMMENT "Building ${example}..." OUTPUT ${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} - COMMAND ${SCALA_COMPILE} -cp ${SIMGRID_JAR} + COMMAND ${SCALA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources} COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled diff --git a/examples/scala/masterslave/masterslave.tesh b/examples/scala/masterslave/masterslave.tesh index 77a09b54fe..ee1d2074b8 100644 --- a/examples/scala/masterslave/masterslave.tesh +++ b/examples/scala/masterslave/masterslave.tesh @@ -2,7 +2,7 @@ ! output sort -$ java -cp ${classpath:=.} masterslave/Masterslave ${srcdir:=.}/platform.xml ${srcdir:=.}/masterslave/masterslaveDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ java -classpath ${classpath:=.} masterslave/Masterslave ${srcdir:=.}/platform.xml ${srcdir:=.}/masterslave/masterslaveDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:masterslave.Master@Jacquelin) Hello! Got 7 slaves and 5 tasks to process > [ 0.000000] (2:masterslave.Forwarder@Jackson) Receiving on 'slave_0' > [ 0.000000] (3:masterslave.Forwarder@Casavant) Receiving on 'slave_1' -- 2.20.1