Restructuration of file CompleteInFiles.

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

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index e4b2c7c..c8e7226 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -83,8 +83,6 @@ endif(WIN32)
 
 set(CONTEXT_UCONTEXT 0)
 SET(CONTEXT_THREADS 0)
-SET(HAVE_RUBY 0)
-set(HAVE_LUA 0)
 SET(HAVE_TRACING 0)
 
 if(enable_tracing)
@@ -111,30 +109,6 @@ else(enable_model-checking AND HAVE_MMAP)
        SET(MMALLOC_WANT_OVERIDE_LEGACY 0)
 endif(enable_model-checking AND HAVE_MMAP)
 
-if(enable_lua)
-       if(LUA51_FOUND)
-               set(HAVE_LUA 1)
-               SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${LUA_INCLUDE_DIR} ")
-               SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${LUA_LIBRARY_DIR} ")
-       else(LUA51_FOUND)
-               message(STATUS "Warning : Lua need version 5.1")
-       endif(LUA51_FOUND)
-endif(enable_lua)
-
-#--------------------------------------------------------------------------------------------------
-### Initialize of Smpi
-
-if(enable_smpi)
-       if(HAVE_F2C_H)
-       string(REGEX MATCH "-I${HAVE_F2C_H} " operation "${CMAKE_C_FLAGS}")
-          if(NOT operation)
-                       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${HAVE_F2C_H} ")
-          endif(NOT operation)
-       else(HAVE_F2C_H)
-               message(STATUS "Warning : You should install f2c before use smpi.")
-       endif(HAVE_F2C_H)       
-endif(enable_smpi)
-
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT THREADS
 

diff --git a/buildtools/Cmake/Modules/FindF2c.cmake b/buildtools/Cmake/Modules/FindF2c.cmake
index 2c32af8..a6389a9 100644 (file)
--- a/buildtools/Cmake/Modules/FindF2c.cmake
+++ b/buildtools/Cmake/Modules/FindF2c.cmake
@@ -58,4 +58,13 @@ endif(F2C_EXE)
 
 mark_as_advanced(HAVE_F2C_H)
 mark_as_advanced(F2C_EXE)
-mark_as_advanced(HAVE_F2C_LIB)
\ No newline at end of file
+mark_as_advanced(HAVE_F2C_LIB)
+
+if(HAVE_F2C_H)
+   string(REGEX MATCH "-I${HAVE_F2C_H} " operation "${CMAKE_C_FLAGS}")
+   if(NOT operation)
+               SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${HAVE_F2C_H} ")
+   endif(NOT operation)
+else(HAVE_F2C_H)
+       message(STATUS "Warning : You should install f2c before use smpi.")
+endif(HAVE_F2C_H)
\ No newline at end of file

diff --git a/buildtools/Cmake/Modules/FindGTnets.cmake b/buildtools/Cmake/Modules/FindGTnets.cmake
index 9bb9e48..8a73343 100644 (file)
--- a/buildtools/Cmake/Modules/FindGTnets.cmake
+++ b/buildtools/Cmake/Modules/FindGTnets.cmake
@@ -47,8 +47,16 @@ else(HAVE_GTNETS_LIB AND HAVE_GTNETS)
 message(STATUS "Looking for lib gtnets patch - not found")
 endif(HAVE_GTNETS_LIB AND HAVE_GTNETS)
 
-#TODO NEED TO TEST IF PATHS ARE ALREADY SET BY CMAKE
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${HAVE_RNGSTREAM_H} -L${GTNETS_LIB_PATH} ")
+string(REGEX MATCH "-L${GTNETS_LIB_PATH} " operation "${CMAKE_C_FLAGS}")
+if(NOT operation)
+       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${GTNETS_LIB_PATH} ")
+endif(NOT operation)
+
+string(REGEX MATCH "-I${HAVE_RNGSTREAM_H} " operation "${CMAKE_C_FLAGS}")
+if(NOT operation)
+       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${HAVE_RNGSTREAM_H} ")
+endif(NOT operation)
+
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-I${HAVE_RNGSTREAM_H} -L${GTNETS_LIB_PATH} ")
 string(REGEX MATCH "${GTNETS_LIB_PATH}" operation "$ENV{LD_LIBRARY_PATH}")
 if(NOT operation)

