Cosmetics and remove bindings if there are enabled.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7552 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index 9dc2b8b..1a76c57 100644 (file)
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -75,6 +75,21 @@ COMMAND echo "install doc ok"
 WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
 )
 
 WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
 )
 

+add_custom_target(uninstall
+COMMAND rm -rf ${prefix}/doc/simgrid
+COMMAND echo "uninstall doc ok"
+COMMAND rm ${uninstall_libs}
+COMMAND echo "uninstall lib ok"
+COMMAND rm ${uninstall_bins}
+COMMAND rm ${prefix}/bin/simgrid_colorizer.pl
+COMMAND echo "uninstall bin ok"
+COMMAND rm ${uninstall_HEADERS}
+COMMAND echo "uninstal include ok"
+COMMAND rm -R ${prefix}/include/amok ${prefix}/include/gras ${prefix}/include/instr ${prefix}/include/msg 
+COMMAND rm -R ${prefix}/include/simdag ${prefix}/include/smpi ${prefix}/include/surf ${prefix}/include/xbt
+WORKING_DIRECTORY "${prefix}"
+)
+

 if(HAVE_JAVA)
        add_custom_command(TARGET install-simgrid
        COMMAND echo "install binding java"
 if(HAVE_JAVA)
        add_custom_command(TARGET install-simgrid
        COMMAND echo "install binding java"


@@ -82,6 +97,11 @@ if(HAVE_JAVA)
        COMMAND cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${prefix}/share/simgrid.jar
        WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
        )
        COMMAND cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${prefix}/share/simgrid.jar
        WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
        )

+       add_custom_command(TARGET uninstall
+       COMMAND rm ${prefix}/share/simgrid.jar
+       COMMAND echo "uninstall binding java"
+       WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
+       )       

 endif(HAVE_JAVA)
 
 if(HAVE_LUA)
 endif(HAVE_JAVA)
 
 if(HAVE_LUA)


@@ -91,6 +111,11 @@ if(HAVE_LUA)
        COMMAND ln -sf ${prefix}/lib/libsimgrid.so ${prefix}/lib/lua/5.1/simgrid.so
        WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
        )
        COMMAND ln -sf ${prefix}/lib/libsimgrid.so ${prefix}/lib/lua/5.1/simgrid.so
        WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
        )

+       add_custom_command(TARGET uninstall
+       COMMAND echo "uninstall binding lua"
+       COMMAND rm ${prefix}/lib/lua/5.1/simgrid.so     
+       WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
+       )

 endif(HAVE_LUA)
 
 if(HAVE_RUBY)
 endif(HAVE_LUA)
 
 if(HAVE_RUBY)


@@ -101,29 +126,14 @@ if(HAVE_RUBY)
        COMMAND cp ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid.rb ${prefix}/lib/site_ruby${install_link_ruby}/simgrid.rb
        WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
        )
        COMMAND cp ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid.rb ${prefix}/lib/site_ruby${install_link_ruby}/simgrid.rb
        WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
        )

+       add_custom_command(TARGET uninstall
+       COMMAND echo "uninstall binding ruby"
+       COMMAND rm ${prefix}/lib/site_ruby${install_link_ruby}/libsimgrid.so
+       COMMAND rm ${prefix}/lib/site_ruby${install_link_ruby}/simgrid.rb
+       WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
+       )

 endif(HAVE_RUBY)
 
 endif(HAVE_RUBY)
 

-add_custom_target(uninstall
-COMMAND echo "uninstall simgrid"
-COMMAND rm -rf ${prefix}/doc/simgrid
-COMMAND echo "uninstall doc ok"
-COMMAND rm ${uninstall_libs}
-COMMAND echo "uninstall lib ok"
-COMMAND rm ${uninstall_bins}
-COMMAND rm ${prefix}/bin/simgrid_colorizer.pl
-COMMAND echo "uninstall bin ok"
-COMMAND rm ${uninstall_HEADERS}
-COMMAND echo "uninstal include ok"
-COMMAND rm ${prefix}/share/simgrid.jar
-COMMAND rm ${prefix}/lib/lua/5.1/simgrid.so
-COMMAND rm ${prefix}/lib/site_ruby${install_link_ruby}/libsimgrid.so
-COMMAND rm ${prefix}/lib/site_ruby${install_link_ruby}/simgrid.rb
-COMMAND echo "uninstal bindings"
-COMMAND rm -R ${prefix}/include/amok ${prefix}/include/gras ${prefix}/include/instr ${prefix}/include/msg 
-COMMAND rm -R ${prefix}/include/simdag ${prefix}/include/smpi ${prefix}/include/surf ${prefix}/include/xbt
-WORKING_DIRECTORY "${prefix}"
-)
-

 add_custom_target(html
 COMMAND echo "Make the html doc"
 COMMAND echo "cmake -DBIBTEX2HTML=${BIBTEX2HTML} ./"
 add_custom_target(html
 COMMAND echo "Make the html doc"
 COMMAND echo "cmake -DBIBTEX2HTML=${BIBTEX2HTML} ./"

diff --git a/buildtools/Cmake/src/CMakeMaintainerMode.txt b/buildtools/Cmake/src/CMakeMaintainerMode.txt
index 8b50083..b105a70 100644 (file)
--- a/buildtools/Cmake/src/CMakeMaintainerMode.txt
+++ b/buildtools/Cmake/src/CMakeMaintainerMode.txt
@@ -121,6 +121,7 @@ message("")
 message("________________________________________________________________________________")
 message("________________________________________________________________________________ SG_UNIT_EXTRACTOR END")
 
 message("________________________________________________________________________________")
 message("________________________________________________________________________________ SG_UNIT_EXTRACTOR END")
 

+#Those lines permit to remake a cmake configure if "sources to look" have been changed

 foreach(file ${SRC_TO_LOOK})
        configure_file(${file} ${file} COPYONLY)
 endforeach(file ${SRC_TO_LOOK})
 foreach(file ${SRC_TO_LOOK})
        configure_file(${file} ${file} COPYONLY)
 endforeach(file ${SRC_TO_LOOK})

diff --git a/buildtools/Cmake/src/CMakePrintArgs.txt b/buildtools/Cmake/src/CMakePrintArgs.txt
index 2e66a20..b31cb18 100644 (file)
--- a/buildtools/Cmake/src/CMakePrintArgs.txt
+++ b/buildtools/Cmake/src/CMakePrintArgs.txt
@@ -106,7 +106,6 @@ message("   Simgrid dependencies:   ${SIMGRID_DEP}")
 message("      Gras dependencies   :   ${GRAS_DEP}")
 message("      Smpi dependencies   :   ${SMPI_DEP}")
 message("")
 message("      Gras dependencies   :   ${GRAS_DEP}")
 message("      Smpi dependencies   :   ${SMPI_DEP}")
 message("")

-message("      USER_PREFIX   :         ${prefix}")

 message("      INSTALL_PREFIX:         ${CMAKE_INSTALL_PREFIX}")
 message("")
 
 message("      INSTALL_PREFIX:         ${CMAKE_INSTALL_PREFIX}")
 message("")