- cmd: git clone --depth=1 https://github.com/pybind/pybind11.git
build_script:
-- cmake -G "MinGW Makefiles" -Denable_lua=OFF -Denable_documentation=OFF -Denable_java=ON -Denable_MSG=ON -Denable_smpi=OFF -Denable_mallocators=OFF -Denable_lto=OFF .
+- cmake -G "MinGW Makefiles" -Denable_lua=OFF -Denable_documentation=OFF -Denable_java=ON -Denable_msg=ON -Denable_smpi=OFF -Denable_mallocators=OFF -Denable_lto=OFF .
- mingw32-make.exe VERBOSE=1 java-all python-bindings # Only the Java and Python parts
- ctest --output-on-failure -R java
- ctest --output-on-failure -R python
name: Configure, build and test da stuff
command: |
mkdir _build && cd _build
- cmake -Denable_documentation=OFF -Denable_coverage=ON -Denable_java=ON -Denable_MSG=ON -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=OFF -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON ..
+ cmake -Denable_documentation=OFF -Denable_coverage=ON -Denable_java=ON -Denable_msg=ON -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=OFF -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON ..
make -j4 tests && ctest -j4 --output-on-failure
script:
- apt-get --allow-releaseinfo-change update && apt install -y binutils-x86-64-linux-gnu wget unzip zip
# Build the linux version of the jarfile without the boost dependency
- - cmake -Denable_documentation=OFF -Denable_java=ON -Denable_MSG=ON -Denable_lib_in_jar=ON -Dminimal-bindings=ON -Denable_compile_optimizations=ON -Denable_smpi=OFF .
+ - cmake -Denable_documentation=OFF -Denable_java=ON -Denable_msg=ON -Denable_lib_in_jar=ON -Dminimal-bindings=ON -Denable_compile_optimizations=ON -Denable_smpi=OFF .
- make VERBOSE=1 dist simgrid simgrid-java_jar
# Get the foreign architectures
- wget https://ci.appveyor.com/api/projects/mquinson/simgrid/artifacts/simgrid.jar -O simgrid-windows.jar
- export JAVA_HOME='C:/Program Files/Java/jdk1.8.0_211'
# We need pybind11. SimGrid will pick it automatically if the subdir is here
# - git clone --depth=1 https://github.com/pybind/pybind11.git
- - cmake -G "MinGW Makefiles" -Denable_java=ON -Denable_MSG=ON -Denable_lua=OFF -Denable_documentation=OFF -Denable_smpi=OFF -Denable_mallocators=OFF -Denable_lto=OFF .
+ - cmake -G "MinGW Makefiles" -Denable_java=ON -Denable_msg=ON -Denable_lua=OFF -Denable_documentation=OFF -Denable_smpi=OFF -Denable_mallocators=OFF -Denable_lto=OFF .
- df -h
- du -hs /tmp || true
- mingw32-make.exe VERBOSE=1 java-all && ctest --output-on-failure -R java
endif()
set(SIMGRID_HAVE_MSG 0)
-if(enable_MSG)
+if(enable_msg)
set(SIMGRID_HAVE_MSG 1)
endif()
mark_as_advanced(PATH_LIBDW_H)
mark_as_advanced(PATH_LIBDW_LIB)
-if(enable_java AND NOT enable_MSG)
- message(FATAL_ERROR "Cannot activate the Java bindings without the MSG module. Either add -Denable_MSG=ON or -Denable_java=OFF")
+if(enable_java AND NOT enable_msg)
+ message(FATAL_ERROR "Cannot activate the Java bindings without the MSG module. Either add -Denable_msg=ON or -Denable_java=OFF")
endif()
if (enable_model-checking AND enable_ns3)
- Python's doc was organized as a separate tree, now integrated with C++.
- C bindings of S4U were not part of the doc.
- The C++ doc was also improved as methods are now split by theme.
-- Further deprecate MSG: you now have to pass -Denable-MSG=ON to cmake.
- - The plan is to completely remove MSG by the end of 2020.
+- Further deprecate MSG: you now have to pass -Denable_msg=ON to cmake.
+ - This is mandatory to use the Java bindings.
+ - OFF by default; The plan is to completely remove MSG by 2020Q4 or 2021Q1.
- SimDAG++: Automatic dependencies on S4U activities (experimental)
- Some features are already implemented but not all of them
- Cannot block an activity until it's scheduled on a resource
synchro-semaphore trace-categories
trace-route-user-variables trace-link-user-variables trace-masterworker
trace-process-migration trace-host-user-variables)
- if(enable_MSG)
+ if(enable_msg)
add_executable (${x} EXCLUDE_FROM_ALL ${x}/${x}.c)
target_link_libraries(${x} simgrid)
set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh)
endforeach()
-if(SIMGRID_HAVE_NS3 AND enable_MSG)
+if(SIMGRID_HAVE_NS3 AND enable_msg)
add_executable (network-ns3 EXCLUDE_FROM_ALL network-ns3/network-ns3.c)
target_link_libraries(network-ns3 simgrid)
set_target_properties(network-ns3 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/network-ns3)
add_dependencies(tests network-ns3)
endif()
-if(enable_MSG)
+if(enable_msg)
add_executable (dht-kademlia EXCLUDE_FROM_ALL dht-kademlia/dht-kademlia.c dht-kademlia/node.c dht-kademlia/routing_table.c dht-kademlia/task.c dht-kademlia/answer.c)
target_link_libraries(dht-kademlia simgrid)
set_target_properties(dht-kademlia PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dht-kademlia)
${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/onelink_d.xml
${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/one_cluster_d.xml PARENT_SCOPE)
-if(enable_MSG)
+if(enable_msg)
foreach(x app-masterworker cloud-masterworker
dht-pastry dht-kademlia platform-failures
energy-vm
--setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms
${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/network-ns3/network-ns3.tesh)
endif()
-endif(enable_MSG)
\ No newline at end of file
+endif(enable_msg)
\ No newline at end of file
task-priority
plugin-hostload
trace_integration)
- if(enable_MSG)
+ if(enable_msg)
add_executable (${x} EXCLUDE_FROM_ALL ${x}/${x}.c)
target_link_libraries(${x} simgrid)
set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
# CPP examples
foreach(x task_destroy_cancel task_listen_from task_progress host_on_off_processes)
- if(enable_MSG)
+ if(enable_msg)
add_executable (${x} EXCLUDE_FROM_ALL ${x}/${x}.cpp)
target_link_libraries(${x} simgrid)
set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.cpp)
endforeach()
-if(enable_MSG)
+if(enable_msg)
add_executable (bittorrent EXCLUDE_FROM_ALL app-bittorrent/bittorrent.c app-bittorrent/bittorrent-messages.c app-bittorrent/bittorrent-peer.c app-bittorrent/tracker.c app-bittorrent/connection.c)
target_link_libraries(bittorrent simgrid)
set_target_properties(bittorrent PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/app-bittorrent)
set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/${file}.c ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/${file}.h)
endforeach()
-if(enable_MSG)
+if(enable_msg)
add_executable (chainsend EXCLUDE_FROM_ALL app-chainsend/chainsend.c app-chainsend/iterator.c app-chainsend/common.c app-chainsend/messages.c app-chainsend/broadcaster.c app-chainsend/peer.c)
target_link_libraries(chainsend simgrid)
set_target_properties(chainsend PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/app-chainsend)
${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1-c1s1-c3s2.xml
${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp2.5-hbp1.5.xml PARENT_SCOPE)
-if(enable_MSG)
+if(enable_msg)
foreach(x
async-wait async-waitall async-waitany
app-bittorrent app-chainsend app-pingpong app-token-ring
${SIMDAG_SRC}
)
-if(${enable_MSG})
+if(${enable_msg})
set(headers_to_install ${headers_to_install} include/simgrid/msg.h)
set(simgrid_sources ${simgrid_sources} ${MSG_SRC})
else()
option(enable_ns3 "Whether ns-3 model is activated." off)
option(enable_java "Whether the Java bindings are activated." off)
-option(enable_MSG "Whether the MSG module is activated." off)
+option(enable_msg "Whether the MSG module is activated." off)
option(enable_lib_in_jar "Whether the native libraries are bundled in a Java jar file" on)
option(minimal-bindings "Whether to compile the bindings libraries (Java/Python) with the minimal dependency set" off)
mark_as_advanced(minimal-bindings)
-if(enable_MSG)
+if(enable_msg)
add_executable (graphicator graphicator.c)
add_dependencies (tests graphicator)
target_link_libraries(graphicator simgrid)
fi
echo "Step ${STEP}/${NSTEPS} - Building with java=${buildjava}, debug=${builddebug}, SMPI=${buildsmpi}, MC=${buildmc}, MSG=${buildmsg}"
-cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=${buildjava} -Denable_MSG=${buildmsg} \
+cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=${buildjava} -Denable_msg=${buildmsg} \
-Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \
-Denable_jedule=ON -Denable_mallocators=ON -Denable_debug=${builddebug} \
-Denable_smpi=${buildsmpi} -Denable_smpi_MPICH3_testsuite=${buildsmpi} -Denable_model-checking=${buildmc} \
-Denable_ns3=$(onoff test "$have_NS3" = "yes" -a "$build_mode" = "Debug") \
-Denable_jedule=OFF -Denable_lua=OFF ${MAY_DISABLE_SOURCE_CHANGE} \
-Denable_java=$(onoff test "$build_mode" = "ModelChecker") \
- -Denable_MSG=$(onoff test "$build_mode" = "ModelChecker") \
+ -Denable_msg=$(onoff test "$build_mode" = "ModelChecker") \
$SRCFOLDER
# -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \
set +x