From: Arnaud Giersch Date: Tue, 12 Sep 2017 11:18:48 +0000 (+0200) Subject: Rename Java examples. X-Git-Tag: v3_17~140 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c64081804d3126681790377c64be2cf266f7ba0c Rename Java examples. Add prefix "java-" to target names, and s/_/-/. --- diff --git a/.gitignore b/.gitignore index 7275993d6d..175b3443cb 100644 --- a/.gitignore +++ b/.gitignore @@ -246,8 +246,8 @@ examples/smpi/trace_simple/smpi_trace_simple examples/smpi/trace_call_location/smpi_trace_call_location testall teshsuite/datadesc_usage.out -teshsuite/java/semaphoreGC/semaphoreGC_compiled -teshsuite/java/sleepHostOff/sleepHostOff_compiled +teshsuite/java/semaphoreGC/java-semaphoreGC_compiled +teshsuite/java/sleepHostOff/java-sleepHostOff_compiled teshsuite/mc/dwarf/dwarf teshsuite/mc/dwarf-expression/dwarf-expression teshsuite/mc/random-bug/random-bug @@ -1083,29 +1083,29 @@ tools/tesh/tesh unit_tmgr ######################################### ## touched files to track the dependencies of java examples -examples/java/app/bittorrent/java_app_bittorrent_compiled -examples/java/app/centralizedmutex/java_app_centralizedmutex_compiled -examples/java/app/masterworker/java_app_masterworker_compiled -examples/java/app/pingpong/java_app_pingpong_compiled -examples/java/app/tokenring/java_app_tokenring_compiled -examples/java/async/yield/java_async_yield_compiled -examples/java/async/dsend/java_async_dsend_compiled -examples/java/async/waitall/java_async_waitall_compiled -examples/java/dht/chord/java_dht_chord_compiled -examples/java/dht/kademlia/java_dht_kademlia_compiled -examples/java/cloud/masterworker/java_cloud_masterworker_compiled -examples/java/cloud/migration/java_cloud_migration_compiled -examples/java/energy/consumption/java_energy_consumption_compiled -examples/java/energy/pstate/java_energy_pstate_compiled -examples/java/energy/vm/java_energy_vm_compiled -examples/java/io/file/java_io_file_compiled -examples/java/io/storage/java_io_storage_compiled -examples/java/process/kill/java_process_kill_compiled -examples/java/process/migration/java_process_migration_compiled -examples/java/process/suspend/java_process_suspend_compiled -examples/java/process/startkilltime/java_process_startkilltime_compiled -examples/java/task/priority/java_task_priority_compiled -examples/java/trace/pingpong/java_trace_pingpong_compiled +examples/java/app/bittorrent/java-app-bittorrent_compiled +examples/java/app/centralizedmutex/java-app-centralizedmutex_compiled +examples/java/app/masterworker/java-app-masterworker_compiled +examples/java/app/pingpong/java-app-pingpong_compiled +examples/java/app/tokenring/java-app-tokenring_compiled +examples/java/async/yield/java-async-yield_compiled +examples/java/async/dsend/java-async-dsend_compiled +examples/java/async/waitall/java-async-waitall_compiled +examples/java/dht/chord/java-dht-chord_compiled +examples/java/dht/kademlia/java-dht-kademlia_compiled +examples/java/cloud/masterworker/java-cloud-masterworker_compiled +examples/java/cloud/migration/java-cloud-migration_compiled +examples/java/energy/consumption/java-energy-consumption_compiled +examples/java/energy/pstate/java-energy-pstate_compiled +examples/java/energy/vm/java-energy-vm_compiled +examples/java/io/file/java-io-file_compiled +examples/java/io/storage/java-io-storage_compiled +examples/java/process/kill/java-process-kill_compiled +examples/java/process/migration/java-process-migration_compiled +examples/java/process/suspend/java-process-suspend_compiled +examples/java/process/startkilltime/java-process-startkilltime_compiled +examples/java/task/priority/java-task-priority_compiled +examples/java/trace/pingpong/java-trace-pingpong_compiled /CMakeCache.txt examples/smpi/mc/smpi_bugged1 examples/smpi/mc/smpi_bugged1_liveness diff --git a/examples/java/CMakeLists.txt b/examples/java/CMakeLists.txt index 0c8162e086..0e1967b218 100644 --- a/examples/java/CMakeLists.txt +++ b/examples/java/CMakeLists.txt @@ -1,34 +1,34 @@ -set(app_bittorrent_files Main Common Connection MessageTask Peer Tracker TrackerTask) -set(app_centralizedmutex_files Main Coordinator GrantTask Node ReleaseTask RequestTask) -set(app_masterworker_files Main Master Worker) -set(app_pingpong_files Main PingPongTask Receiver Sender) -set(app_tokenring_files Main RelayRunner) -set(async_waitall_files Main Receiver Sender) -set(async_yield_files Main Yielder) -set(async_dsend_files Main Receiver Sender) -set(cloud_masterworker_files Main Master Worker) -set(cloud_migration_files Main Daemon Test TestHostOnOff XVM) -set(dht_chord_files Main ChordTask Common FindSuccessorAnswerTask FindSuccessorTask +set(app-bittorrent_files Main Common Connection MessageTask Peer Tracker TrackerTask) +set(app-centralizedmutex_files Main Coordinator GrantTask Node ReleaseTask RequestTask) +set(app-masterworker_files Main Master Worker) +set(app-pingpong_files Main PingPongTask Receiver Sender) +set(app-tokenring_files Main RelayRunner) +set(async-waitall_files Main Receiver Sender) +set(async-yield_files Main Yielder) +set(async-dsend_files Main Receiver Sender) +set(cloud-masterworker_files Main Master Worker) +set(cloud-migration_files Main Daemon Test TestHostOnOff XVM) +set(dht-chord_files Main ChordTask Common FindSuccessorAnswerTask FindSuccessorTask GetPredecessorAnswerTask GetPredecessorTask Node NotifyTask) -set(dht_kademlia_files Main Answer Bucket Common Contact FindNodeAnswerTask FindNodeTask +set(dht-kademlia_files Main Answer Bucket Common Contact FindNodeAnswerTask FindNodeTask KademliaTask Node PingAnswerTask PingTask RoutingTable) -set(trace_pingpong_files Main PingPongTask Receiver Sender) -set(energy_consumption_files Main EnergyConsumer) -set(energy_pstate_files Main PstateRunner) -set(energy_vm_files Main EnergyVMRunner) -set(io_file_files Main Node) -set(io_storage_files Main Client) -set(process_kill_files Main Killer Victim) -set(process_migration_files Main Emigrant Policeman) -set(process_startkilltime_files Main Sleeper) -set(process_suspend_files Main DreamMaster LazyGuy) -set(task_priority_files Main Test) +set(trace-pingpong_files Main PingPongTask Receiver Sender) +set(energy-consumption_files Main EnergyConsumer) +set(energy-pstate_files Main PstateRunner) +set(energy-vm_files Main EnergyVMRunner) +set(io-file_files Main Node) +set(io-storage_files Main Client) +set(process-kill_files Main Killer Victim) +set(process-migration_files Main Emigrant Policeman) +set(process-startkilltime_files Main Sleeper) +set(process-suspend_files Main DreamMaster LazyGuy) +set(task-priority_files Main Test) -foreach (example app_bittorrent app_centralizedmutex app_masterworker app_pingpong app_tokenring async_yield async_waitall async_dsend - cloud_migration cloud_masterworker dht_chord dht_kademlia energy_consumption energy_pstate energy_vm io_file io_storage - process_kill process_migration process_startkilltime process_suspend task_priority trace_pingpong) - string (REPLACE "_" "/" example_dir ${example}) +foreach (example app-bittorrent app-centralizedmutex app-masterworker app-pingpong app-tokenring async-yield async-waitall async-dsend + cloud-migration cloud-masterworker dht-chord dht-kademlia energy-consumption energy-pstate energy-vm io-file io-storage + process-kill process-migration process-startkilltime process-suspend task-priority trace-pingpong) + string (REPLACE "-" "/" example_dir ${example}) set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/${example_dir}) foreach (filename ${${example}_files} ) set( ${example}_sources "${${example}_sources}" "${srcdir}/${filename}.java") @@ -36,15 +36,15 @@ foreach (example app_bittorrent app_centralizedmutex app_masterworker app_pingpo if(enable_java) add_custom_command( - COMMENT "Building java_${example}..." - OUTPUT ${example_dir}/java_${example}_compiled + COMMENT "Building java-${example}..." + OUTPUT ${example_dir}/java-${example}_compiled DEPENDS ${example_sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${CMAKE_COMMAND} -E make_directory ${example_dir} COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR} ${${example}_sources} - COMMAND ${CMAKE_COMMAND} -E remove ${example_dir}/java_${example}_compiled - COMMAND ${CMAKE_COMMAND} -E touch ${example_dir}/java_${example}_compiled + COMMAND ${CMAKE_COMMAND} -E remove ${example_dir}/java-${example}_compiled + COMMAND ${CMAKE_COMMAND} -E touch ${example_dir}/java-${example}_compiled ) - add_custom_target(${example} ALL DEPENDS ${example_dir}/java_${example}_compiled) + add_custom_target(java-${example} ALL DEPENDS ${example_dir}/java-${example}_compiled) endif() set(examples_src ${examples_src} ${${example}_sources}) set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${example_dir}/${example}.tesh) @@ -64,10 +64,10 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/app/bittorrent/bi ${CMAKE_CURRENT_SOURCE_DIR}/task/priority/priority.xml PARENT_SCOPE) if(enable_java) - foreach (example app_bittorrent app_centralizedmutex app_masterworker app_pingpong app_tokenring async_yield async_waitall async_dsend - cloud_migration cloud_masterworker dht_chord dht_kademlia energy_consumption energy_pstate energy_vm io_file io_storage - process_kill process_migration process_startkilltime process_suspend task_priority trace_pingpong) - string (REPLACE "_" "/" example_dir ${example}) + foreach (example app-bittorrent app-centralizedmutex app-masterworker app-pingpong app-tokenring async-yield async-waitall async-dsend + cloud-migration cloud-masterworker dht-chord dht-kademlia energy-consumption energy-pstate energy-vm io-file io-storage + process-kill process-migration process-startkilltime process-suspend task-priority trace-pingpong) + string (REPLACE "-" "/" example_dir ${example}) ADD_TESH(java-${example} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java/${example_dir} ${CMAKE_HOME_DIRECTORY}/examples/java/${example_dir}/${example}.tesh) endforeach() endif() diff --git a/examples/java/app/bittorrent/app_bittorrent.tesh b/examples/java/app/bittorrent/app-bittorrent.tesh similarity index 100% rename from examples/java/app/bittorrent/app_bittorrent.tesh rename to examples/java/app/bittorrent/app-bittorrent.tesh diff --git a/examples/java/app/centralizedmutex/app_centralizedmutex.tesh b/examples/java/app/centralizedmutex/app-centralizedmutex.tesh similarity index 100% rename from examples/java/app/centralizedmutex/app_centralizedmutex.tesh rename to examples/java/app/centralizedmutex/app-centralizedmutex.tesh diff --git a/examples/java/app/masterworker/app_masterworker.tesh b/examples/java/app/masterworker/app-masterworker.tesh similarity index 100% rename from examples/java/app/masterworker/app_masterworker.tesh rename to examples/java/app/masterworker/app-masterworker.tesh diff --git a/examples/java/app/pingpong/app_pingpong.tesh b/examples/java/app/pingpong/app-pingpong.tesh similarity index 100% rename from examples/java/app/pingpong/app_pingpong.tesh rename to examples/java/app/pingpong/app-pingpong.tesh diff --git a/examples/java/app/tokenring/app_tokenring.tesh b/examples/java/app/tokenring/app-tokenring.tesh similarity index 100% rename from examples/java/app/tokenring/app_tokenring.tesh rename to examples/java/app/tokenring/app-tokenring.tesh diff --git a/examples/java/async/dsend/async_dsend.tesh b/examples/java/async/dsend/async-dsend.tesh similarity index 100% rename from examples/java/async/dsend/async_dsend.tesh rename to examples/java/async/dsend/async-dsend.tesh diff --git a/examples/java/async/waitall/async_waitall.tesh b/examples/java/async/waitall/async-waitall.tesh similarity index 100% rename from examples/java/async/waitall/async_waitall.tesh rename to examples/java/async/waitall/async-waitall.tesh diff --git a/examples/java/async/yield/async_yield.tesh b/examples/java/async/yield/async-yield.tesh similarity index 100% rename from examples/java/async/yield/async_yield.tesh rename to examples/java/async/yield/async-yield.tesh diff --git a/examples/java/cloud/masterworker/cloud_masterworker.tesh b/examples/java/cloud/masterworker/cloud-masterworker.tesh similarity index 100% rename from examples/java/cloud/masterworker/cloud_masterworker.tesh rename to examples/java/cloud/masterworker/cloud-masterworker.tesh diff --git a/examples/java/cloud/migration/cloud_migration.tesh b/examples/java/cloud/migration/cloud-migration.tesh similarity index 100% rename from examples/java/cloud/migration/cloud_migration.tesh rename to examples/java/cloud/migration/cloud-migration.tesh diff --git a/examples/java/dht/chord/dht_chord.tesh b/examples/java/dht/chord/dht-chord.tesh similarity index 100% rename from examples/java/dht/chord/dht_chord.tesh rename to examples/java/dht/chord/dht-chord.tesh diff --git a/examples/java/dht/kademlia/dht_kademlia.tesh b/examples/java/dht/kademlia/dht-kademlia.tesh similarity index 100% rename from examples/java/dht/kademlia/dht_kademlia.tesh rename to examples/java/dht/kademlia/dht-kademlia.tesh diff --git a/examples/java/energy/consumption/energy_consumption.tesh b/examples/java/energy/consumption/energy-consumption.tesh similarity index 100% rename from examples/java/energy/consumption/energy_consumption.tesh rename to examples/java/energy/consumption/energy-consumption.tesh diff --git a/examples/java/energy/pstate/energy_pstate.tesh b/examples/java/energy/pstate/energy-pstate.tesh similarity index 100% rename from examples/java/energy/pstate/energy_pstate.tesh rename to examples/java/energy/pstate/energy-pstate.tesh diff --git a/examples/java/energy/vm/energy_vm.tesh b/examples/java/energy/vm/energy-vm.tesh similarity index 100% rename from examples/java/energy/vm/energy_vm.tesh rename to examples/java/energy/vm/energy-vm.tesh diff --git a/examples/java/io/file/io_file.tesh b/examples/java/io/file/io-file.tesh similarity index 100% rename from examples/java/io/file/io_file.tesh rename to examples/java/io/file/io-file.tesh diff --git a/examples/java/io/storage/io_storage.tesh b/examples/java/io/storage/io-storage.tesh similarity index 100% rename from examples/java/io/storage/io_storage.tesh rename to examples/java/io/storage/io-storage.tesh diff --git a/examples/java/process/kill/process_kill.tesh b/examples/java/process/kill/process-kill.tesh similarity index 100% rename from examples/java/process/kill/process_kill.tesh rename to examples/java/process/kill/process-kill.tesh diff --git a/examples/java/process/migration/process_migration.tesh b/examples/java/process/migration/process-migration.tesh similarity index 100% rename from examples/java/process/migration/process_migration.tesh rename to examples/java/process/migration/process-migration.tesh diff --git a/examples/java/process/startkilltime/process_startkilltime.tesh b/examples/java/process/startkilltime/process-startkilltime.tesh similarity index 100% rename from examples/java/process/startkilltime/process_startkilltime.tesh rename to examples/java/process/startkilltime/process-startkilltime.tesh diff --git a/examples/java/process/suspend/process_suspend.tesh b/examples/java/process/suspend/process-suspend.tesh similarity index 100% rename from examples/java/process/suspend/process_suspend.tesh rename to examples/java/process/suspend/process-suspend.tesh diff --git a/examples/java/task/priority/task_priority.tesh b/examples/java/task/priority/task-priority.tesh similarity index 100% rename from examples/java/task/priority/task_priority.tesh rename to examples/java/task/priority/task-priority.tesh diff --git a/examples/java/trace/pingpong/trace_pingpong.tesh b/examples/java/trace/pingpong/trace-pingpong.tesh similarity index 100% rename from examples/java/trace/pingpong/trace_pingpong.tesh rename to examples/java/trace/pingpong/trace-pingpong.tesh diff --git a/teshsuite/java/CMakeLists.txt b/teshsuite/java/CMakeLists.txt index 2d9d5dfb7b..4814b20bed 100644 --- a/teshsuite/java/CMakeLists.txt +++ b/teshsuite/java/CMakeLists.txt @@ -11,14 +11,14 @@ foreach(example semaphoreGC sleepHostOff) if(enable_java) add_custom_command( COMMENT "Building ${example}..." - OUTPUT ${example}_compiled + OUTPUT java-${example}_compiled DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR} COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR} ${sources} - COMMAND ${CMAKE_COMMAND} -E remove ${example}/${example}_compiled - COMMAND ${CMAKE_COMMAND} -E touch ${example}/${example}_compiled + COMMAND ${CMAKE_COMMAND} -E remove ${example}/java-${example}_compiled + COMMAND ${CMAKE_COMMAND} -E touch ${example}/java-${example}_compiled ) - add_custom_target(${example} ALL DEPENDS ${example}_compiled) - set_target_properties(${example} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${example}) + add_custom_target(java-${example} ALL DEPENDS java-${example}_compiled) + set_target_properties(java-${example} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${example}) endif() set(examples_src ${examples_src} ${sources}) endforeach()