diff --git a/buildtools/Cmake/Modules/FindLua51Simgrid.cmake b/buildtools/Cmake/Modules/FindLua51Simgrid.cmake
index 749b7db..a02222e 100644 (file)
--- a/buildtools/Cmake/Modules/FindLua51Simgrid.cmake
+++ b/buildtools/Cmake/Modules/FindLua51Simgrid.cmake
@@ -36,18 +36,6 @@ if(HAVE_LUA_H AND HAVE_LUA51_LIB AND LIB_LUA_NAME AND HAVE_LUA_BIN)
  string(REPLACE "/lib${LIB_LUA_NAME}.${LIB_EXE}" "" LUA_LIBRARY_DIR ${HAVE_LUA51_LIB})
 endif(HAVE_LUA_H AND HAVE_LUA51_LIB AND LIB_LUA_NAME AND HAVE_LUA_BIN)
 
-set(LUA_CPATH "$ENV{LUA_CPATH}")
-string(REGEX MATCH "${LIB_EXE}" LUA_CPATH "${LUA_CPATH}")
-
-if(LUA_CPATH AND APPLE)
-    message(STATUS "LUA_CPATH have extension ${LIB_EXE}")
-else(DEFINED LUA_CPATH AND APPLE)
-       if(APPLE)
-    message(STATUS "Please set LUA_CPATH with extension ${LIB_EXE}")
-    message(STATUS "For example, execute command line : export LUA_CPATH=\"./?.${LIB_EXE}\"")
-    endif(APPLE)
-endif(LUA_CPATH AND APPLE)
-
 mark_as_advanced(LUA_LIB_PATH_1)                                                                                                                      
 mark_as_advanced(LUA_LIB_PATH_2)
 mark_as_advanced(LUA_LIB_PATH_3)
@@ -74,4 +62,18 @@ endif(HAVE_LUA51_LIB)
 
 if(HAVE_LUA_BIN)
 message(STATUS "Found Lua: ${HAVE_LUA_BIN}")
-endif(HAVE_LUA_BIN)
\ No newline at end of file
+endif(HAVE_LUA_BIN)
+
+if(LUA51_FOUND)
+       set(HAVE_LUA 1)
+       string(REGEX MATCH "-I${LUA_INCLUDE_DIR} " operation "${CMAKE_C_FLAGS}")
+       if(NOT operation)
+       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${LUA_INCLUDE_DIR} ")
+       endif(NOT operation)
+       string(REGEX MATCH "-L${LUA_LIBRARY_DIR} " operation "${CMAKE_C_FLAGS}")
+       if(NOT operation)
+       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${LUA_LIBRARY_DIR} ")
+       endif(NOT operation)
+else(LUA51_FOUND)
+       message(STATUS "Warning : Lua need version 5.1")
+endif(LUA51_FOUND)
\ No newline at end of file

diff --git a/buildtools/Cmake/Modules/FindRubySimgrid.cmake b/buildtools/Cmake/Modules/FindRubySimgrid.cmake
index aaf092f..1277feb 100644 (file)
--- a/buildtools/Cmake/Modules/FindRubySimgrid.cmake
+++ b/buildtools/Cmake/Modules/FindRubySimgrid.cmake
@@ -1,7 +1,33 @@
 include(FindRuby)
 
+if(RUBY_EXECUTABLE)
+       message(STATUS "Found ruby:     ${RUBY_EXECUTABLE}")
+endif(RUBY_EXECUTABLE)
+
+message(STATUS "Looking for ruby.h")
+if(RUBY_INCLUDE_DIR)
+message(STATUS "Looking for ruby.h - found")
+else(RUBY_INCLUDE_DIR)
+message(STATUS "Looking for ruby.h - not found")
+endif(RUBY_INCLUDE_DIR)
+
+message(STATUS "Looking for confi.h")
+if(RUBY_CONFIG_INCLUDE_DIR)
+message(STATUS "Looking for config.h - found")
+else(RUBY_CONFIG_INCLUDE_DIR)
+message(STATUS "Looking for config.h - not found")
+endif(RUBY_CONFIG_INCLUDE_DIR)
+
+message(STATUS "Looking for lib ruby")
+if(RUBY_LIBRARY)
+message(STATUS "Looking for lib ruby - found")
+else(RUBY_LIBRARY)
+message(STATUS "Looking for lib ruby - not found")
+endif(RUBY_LIBRARY)
+
 if(RUBY_LIBRARY)
        set(LIB_RUBY_VERSION "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}")
+       message(STATUS "Lib ruby version: ${LIB_RUBY_VERSION}")
        if(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "9")
                string(REGEX MATCH "ruby.*[0-9]" RUBY_LIBRARY_NAME ${RUBY_LIBRARY})
                if(NOT RUBY_LIBRARY_NAME)
@@ -25,30 +51,4 @@ endif(RUBY_LIBRARY)
 
 if(NOT RUBY_EXECUTABLE)
        message(STATUS "Warning : you don't have ruby executable so you can compile and build examples but can't execute them!!!") 
