Cosmetics and generate lib links for bindings correctely.

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

diff --git a/.gitignore b/.gitignore
index 33facad..807f3a3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -68,8 +68,8 @@ src/simgrid_units_main.c
 *_unit.c
 src/supernovae_*.c
 
-buildtools/Cmake/src/tmp_gras_config.h.in
-buildtools/Cmake/src/tmp_tracing_config.h.in
+buildtools/Cmake/tmp_gras_config.h.in
+buildtools/Cmake/tmp_tracing_config.h.in
 make_simgrid_java.sh
 
 testgraph.dot

diff --git a/buildtools/Cmake/CTestConfig.cmake b/buildtools/Cmake/CTestConfig.cmake
index 0a67c37..b22809a 100644 (file)
--- a/buildtools/Cmake/CTestConfig.cmake
+++ b/buildtools/Cmake/CTestConfig.cmake
@@ -31,6 +31,10 @@ if(enable_memcheck)
        SET(BUILDNAME "MEMCHECK" CACHE TYPE INTERNAL FORCE)
 endif(enable_memcheck)
 
+if(WIN32)
+       SET(BUILDNAME "WINDOWS" CACHE TYPE INTERNAL FORCE)
+endif(WIN32)
+
 set(osname ${CMAKE_SYSTEM_NAME})
 set(cpu ${CMAKE_SYSTEM_PROCESSOR})
 set(DISTRIB2 ${CMAKE_SYSTEM_VERSION})

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index f962f0b..5becaa8 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -692,11 +692,11 @@ endif(ADDR2LINE)
 configure_file(${PROJECT_DIRECTORY}/src/context_sysv_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/context_sysv_config.h)
 
 SET( CMAKEDEFINE "#cmakedefine" )
-configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/gras_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h" @ONLY IMMEDIATE)
-configure_file("${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h" "${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h" @ONLY IMMEDIATE)
-configure_file("${PROJECT_DIRECTORY}/include/simgrid_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_config.h" @ONLY IMMEDIATE)
-configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/tracing_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
-configure_file("${CMAKE_CURRENT_BINARY_DIR}/include/instr/tracing_config.h" "${CMAKE_CURRENT_BINARY_DIR}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
+configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/gras_config.h.in" "${PROJECT_DIRECTORY}/include/gras_config.h" @ONLY IMMEDIATE)
+configure_file("${PROJECT_DIRECTORY}/include/gras_config.h" "${PROJECT_DIRECTORY}/include/gras_config.h" @ONLY IMMEDIATE)
+configure_file("${PROJECT_DIRECTORY}/include/simgrid_config.h.in" "${PROJECT_DIRECTORY}/include/simgrid_config.h" @ONLY IMMEDIATE)
+configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/tracing_config.h.in" "${PROJECT_DIRECTORY}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
+configure_file("${PROJECT_DIRECTORY}/include/instr/tracing_config.h" "${PROJECT_DIRECTORY}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
 
 if(NOT prefix)
        set(prefix /usr/local)

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index cb41d4d..9d116b7 100755 (executable)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -344,9 +344,6 @@ set(MC_SRC
 
 
 set(install_HEADERS
-include/gras.h 
-include/xbt.h
-include/simgrid_config.h
 include/xbt/misc.h
 include/xbt/sysdep.h
 include/xbt/virtu.h
@@ -399,6 +396,9 @@ include/amok/peermanagement.h
 include/amok/bandwidth.h
 include/instr/instr.h
 include/instr/tracing_config.h
+include/simgrid_config.h
+include/gras.h 
+include/xbt.h
 )
 
 set(TEST_UNITS
@@ -726,7 +726,6 @@ set(source_to_pack
        ${txt_files}
        ${TEST_CFILES}
        ${EXTRA_DIST}
-       
        CMakeLists.txt
        buildtools/Cmake/CTestConfig.cmake
        buildtools/Cmake/CompleteInFiles.cmake
@@ -742,7 +741,6 @@ set(source_to_pack
        buildtools/Cmake/Supernovae.cmake
        buildtools/Cmake/AddTests.cmake
        buildtools/Cmake/memcheck_tests.cmake
-       # FIXME: these should live in src/ and the content of src in root of Cmake/ maybe
        buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c
        buildtools/Cmake/test_prog/prog_getline.c
        buildtools/Cmake/test_prog/prog_GRAS_ARCH.c
@@ -758,10 +756,8 @@ set(source_to_pack
        buildtools/Cmake/test_prog/prog_stacksetup.c
        buildtools/Cmake/test_prog/prog_va_copy.c
        buildtools/Cmake/test_prog/prog_vsnprintf.c
-       # FIXME: these are badly named and placed
        buildtools/Cmake/gras_config.h.in
        buildtools/Cmake/tracing_config.h.in
-       
        AUTHORS
        ChangeLog
        COPYING
@@ -810,19 +806,3 @@ set(source_to_pack
        src/bindings/rubyDag/rb_simdag.c
        src/bindings/rubyDag/simdag.rb
 )
-#set(script_to_install
-#      src/smpi/smpicc
-#      src/smpi/smpirun
-#      tools/MSG_visualization/colorize.pl
-#)
-#      tools/sg_unit_extractor.pl
-#      tools/doxygen/index_create.pl
-#      tools/doxygen/toc_create.pl
-#      tools/doxygen/index_php.pl
-#      tools/doxygen/doxygen_postprocesser.pl
-#      tools/doxygen/bibtex2html_table_count.pl
-#      tools/doxygen/bibtex2html_postprocessor.pl
-#      tools/doxygen/xbt_log_extract_hierarchy.pl
-#      tools/MSG_visualization/trace2fig.pl
-
-#message("\n\ntesh:\n${txt_files}")

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index e1c87a3..ac7c204 100755 (executable)
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -5,7 +5,9 @@ set(CMAKE_INSTALL_PREFIX ${prefix} CACHE TYPE INTERNAL FORCE)
 #########################################
          
 # doc
-if(EXISTS ${PROJECT_DIRECTORY}/doc/html/)
+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}${prefix}/doc/simgrid/html/"
          PATTERN ".svn" EXCLUDE 
@@ -13,8 +15,6 @@ if(EXISTS ${PROJECT_DIRECTORY}/doc/html/)
          PATTERN "*.o" EXCLUDE
          PATTERN "*~" EXCLUDE
        )
-endif(EXISTS ${PROJECT_DIRECTORY}/doc/html/)
-
 # binaries
 install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/smpicc
                  ${CMAKE_BINARY_DIR}/bin/smpirun
@@ -60,18 +60,27 @@ if(HAVE_JAVA)
 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(lua_simgrid ALL
+               COMMAND ${CMAKE_COMMAND} -E create_symlink ../../libsimgrid.so ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.so
+               )
+       install(FILES ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.so
+               DESTINATION $ENV{DESTDIR}${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
+       COMMAND ${CMAKE_COMMAND} -E create_symlink ../../../libsimgrid.so ${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}/libsimgrid.so
+       )
+       install(FILES ${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}/libsimgrid.so
+               DESTINATION $ENV{DESTDIR}${prefix}/lib/ruby/${install_link_ruby}/
+       )
+       install(FILES ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid.rb
+               DESTINATION $ENV{DESTDIR}${prefix}/lib/ruby/${install_link_ruby}/)
+
 endif(HAVE_RUBY)
 
 ###########################################
@@ -81,13 +90,15 @@ endif(HAVE_RUBY)
 add_custom_target(uninstall
 COMMAND ${CMAKE_COMMAND} -E    remove_directory ${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 ${prefix}/lib/libgras*
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${prefix}/lib/libsimgrid*
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${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 ${prefix}/bin/smpicc
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${prefix}/bin/smpirun
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${prefix}/bin/tesh
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${prefix}/bin/simgrid-colorizer
 COMMAND ${CMAKE_COMMAND} -E    echo "uninstall bin ok"
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${uninstall_HEADERS}
-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
@@ -96,20 +107,25 @@ 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
+COMMAND ${CMAKE_COMMAND} -E    remove_directory ${prefix}/include/mc
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${prefix}/include/simgrid_config.h
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${prefix}/include/gras.h 
+COMMAND ${CMAKE_COMMAND} -E    remove -f ${prefix}/include/xbt.h
+COMMAND ${CMAKE_COMMAND} -E    echo "uninstal include ok"
 WORKING_DIRECTORY "${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 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 echo "uninstall binding lua ok"
        COMMAND ${CMAKE_COMMAND} -E remove -f ${prefix}/lib/lua/5.1/simgrid.so  
        WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
        )
@@ -118,7 +134,7 @@ 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 echo "uninstall binding ruby ok"
        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
        WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
@@ -133,11 +149,11 @@ add_custom_target(html
 COMMAND ${CMAKE_COMMAND} -E echo "Make the html doc"
 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"
 )
 
 ################################################################

diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake
index 4649640..642e2c9 100644 (file)
--- a/buildtools/Cmake/MakeExeLib.cmake
+++ b/buildtools/Cmake/MakeExeLib.cmake
@@ -1,7 +1,7 @@
 ### Make Libs
 
 if(enable_supernovae AND NOT WIN32)
-       include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeSupernovae.txt)
+       include(${PROJECT_DIRECTORY}/buildtools/Cmake/Supernovae.cmake)
 else(enable_supernovae AND NOT WIN32)  
        add_library(simgrid SHARED ${simgrid_sources})
        add_library(simgrid_static STATIC ${simgrid_sources})

diff --git a/buildtools/Cmake/gras_config.h.in b/buildtools/Cmake/gras_config.h.in
index ef71eb1..ae34b1b 100644 (file)
--- a/buildtools/Cmake/gras_config.h.in
+++ b/buildtools/Cmake/gras_config.h.in
@@ -1,4 +1,4 @@
-// <root>/buildtools/Cmake/src/c_gras_config.h.in is user-written.
+// <root>/buildtools/Cmake/gras_config.h.in is user-written.
 // With Cmake it creates <root>/src/gras_config.h
 
 /* Set to true if enable_model-checking is true */

diff --git a/doc/FAQ.doc b/doc/FAQ.doc
index 0014620..9531897 100644 (file)
--- a/doc/FAQ.doc
+++ b/doc/FAQ.doc
@@ -734,7 +734,7 @@ add_executable(get_sender get_sender.c)                                     #add_executable(<name_of_target> <sr
 target_link_libraries(get_sender simgrid m pthread -fprofile-arcs)     #target_link_libraries(<name_of_targe> <dependencies>)
 \endverbatim
 
-Then you have to modified <project/directory>/buildtools/Cmake/src/CMakeMakeExeLib.txt and add 
+Then you have to modified <project/directory>/buildtools/Cmake/CMakeMakeExeLib.txt and add 
 this line :
 \verbatim
 add_subdirectory(${PROJECT_DIRECTORY}/<path_where_is_CMakeList.txt>)
@@ -742,7 +742,7 @@ add_subdirectory(${PROJECT_DIRECTORY}/<path_where_is_CMakeList.txt>)
 
 \subsubsection faq_cmakehowto2 Delete/add sources to lib.
 
-If you want modified, add or delete source files from a library you have to edit <project/directory>/buildtools/Cmake/src/CMakeDefinePackages.txt
+If you want modified, add or delete source files from a library you have to edit <project/directory>/buildtools/Cmake/CMakeDefinePackages.txt
 
 \verbatim
 set(JMSG_JAVA_SRC
@@ -763,7 +763,7 @@ set(JMSG_JAVA_SRC
 
 \subsubsection faq_cmakehowto3 Add test
 
-If you want modified, add or delete tests you have to edit <project/directory>/buildtools/Cmake/src/CMakeTest.txt 
+If you want modified, add or delete tests you have to edit <project/directory>/buildtools/Cmake/CMakeTest.txt 
 with this function : ADD_TEST(<name> <bin> <ARGS>)
 
 \verbatim
@@ -832,18 +832,18 @@ Here is a list of files involved into cmake build (relative to project directory
 
 Cmake sources:
        ./doc/CMakeLists.txt
-       ./buildtools/Cmake/src/CMakeCompleteInFiles.txt
-       ./buildtools/Cmake/src/CMakeDocs.txt
-       ./buildtools/Cmake/src/CMakeMakeExeLib.txt
-       ./buildtools/Cmake/src/CMakePrintArgs.txt
-       ./buildtools/Cmake/src/CMakeDefinePackages.txt
-       ./buildtools/Cmake/src/CMakeFlags.txt
-       ./buildtools/Cmake/src/CMakeSupernovae.txt
-       ./buildtools/Cmake/src/CMakeDistrib.txt
-       ./buildtools/Cmake/src/CMakeMaintainerMode.txt
-       ./buildtools/Cmake/src/CMakeOption.txt
-       ./buildtools/Cmake/src/CMakeTest.txt
-       ./buildtools/Cmake/src/CTestConfig.cmake
+       ./buildtools/Cmake/CMakeCompleteInFiles.txt
+       ./buildtools/Cmake/CMakeDocs.txt
+       ./buildtools/Cmake/CMakeMakeExeLib.txt
+       ./buildtools/Cmake/CMakePrintArgs.txt
+       ./buildtools/Cmake/CMakeDefinePackages.txt
+       ./buildtools/Cmake/CMakeFlags.txt
+       ./buildtools/Cmake/CMakeSupernovae.txt
+       ./buildtools/Cmake/CMakeDistrib.txt
+       ./buildtools/Cmake/CMakeMaintainerMode.txt
+       ./buildtools/Cmake/CMakeOption.txt
+       ./buildtools/Cmake/CMakeTest.txt
+       ./buildtools/Cmake/CTestConfig.cmake
 
 Test files for define properties :
        ./buildtools/Cmake/prog_test/prog_GRAS_ARCH.c