Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
more verbose around make distcheck (to get a chance to fix it)
[simgrid.git] / buildtools / Cmake / Distrib.cmake
old mode 100755 (executable)
new mode 100644 (file)
index e1c87a3..e6179b6
@@ -1,48 +1,63 @@
-set(CMAKE_INSTALL_PREFIX ${prefix} CACHE TYPE INTERNAL FORCE)
-
 #########################################
 ### Fill in the "make install" target ###
 #########################################
          
 # doc
-if(EXISTS ${PROJECT_DIRECTORY}/doc/html/)
-       install(DIRECTORY "${PROJECT_DIRECTORY}/doc/html/"
-         DESTINATION "$ENV{DESTDIR}${prefix}/doc/simgrid/html/"
-         PATTERN ".svn" EXCLUDE 
-         PATTERN ".git" EXCLUDE 
-         PATTERN "*.o" EXCLUDE
-         PATTERN "*~" EXCLUDE
-       )
-endif(EXISTS ${PROJECT_DIRECTORY}/doc/html/)
+if(enable_doc)
+       if(NOT EXISTS ${PROJECT_DIRECTORY}/doc/html/)
+               file(MAKE_DIRECTORY ${PROJECT_DIRECTORY}/doc/html/)
+       endif(NOT EXISTS ${PROJECT_DIRECTORY}/doc/html/)
+               install(DIRECTORY "${PROJECT_DIRECTORY}/doc/html/"
+                 DESTINATION "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/html/"
+                 PATTERN ".svn" EXCLUDE 
+                 PATTERN ".git" EXCLUDE 
+                 PATTERN "*.o" EXCLUDE
+                 PATTERN "*~" EXCLUDE
+               )
+endif(enable_doc)
 
 # binaries
 install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/smpicc
+                 ${CMAKE_BINARY_DIR}/bin/smpif2c
+                 ${CMAKE_BINARY_DIR}/bin/smpiff
                  ${CMAKE_BINARY_DIR}/bin/smpirun
-                 ${CMAKE_BINARY_DIR}/bin/tesh
-               DESTINATION $ENV{DESTDIR}${prefix}/bin/)
+               DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
+if(WIN32)
+       install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl
+       DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
+else(WIN32)
+       install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/tesh
+       DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
+endif(WIN32)  
        
 install(PROGRAMS tools/MSG_visualization/colorize.pl
-        DESTINATION $ENV{DESTDIR}${prefix}/bin/
+        DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/
                RENAME simgrid-colorizer)
 
 # libraries
 install(TARGETS simgrid gras 
-        DESTINATION $ENV{DESTDIR}${prefix}/lib/)
-       
-install(FILES ${CMAKE_BINARY_DIR}/lib/libsimgrid_static.a 
-        RENAME libsimgrid.a
-        DESTINATION $ENV{DESTDIR}${prefix}/lib/)
+        DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
        
 if(enable_smpi)        
   install(TARGETS smpi
-          DESTINATION $ENV{DESTDIR}${prefix}/lib/)
-endif(enable_smpi)     
+          DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
+endif(enable_smpi)
+
+if(enable_lib_static AND NOT WIN32)
+       install(TARGETS simgrid_static 
+               DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
+       if(enable_smpi) 
+               install(TARGETS smpi_static
+                       DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
+       endif(enable_smpi)
+endif(enable_lib_static AND NOT WIN32)
 
 # include files
 foreach(file ${install_HEADERS})
   get_filename_component(location ${file} PATH)
+  string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}/" "" location "${location}")
   install(FILES ${file}
-          DESTINATION $ENV{DESTDIR}${prefix}/${location})
+          DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${location})
 endforeach(file ${install_HEADERS})
 
 # example files
