From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 11 Aug 2018 20:49:38 +0000 (+0200)
Subject: Merge branches 'auto_restart' and 'auto_restart' of framagit.org:simgrid/simgrid
X-Git-Tag: v3_21~261^2~1
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/937f2eb5b429c3c03fc989a25fbc26fabd0cf529

Merge branches 'auto_restart' and 'auto_restart' of framagit.org:simgrid/simgrid

Also, don't run doxygen manually on framagit/gitlab-ci
---

937f2eb5b429c3c03fc989a25fbc26fabd0cf529
diff --cc .gitlab-ci.yml
index be346507e2,0085c43ae7..3ef1530238
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -3,12 -3,13 +3,8 @@@ image: debian:testing-sli
  .build: &build
    script:
    - apt-get update
-   - apt-get install -y python3-pip cmake doxygen libboost-all-dev libboost-dev fig2dev
 -  - apt-get install -y python3-sphinx doxygen python3-breathe python3-sphinx-rtd-theme pip3
 -  - apt-get install -y cmake doxygen libboost-all-dev libboost-dev
 -  - pip3 install --no-deps exhale
 -  - cmake -Denable_documentation=ON .
 -  - make documentation
 -  - mkdir docs/doxyoutput
 -  - mv doc/xml docs/doxyoutput
++  - apt-get install -y python3-pip doxygen libboost-all-dev libboost-dev fig2dev
 +  - pip3 install --requirement docs/requirements.txt 
-   - cmake -Denable_documentation=ON .
-   - make documentation
-   - mkdir docs/doxyoutput
-   - cp -r doc/xml docs/doxyoutput
    - cd docs
    - sphinx-build -M html source/ build/
    - mv build/html ../public
diff --cc examples/s4u/CMakeLists.txt
index c8a987ec4f,5c18f404c5..dae1364bf5
--- a/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@@ -28,11 -28,11 +28,10 @@@ foreach(variant fun class
    target_link_libraries(s4u-app-masterworkers-${variant}  simgrid)
    set_target_properties(s4u-app-masterworkers-${variant}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/app-masterworkers)
  
 -  set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/masterworkers-fun/s4u-masterworkers-${variant}.cpp)
 +  set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworkers/s4u-app-masterworkers-${variant}.cpp)
  endforeach()
 -set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/masterworkers-fun/s4u-masterworkers.tesh)
 -
 +set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworkers/s4u-app-masterworkers.tesh)
  
- 
  # CHORD EXAMPLE
  add_executable       (s4u-dht-chord dht-chord/s4u-dht-chord.cpp dht-chord/s4u-dht-chord-node.cpp)
  target_link_libraries(s4u-dht-chord simgrid)
@@@ -102,8 -102,8 +101,13 @@@ foreach(example actor-create actor-daem
                  energy-exec energy-boot energy-link energy-vm
                  engine-filtering
                  exec-async exec-basic exec-dvfs exec-monitor exec-ptask exec-remote
++<<<<<<< HEAD
 +                platform-properties plugin-hostload mutex
 +                io-async io-file-system io-file-remote io-storage-raw
++=======
+                 platform-failures platform-properties plugin-hostload mutex
+                 io-file-system io-file-remote io-storage-raw
++>>>>>>> 4ccbacb51eb49323847a906c3e79ea838d76e2a7
                  replay-comm replay-storage
                  routing-get-clusters
                  )