-endif(NOT RUBY_EXECUTABLE)
-
-if(RUBY_EXECUTABLE)
-       message(STATUS "Found ruby:     ${RUBY_EXECUTABLE}")
-endif(RUBY_EXECUTABLE)
-
-message(STATUS "Looking for ruby.h")
-if(RUBY_INCLUDE_DIR)
-message(STATUS "Looking for ruby.h - found")
-else(RUBY_INCLUDE_DIR)
-message(STATUS "Looking for ruby.h - not found")
-endif(RUBY_INCLUDE_DIR)
-
-message(STATUS "Looking for confi.h")
-if(RUBY_CONFIG_INCLUDE_DIR)
-message(STATUS "Looking for config.h - found")
-else(RUBY_CONFIG_INCLUDE_DIR)
-message(STATUS "Looking for config.h - not found")
-endif(RUBY_CONFIG_INCLUDE_DIR)
-
-message(STATUS "Looking for lib ruby")
-if(RUBY_LIBRARY)
-message(STATUS "Looking for lib ruby - found")
-message(STATUS "Lib ruby version: ${LIB_RUBY_VERSION}")
-else(RUBY_LIBRARY)
-message(STATUS "Looking for lib ruby - not found")
-endif(RUBY_LIBRARY)
\ No newline at end of file
+endif(NOT RUBY_EXECUTABLE)
\ No newline at end of file

diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh
index 45dc876..18086c9 100644 (file)
--- a/buildtools/pipol/Nightly_simgrid.sh
+++ b/buildtools/pipol/Nightly_simgrid.sh
@@ -3,21 +3,22 @@
 #PRE-PIPOL /home/mescal/navarro/pre-simgrid.sh
 
 #PIPOL esn i386-linux-ubuntu-intrepid.dd.gz none 02:00 --user --silent
+#PIPOL esn amd64-linux-ubuntu-intrepid.dd.gz none 02:00 --user --silent
 
 #PIPOL esn i386-linux-ubuntu-jaunty.dd.gz none 02:00 --user --silent
+#PIPOL esn amd64-linux-ubuntu-jaunty.dd.gz none 02:00 --user --silent
 
 #PIPOL esn i386-linux-ubuntu-karmic.dd.gz none 02:00 --user --silent
 #PIPOL esn amd64-linux-ubuntu-karmic.dd.gz none 02:00 --user --silent
 
-#PIPOL esn i386-linux-debian-lenny.dd.gz none 02:00 --user --silent
-#PIPOL esn amd64-linux-debian-lenny.dd.gz none 02:00 --user --silent
-
-#PIPOL esn i386-linux-debian-testing.dd none 02:00 --user --silent
-
 #PIPOL esn i386-linux-fedora-core11.dd.gz none 02:00 --user --silent
+#PIPOL esn amd64-linux-fedora-core11.dd.gz none 02:00 --user --silent
+
+#PIPOL esn i386_kvm-linux-debian-lenny none 02:00 --user --silent
+#PIPOL esn i386_kvm-linux-debian-testing none 02:00 --user --silent
 
-#PIPOL esn i386-linux-fedora-core12.dd.gz none 02:00 --user --silent
-#PIPOL esn amd64-linux-fedora-core12.dd.gz none 02:00 --user --silent
+#PIPOL esn amd64_kvm-linux-debian-lenny none 02:00 --user --silent
+#PIPOL esn amd64_kvm-linux-debian-testing none 02:00 --user --silent
 
 SYSTEM=`uname`
 
@@ -217,8 +218,18 @@ if [ $SYSTEM = Linux ] ; then
        cd simgrid-trunk
        
        if [ -e $userhome/usr/lib/libgtsim-opt.so ] ; then
-               #Make gtnets
-               cmake -Denable_supernovae=off -Denable_compile_warnings=off -Denable_compile_optimizations=off ./
+               #gtnets
+               cmake -Denable_lua=on \
+               -Denable_ruby=on \
+               -Denable_lib_static=on \
+               -Denable_graphviz=on \
+               -Denable_model-checking=off \
+               -Denable_tracing=on \
+               -Denable_latency_bound_tracking=on \
+               -Denable_gtnets=on \
+               -Denable_java=on \
+               -Dwith_context=auto \
+               -Denable_smpi=on .
                ctest -D NightlyStart
                ctest -D NightlyConfigure
                ctest -D NightlyBuild
@@ -230,7 +241,8 @@ fi
 
 if( $PIPOL_IMAGE = i386-linux-ubuntu-karmic.dd.gz )
        #Make the memcheck mode
-       cmake -Denable_gtnets=off -Denable_memcheck=on ./
+       cmake -Denable_gtnets=off \
+       -Denable_memcheck=on ./
        ctest -D NightlyStart
        ctest -D NightlyConfigure
        ctest -D NightlyBuild