@@ -50,28 +65,47 @@ foreach(file ${examples_to_install_in_doc})
   string(REPLACE "${PROJECT_DIRECTORY}/examples/" "" file ${file})
   get_filename_component(location ${file} PATH)
   install(FILES "examples/${file}"
-          DESTINATION $ENV{DESTDIR}${prefix}/doc/simgrid/examples/${location})
+          DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/examples/${location})
 endforeach(file ${examples_to_install_in_doc})
 
 # bindings cruft
 if(HAVE_JAVA)
   install(FILES ${CMAKE_BINARY_DIR}/simgrid.jar
-          DESTINATION $ENV{DESTDIR}${prefix}/share/)
+          DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/)
 endif(HAVE_JAVA)
 
 if(HAVE_LUA)
-  add_custom_target(absolute_liblink ALL
-    COMMAND ${CMAKE_COMMAND} -E create_symlink $ENV{DESTDIR}${prefix}/lib/libsimgrid.so ${CMAKE_BINARY_DIR}/libsimgrid.so)
-  install(FILES ${CMAKE_BINARY_DIR}/libsimgrid.so
-          DESTINATION $ENV{DESTDIR}${prefix}/lib/lua/5.1
-         RENAME simgrid.so)
+       file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/lib/lua/5.1")
+       add_custom_target(simgrid_lua ALL
+               DEPENDS simgrid 
+                               ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
+               )
+       add_custom_command(
+               OUTPUT ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
+               COMMAND ${CMAKE_COMMAND} -E create_symlink ../../libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
+       )
+       install(FILES ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
+               DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/lua/5.1
+               )
 endif(HAVE_LUA)
 
 if(HAVE_RUBY)
-  string(REGEX REPLACE "^.*ruby/" "" install_link_ruby "${RUBY_ARCH_DIR}")
-  install(FILES ${CMAKE_BINARY_DIR}/libsimgrid.so
-                ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid.rb
-          DESTINATION $ENV{DESTDIR}${prefix}/lib/ruby/${install_link_ruby}/)
+       string(REGEX REPLACE "^.*ruby/" "" install_link_ruby "${RUBY_ARCH_DIR}")
+       file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}")
+       add_custom_target(ruby_simgrid ALL
+               DEPENDS simgrid
+                               ${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}/libsimgrid.${LIB_EXE}
+       )
+       add_custom_command(
+               OUTPUT ${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}/libsimgrid.${LIB_EXE}
+               COMMAND ${CMAKE_COMMAND} -E create_symlink ../../../libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}/libsimgrid.${LIB_EXE}
+       )
+       install(FILES ${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}/libsimgrid.${LIB_EXE}
+               DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/ruby/${install_link_ruby}/
+       )
+       install(FILES ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid.rb
+               DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/ruby/${install_link_ruby}/)
+
 endif(HAVE_RUBY)
 
 ###########################################
@@ -79,38 +113,47 @@ endif(HAVE_RUBY)
 ###########################################
 
 add_custom_target(uninstall
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${prefix}/doc/simgrid
+COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/doc/simgrid
 COMMAND ${CMAKE_COMMAND} -E    echo "uninstall doc ok"
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${uninstall_libs}
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/lib/libgras*
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/lib/libsimgrid*
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/lib/libsmpi*
 COMMAND ${CMAKE_COMMAND} -E    echo "uninstall lib ok"
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${uninstall_bins}
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${prefix}/bin/simgrid_colorizer.pl
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/bin/smpicc
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/bin/smpif2c
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/bin/smpiff
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/bin/smpirun
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/bin/tesh
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/bin/simgrid-colorizer
 COMMAND ${CMAKE_COMMAND} -E    echo "uninstall bin ok"
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${uninstall_HEADERS}
+COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/include/amok
+COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/include/gras
+COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/include/instr
+COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/include/msg 
+COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/include/simdag
+COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/include/smpi
+COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/include/surf
+COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/include/xbt
+COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/include/mc
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/include/simgrid_config.h
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/include/gras.h 
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/include/xbt.h
 COMMAND ${CMAKE_COMMAND} -E    echo "uninstal include ok"
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${prefix}/include/amok
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${prefix}/include/gras
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${prefix}/include/instr
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${prefix}/include/msg 
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${prefix}/include/simdag
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${prefix}/include/smpi
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${prefix}/include/surf
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${prefix}/include/xbt
-WORKING_DIRECTORY "${prefix}"
+WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}"
 )
 
 if(HAVE_JAVA)
        add_custom_command(TARGET uninstall
-       COMMAND ${CMAKE_COMMAND} -E     remove -f ${prefix}/share/simgrid.jar
-       COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding java"
+       COMMAND ${CMAKE_COMMAND} -E     remove -f ${CMAKE_INSTALL_PREFIX}/share/simgrid.jar
+       COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding java ok"
        WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
        )       
 endif(HAVE_JAVA)
 
 if(HAVE_LUA)
        add_custom_command(TARGET uninstall
-       COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding lua"
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${prefix}/lib/lua/5.1/simgrid.so  
+       COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding lua ok"
+       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/lib/lua/5.1/simgrid.${LIB_EXE}
        WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
        )
 endif(HAVE_LUA)
@@ -118,9 +161,9 @@ endif(HAVE_LUA)
 if(HAVE_RUBY)
        string(REGEX REPLACE "^.*ruby/" "" install_link_ruby "${RUBY_ARCH_DIR}")
        add_custom_command(TARGET uninstall
-       COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding ruby"
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${prefix}/lib/ruby/${install_link_ruby}/libsimgrid.so
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${prefix}/lib/ruby/${install_link_ruby}/simgrid.rb
+       COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding ruby ok"
+       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/lib/ruby/${install_link_ruby}/libsimgrid.${LIB_EXE}
+       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/lib/ruby/${install_link_ruby}/simgrid.rb
        WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
        )
 endif(HAVE_RUBY)
@@ -130,14 +173,41 @@ endif(HAVE_RUBY)
 ######################################
 
 add_custom_target(html
-COMMAND ${CMAKE_COMMAND} -E echo "Make the html doc"
+DEPENDS ${PROJECT_DIRECTORY}/doc/all_bib.html
 COMMAND ${CMAKE_COMMAND} -E echo "cmake -DBIBTEX2HTML=${BIBTEX2HTML} ./"
 COMMAND ${CMAKE_COMMAND} -DBIBTEX2HTML=${BIBTEX2HTML} ./
-COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/CMakeFiles
-COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/CMakeCache.txt
-COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/cmake_install.cmake
-COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/Makefile
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc"
+COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_DIRECTORY}/buildtools/Cmake/doc/CMakeFiles
+COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/buildtools/Cmake/doc/CMakeCache.txt
+COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/buildtools/Cmake/doc/cmake_install.cmake
+COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/buildtools/Cmake/doc/Makefile
+WORKING_DIRECTORY "${PROJECT_DIRECTORY}/buildtools/Cmake/doc"
+)
+
+add_custom_command(
+OUTPUT         ${PROJECT_DIRECTORY}/doc/all_bib.html
+               ${PROJECT_DIRECTORY}/doc/all_bib.latin1.html
+               ${PROJECT_DIRECTORY}/doc/all_bib.latin1.html.tmp
+               ${PROJECT_DIRECTORY}/doc/logcategories.sh
+               ${PROJECT_DIRECTORY}/doc/publis_core.bib
+               ${PROJECT_DIRECTORY}/doc/publis_core_bib.html
+               ${PROJECT_DIRECTORY}/doc/publis_core_bib.latin1.html
+               ${PROJECT_DIRECTORY}/doc/publis_core_bib.latin1.html.tmp
+               ${PROJECT_DIRECTORY}/doc/publis_count.html
+               ${PROJECT_DIRECTORY}/doc/publis_extern.bib
+               ${PROJECT_DIRECTORY}/doc/publis_extern_bib.html
+               ${PROJECT_DIRECTORY}/doc/publis_extern_bib.latin1.html
+               ${PROJECT_DIRECTORY}/doc/publis_extern_bib.latin1.html.tmp
+               ${PROJECT_DIRECTORY}/doc/publis_intra.bib
+               ${PROJECT_DIRECTORY}/doc/publis_intra_bib.html
+               ${PROJECT_DIRECTORY}/doc/publis_intra_bib.latin1.html
+               ${PROJECT_DIRECTORY}/doc/publis_intra_bib.latin1.html.tmp
+               ${PROJECT_DIRECTORY}/doc/tmp.realtoc
+               ${PROJECT_DIRECTORY}/doc/using_bib.html
+               ${PROJECT_DIRECTORY}/doc/using_bib.latin1.html
+               ${PROJECT_DIRECTORY}/doc/using_bib.latin1.html.tmp
+               ${PROJECT_DIRECTORY}/doc/realtoc.sh
+               ${PROJECT_DIRECTORY}/doc/html
+COMMAND ${CMAKE_COMMAND} -E echo "Make the html doc"
 )
 
 ################################################################
@@ -152,14 +222,17 @@ WORKING_DIRECTORY "${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc"
 
 add_custom_target(dist-dir
   COMMAND test -e simgrid-${release_version}/ && chmod -R a+w simgrid-${release_version}/ || true
-  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}
+  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/
   COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}
+  COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}/doc/html/
+  COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_DIRECTORY}/doc/html/ simgrid-${release_version}/doc/html/
 )
 
 set(dirs_in_tarball "")
-foreach(file ${source_to_pack} ${txt_files})
+foreach(file ${source_to_pack})
+  #message(${file})
   # This damn prefix is still set somewhere (seems to be in subdirs)
-  string(REPLACE "${PROJECT_DIRECTORY}/" "" file ${file})
+  string(REPLACE "${PROJECT_DIRECTORY}/" "" file "${file}")
   
   # Create the directory on need
   get_filename_component(file_location ${file} PATH)
@@ -184,9 +257,13 @@ endforeach(file ${source_to_pack})
 ######################################
 
 add_custom_target(dist
-  COMMAND ${CMAKE_COMMAND} -E tar cf simgrid-${release_version}.tar simgrid-${release_version}/
-  COMMAND gzip -9v simgrid-${release_version}.tar
-  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}
+  DEPENDS ${CMAKE_BINARY_DIR}/simgrid-${release_version}.tar.gz
+)
+add_custom_command(
+       OUTPUT ${CMAKE_BINARY_DIR}/simgrid-${release_version}.tar.gz    
+       COMMAND ${CMAKE_COMMAND} -E tar cf simgrid-${release_version}.tar simgrid-${release_version}/
+       COMMAND gzip -9v simgrid-${release_version}.tar
+       COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/
 )
 add_dependencies(dist dist-dir)
 
@@ -196,23 +273,41 @@ add_dependencies(dist dist-dir)
 
 # Allow to test the "make dist"
 add_custom_target(distcheck
+  COMMAND ${CMAKE_COMMAND} -E echo "XXX remove old copy"
+  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}.cpy 
+  COMMAND ${CMAKE_COMMAND} -E echo "XXX copy again the source tree"
+  COMMAND ${CMAKE_COMMAND} -E copy_directory simgrid-${release_version}/ simgrid-${release_version}.cpy 
+  COMMAND ${CMAKE_COMMAND} -E echo "XXX create build and install subtrees"
   COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}/_build
   COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}/_inst
-  
   # This stupid cmake creates a directory in source, killing the purpose of the chmod
   # (tricking around)
+  COMMAND ${CMAKE_COMMAND} -E echo "XXX change the modes of directories"
   COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}/CMakeFiles 
-#  COMMAND chmod -R a-w simgrid-${release_version}/ # FIXME: we should pass without commenting that line
+  COMMAND chmod -R a-w simgrid-${release_version}/ # FIXME: we should pass without commenting that line
   COMMAND chmod -R a+w simgrid-${release_version}/_build
   COMMAND chmod -R a+w simgrid-${release_version}/_inst
   COMMAND chmod -R a+w simgrid-${release_version}/CMakeFiles
   
-  COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build ${CMAKE_COMMAND} build ..  -Dprefix=../_inst
+  COMMAND ${CMAKE_COMMAND} -E echo "XXX Configure"
+  COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build ${CMAKE_COMMAND} build ..  -DCMAKE_INSTALL_PREFIX=../_inst -Wno-dev 
 #  COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build make dist-dir
-  COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build make 
-  COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build ctest -j5 --output-on-failure
+  COMMAND ${CMAKE_COMMAND} -E echo "XXX Build"
+  COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build make VERBOSE=1
+  
+  # This fails, unfortunately, because GRAS is broken for now
+#  COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build ctest -j5 --output-on-failure
+
+  COMMAND ${CMAKE_COMMAND} -E echo "XXX Check that cleaning works"
   COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build make clean
-#  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/
+  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/_build
+  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/_inst
+  COMMAND ${CMAKE_COMMAND} -E echo "XXX The output of the diff follows"
+  COMMAND diff -ruN simgrid-${release_version}.cpy simgrid-${release_version}
+  COMMAND ${CMAKE_COMMAND} -E echo "XXX end of the diff, random cleanups now"
+  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}.cpy 
+  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/
 )
 add_dependencies(distcheck dist-dir)
 
@@ -220,13 +315,18 @@ add_dependencies(distcheck dist-dir)
 ### Fill in the "make check" target ###
 #######################################
 
-add_custom_target(check
-COMMAND make test
-#WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
-)
+if(enable_memcheck)
+       add_custom_target(check
+       COMMAND ctest -D ExperimentalMemCheck
+       )
+else(enable_memcheck)
+       add_custom_target(check
+       COMMAND make test
+       )
+endif(enable_memcheck)
 
 #######################################
-### Fill in the "make all-clean" target ###
+### Fill in the "make xxx-clean" target ###
 #######################################
 
 add_custom_target(maintainer-clean
@@ -252,66 +352,6 @@ COMMAND ${CMAKE_COMMAND} -E remove -f src/supernovae_smpi.c
 WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
 )
 
-add_custom_target(doc-clean
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/all_bib.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/all_bib.latin1.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/all_bib.latin1.html.tmp
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/logcategories.sh
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_core.bib
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_core_bib.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_core_bib.latin1.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_core_bib.latin1.html.tmp
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_count.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_extern.bib
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_extern_bib.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_extern_bib.latin1.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_extern_bib.latin1.html.tmp
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_intra.bib
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_intra_bib.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_intra_bib.latin1.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_intra_bib.latin1.html.tmp
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/tmp.realtoc
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/using_bib.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/using_bib.latin1.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/using_bib.latin1.html.tmp
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/realtoc.sh
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
-)
-
-add_custom_target(java-clean
-COMMAND ${CMAKE_COMMAND} -E remove -f src/simgrid.jar
-COMMAND ${CMAKE_COMMAND} -E remove_directory src/.classes
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/basic/BasicTest.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/basic/FinalizeTask.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/basic/Forwarder.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/basic/Master.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/basic/Slave.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/comm_time/CommTimeTest.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/comm_time/FinalizeTask.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/comm_time/Master.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/comm_time/Slave.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/ping_pong/PingPongTask.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/ping_pong/PingPongTest.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/ping_pong/Receiver.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/ping_pong/Sender.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/suspend/DreamMaster.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/suspend/LazyGuy.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/suspend/SuspendTest.class
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
-)
-
-add_custom_target(all-clean
-COMMAND make clean
-COMMAND make java-clean
-COMMAND make doc-clean
-COMMAND make supernovae-clean
-)
-if(enable_maintainer_mode)
-       add_custom_command(TARGET all-clean
-       COMMAND make maintainer-clean
-       )
-endif(enable_maintainer_mode)
-
 #############################################
 ### Fill in the "make sync-gforge" target ###
 #############################################