Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Refresh or delete some options.
authornavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Tue, 9 Mar 2010 09:51:01 +0000 (09:51 +0000)
committernavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Tue, 9 Mar 2010 09:51:01 +0000 (09:51 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7207 48e7efb5-ca39-0410-a469-dd3cf9ba447f

23 files changed:
buildtools/CPACK/simgrid_CMakeList/examples/amok/bandwidth/CMakeLists.txt
buildtools/CPACK/simgrid_CMakeList/examples/amok/saturate/CMakeLists.txt
buildtools/CPACK/simgrid_CMakeList/examples/gras/all2all/CMakeLists.txt
buildtools/CPACK/simgrid_CMakeList/examples/gras/chrono/CMakeLists.txt
buildtools/CPACK/simgrid_CMakeList/examples/gras/mmrpc/CMakeLists.txt
buildtools/CPACK/simgrid_CMakeList/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt
buildtools/CPACK/simgrid_CMakeList/examples/gras/ping/CMakeLists.txt
buildtools/CPACK/simgrid_CMakeList/examples/gras/pmm/CMakeLists.txt
buildtools/CPACK/simgrid_CMakeList/examples/gras/properties/CMakeLists.txt
buildtools/CPACK/simgrid_CMakeList/examples/gras/rpc/CMakeLists.txt
buildtools/CPACK/simgrid_CMakeList/examples/gras/spawn/CMakeLists.txt
buildtools/CPACK/simgrid_CMakeList/examples/gras/synchro/CMakeLists.txt
buildtools/CPACK/simgrid_CMakeList/examples/gras/timer/CMakeLists.txt
buildtools/CPACK/simgrid_CMakeList/teshsuite/gras/empty_main/CMakeLists.txt
buildtools/CPACK/simgrid_CMakeList/teshsuite/gras/msg_handle/CMakeLists.txt
buildtools/CPACK/simgrid_CMakeList/teshsuite/gras/small_sleep/CMakeLists.txt
buildtools/CPACK/src/CMakeDistrib.txt
buildtools/CPACK/src/CMakeDocs.txt
buildtools/CPACK/src/CMakeFLEXml.txt
buildtools/CPACK/src/CMakeFlags.txt
buildtools/CPACK/src/CMakeMakeExeLib.txt
buildtools/CPACK/src/CMakeOption.txt
buildtools/CPACK/src/CMakePrintArgs.txt

index 06935ef..78b8485 100644 (file)
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 
+set_source_files_properties(_bandwidth_simulator.c _bandwidth_maestro.c _bandwidth_sensor.c
+PROPERTIES GENERATED true)
+
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
index d9a6a70..9038f98 100644 (file)
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 
+set_source_files_properties(_saturate_simulator.c _saturate_maestro.c _saturate_sensor.c
+PROPERTIES GENERATED true)
+
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
index 90ed053..da39056 100644 (file)
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 
+set_source_files_properties(_all2all_simulator.c _all2all_sender.c _all2all_receiver.c
+PROPERTIES GENERATED true)
+
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
index 404fbd5..692fd83 100644 (file)
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 
+set_source_files_properties(_chrono_simulator.c _chrono_multiplier.c
+PROPERTIES GENERATED true)
+
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
index eda8779..272ee1e 100644 (file)
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 
+set_source_files_properties(_mmrpc_simulator.c _mmrpc_client.c _mmrpc_server.c
+PROPERTIES GENERATED true)
+
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
index be86292..b78e403 100644 (file)
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 
+set_source_files_properties(_simple_token_simulator.c _simple_token_node.c
+PROPERTIES GENERATED true)
+
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
index c0a1c3b..2718131 100644 (file)
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 
+set_source_files_properties(_ping_simulator.c _ping_client.c _ping_server.c
+PROPERTIES GENERATED true)
+
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
index d5537c9..6b791d2 100644 (file)
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 
+set_source_files_properties(_pmm_simulator.c _pmm_slave.c _pmm_master.c
+PROPERTIES GENERATED true)
+
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
index aa04b4f..ca58773 100644 (file)
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 
+set_source_files_properties(_properties_simulator.c _properties_alice.c _properties_bob.c
+PROPERTIES GENERATED true)
+
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
index cbf8109..c1f9cbf 100644 (file)
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 
+set_source_files_properties(_rpc_simulator.c _rpc_client.c _rpc_forwarder.c _rpc_server.c
+PROPERTIES GENERATED true)
+
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
index 621a8e3..cc5e556 100644 (file)
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 
+set_source_files_properties(_spawn_simulator.c _spawn_child.c _spawn_father.c
+PROPERTIES GENERATED true)
+
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
index 426381f..50a16a1 100644 (file)
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 
+set_source_files_properties(_synchro_simulator.c _synchro_philosopher.c
+PROPERTIES GENERATED true)
+
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
index bfacca9..4709602 100644 (file)
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 
+set_source_files_properties(_timer_simulator.c _timer_client.c
+PROPERTIES GENERATED true)
+
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
index c4451fa..7949dce 100644 (file)
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 
+set_source_files_properties(_empty_main_function.c _empty_main_simulator.c
+PROPERTIES GENERATED true)
+
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
index c286e41..82921c0 100644 (file)
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 
+set_source_files_properties(_msg_handle_simulator.c _msg_handle_client.c _msg_handle_server.c
+PROPERTIES GENERATED true)
+
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
index 6052df3..3684c2c 100644 (file)
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 
+set_source_files_properties(_small_sleep_function.c _small_sleep_simulator.c
+PROPERTIES GENERATED true)
+
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
index 140aa5e..06401cc 100644 (file)
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 2.6)
-
 set(simgrid_version "3.3.5")
 
 set(CMAKE_PROJECT_NAME "${PROJECT_NAME}")
@@ -8,8 +6,6 @@ set(CPACK_PROJECT_NAME "${PROJECT_NAME}")
 set(CPACK_PACKAGE_FILE_NAME "simgrid-${simgrid_version}_rev_${SVN_VERSION}")
 set(CPACK_GENERATOR "TBZ2") #;TGZ;TZ;ZIP
 
-if(distrib)
-
 set(to_svg     
        ${XBT_RL_SRC}
        ${EXTRA_DIST}
@@ -40,59 +36,52 @@ set(to_svg
        ${PROJECT_DIRECTORY}/./README
        ${PROJECT_DIRECTORY}/./README.IEEE
        ${PROJECT_DIRECTORY}/./TODO
-       )
+)
        
-       foreach(file ${to_svg})
-               get_filename_component(file_location ${file} PATH)
-               string(REPLACE "${PROJECT_DIRECTORY}/" "/" file_location ${file_location})
-               #message("install: ${file}\nDESTINATION: ${file_location}")
-               install(FILES ${file} DESTINATION "${file_location}")
-       endforeach(file ${EXTRA_DIST})
-
-       ###copy doc
-       install(DIRECTORY "${PROJECT_DIRECTORY}/doc/"
-       DESTINATION "doc/"
-       PATTERN ".svn" EXCLUDE 
-       PATTERN ".git" EXCLUDE 
-       PATTERN "*~" EXCLUDE
-       )
+foreach(file ${to_svg})
+       get_filename_component(file_location ${file} PATH)
+       string(REPLACE "${PROJECT_DIRECTORY}/" "/" file_location ${file_location})
+       #message("install: ${file}\nDESTINATION: ${file_location}")
+       install(FILES ${file} DESTINATION "${file_location}")
+endforeach(file ${EXTRA_DIST})
 
-       ###buildtools 
-       install(DIRECTORY "${PROJECT_DIRECTORY}/buildtools/CPACK/"
-       DESTINATION "buildtools/CPACK/"
-       PATTERN ".svn" EXCLUDE 
-       PATTERN ".git" EXCLUDE 
-       PATTERN "*~" EXCLUDE
-       )
-       set(CPACK_SET_DESTDIR on)
-       set(CMAKE_INSTALL_PREFIX .)
+###copy doc
+install(DIRECTORY "${PROJECT_DIRECTORY}/doc/"
+DESTINATION "doc/"
+PATTERN ".svn" EXCLUDE 
+PATTERN ".git" EXCLUDE 
+PATTERN "*~" EXCLUDE
+)
 
-endif(distrib)
-
-if(NOT distrib)
-       
-       ###install libs
-       install(DIRECTORY "${PROJECT_DIRECTORY}/src/.libs/"
-       DESTINATION "lib/"
-       )
+###buildtools 
+install(DIRECTORY "${PROJECT_DIRECTORY}/buildtools/CPACK/"
+DESTINATION "buildtools/CPACK/"
+PATTERN ".svn" EXCLUDE 
+PATTERN ".git" EXCLUDE 
+PATTERN "*~" EXCLUDE
+)
 
-       ###install include
-       install(
-       DIRECTORY "${PROJECT_DIRECTORY}/include/" 
-       DESTINATION "include/" 
-       PATTERN ".svn" EXCLUDE 
-       PATTERN ".git" EXCLUDE 
-       PATTERN "*~" EXCLUDE
-       )
+set(CPACK_SET_DESTDIR on)
+set(CMAKE_INSTALL_PREFIX ${prefix} CACHE TYPE INTERNAL FORCE)
 
-       ###install doc
-       install(
-       DIRECTORY "${PROJECT_DIRECTORY}/doc/html/" 
-       DESTINATION "doc/simgrid/html" 
-       )       
-       set(CPACK_SET_DESTDIR on)
-       set(CMAKE_INSTALL_PREFIX ${prefix})
+add_custom_target(install-simgrid
+COMMAND mkdir -p ${prefix}
+COMMAND mkdir -p ${prefix}/lib
+COMMAND mkdir -p ${prefix}/include
+COMMAND mkdir -p ${prefix}/doc
+COMMAND mkdir -p ${prefix}/doc/simgrid
+COMMAND mkdir -p ${prefix}/doc/simgrid/html
+COMMAND cp -rf ${PROJECT_DIRECTORY}/src/.libs/* ${prefix}/lib/
+COMMAND echo "install lib ok"
+COMMAND cp -rf ${PROJECT_DIRECTORY}/include/ ${prefix}
+COMMAND echo "install include ok"
+COMMAND cp -rf ${PROJECT_DIRECTORY}/doc/html/ ${prefix}/doc/simgrid
+COMMAND echo "install doc ok"
+)
 
-endif(NOT distrib)
+add_custom_target(uninstall
+COMMAND echo "uninstall simgrid"
+COMMAND echo "TODO"
+)
 
 include(CPack)
index cbba863..6301311 100644 (file)
@@ -1,4 +1,4 @@
-if(MAINTAINER_MODE)
+if(enable_maintainer_mode)
 
        find_path(FIG2DEV_PATH  NAMES fig2dev   PATHS NO_DEFAULT_PATHS)
        find_path(DOXYGEN_PATH  NAMES doxygen   PATHS NO_DEFAULT_PATHS)
@@ -156,33 +156,18 @@ if(MAINTAINER_MODE)
 
        endif(DOXYGEN_PATH AND FIG2DEV_PATH)
 
-       write_file("${PROJECT_DIRECTORY}/doc/logcategories.sh"
-       "#! /bin/sh     
-       pwd=`pwd`
-       rm -f $pwd/logcategories.doc
-       set -e
-       echo "/* Generated file, do not edit */"        > $pwd/logcategories.doc
-       echo "/** \addtogroup XBT_log_cats"             >> $pwd/logcategories.doc
-       echo "    @{"                                   >> $pwd/logcategories.doc
-       cd ${PROJECT_DIRECTORY}/src
-       ../tools/doxygen/xbt_log_extract_hierarchy.pl   >> $pwd/logcategories.doc
-       echo "@}*/"                                     >> $pwd/logcategories.doc"
-       )
+       file(WRITE ${PROJECT_DIRECTORY}/doc/logcategories.sh    "\#! /bin/sh")  
+       file(APPEND ${PROJECT_DIRECTORY}/doc/logcategories.sh   "\npwd=`pwd`")
+       file(APPEND ${PROJECT_DIRECTORY}/doc/logcategories.sh   "\nrm -f $pwd/logcategories.doc")
+       file(APPEND ${PROJECT_DIRECTORY}/doc/logcategories.sh   "\nset -e")
+       file(APPEND ${PROJECT_DIRECTORY}/doc/logcategories.sh   "\necho \"/* Generated file, do not edit */\"     > $pwd/logcategories.doc")
+       file(APPEND ${PROJECT_DIRECTORY}/doc/logcategories.sh   "\necho \"/** \\addtogroup XBT_log_cats\"          >> $pwd/logcategories.doc")
+       file(APPEND ${PROJECT_DIRECTORY}/doc/logcategories.sh   "\necho \"    @{\"                                >> $pwd/logcategories.doc")
+       file(APPEND ${PROJECT_DIRECTORY}/doc/logcategories.sh   "\ncd ${PROJECT_DIRECTORY}/src")
+       file(APPEND ${PROJECT_DIRECTORY}/doc/logcategories.sh   "\n${PROJECT_DIRECTORY}/tools/doxygen/xbt_log_extract_hierarchy.pl      >> $pwd/logcategories.doc")
+       file(APPEND ${PROJECT_DIRECTORY}/doc/logcategories.sh   "\necho \"@}*/\"                                 >> $pwd/logcategories.doc")
+
        exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/doc/logcategories.sh"  "${PROJECT_DIRECTORY}/doc/")
        exec_program("${PROJECT_DIRECTORY}/doc/logcategories.sh"  "${PROJECT_DIRECTORY}/doc/")
 
-endif(MAINTAINER_MODE)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+endif(enable_maintainer_mode)
index 80740d5..633b118 100644 (file)
@@ -1,4 +1,4 @@
-if(MAINTAINER_MODE)
+if(enable_maintainer_mode)
 
 find_program(FLEX_EXE NAMES flex)
 find_program(FLEXML_EXE NAMES flexml)
@@ -39,5 +39,5 @@ ENDIF(FLEXML_EXE)
                message(FATAL_ERROR "Install flex and flexml before use maintainer mode")
        endif(HAVE_FLEXML AND HAVE_FLEX)
 
-endif(MAINTAINER_MODE)
+endif(enable_maintainer_mode)
 
index ed5dbec..ecb8bea 100644 (file)
@@ -3,6 +3,11 @@ set(optCFLAGS "")
 
 set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS}-g3)
 
+if(supernovae)
+       set(enable_compile_warnings true)
+       set(enable_compile_optimizations true)
+endif(supernovae)
+
 if(CMAKE_C_COMPILER MATCHES "/usr/bin/gcc")
 
        if(enable_compile_warnings)
index c594071..de2d47b 100644 (file)
@@ -121,7 +121,7 @@ if(NOT init)
        add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties)
        add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
 
-       if(HAVE_JAVA)
+       if(HAVE_JAVA AND NOT init)
                message("Make : src/simgrid.jar with : ${JAVA_COMPILE}")
                exec_program("rm -rf ${PROJECT_DIRECTORY}/src/.classes" OUTPUT_VARIABLE "SIM_JAR_OK")
                exec_program("rm ${PROJECT_DIRECTORY}/src/simgrid.jar" OUTPUT_VARIABLE "SIM_JAR_OK")
@@ -141,6 +141,6 @@ if(NOT init)
                exec_program("rm ${PROJECT_DIRECTORY}/examples/java/suspend/*.class" OUTPUT_VARIABLE "SIM_JAR_OK")
                exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/examples/java/suspend -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/suspend/*.java"  OUTPUT_VARIABLE "SIM_JAR_OK")
 
-       endif(HAVE_JAVA)
+       endif(HAVE_JAVA AND NOT init)
 
 endif(NOT init)
index f8f8cac..4d82547 100644 (file)
@@ -9,13 +9,12 @@ if(NOT with_context)
        set(with_context "auto" CACHE TYPE INTERNAL FORCE)
 endif(NOT with_context)
 
-option(init "Set ON for make _*.c with gras_stub_generator" OFF)
-option(MAINTAINER_MODE "Permit to make flex and flexml files." OFF)
-option(supernovae "Supernovae mode." OFF)
-option(disable_java "This variable set the java context." OFF)
-option(disable_lua "This variable set lua use." OFF)
-option(enable_compile_warnings "" OFF)
-option(enable_compile_optimizations "" OFF)
-option(disable_gtnets "This variable set the gtnets context." OFF)
-option(disable_ruby "This variable set ruby use." ON)
-option(distrib "Set on if you want make a distribution." OFF)
+option(init "Set ON for make _*.c with gras_stub_generator" off)
+option(enable_maintainer_mode "Permit to make flex and flexml files." off)
+option(supernovae "Supernovae mode." off)
+option(disable_java "This variable set the java context." off)
+option(disable_lua "This variable set lua use." off)
+option(enable_compile_warnings "" off)
+option(enable_compile_optimizations "" off)
+option(disable_gtnets "This variable set the gtnets context." off)
+option(disable_ruby "This variable set ruby use." on)
index 3c76802..b7e81a4 100644 (file)
@@ -22,7 +22,7 @@ message("     Compile Lua:            ${HAVE_LUA}")
 message("      Compile Ruby:           ${HAVE_RUBY_H}")
 message("")
 message("            Init mode:        ${init}")
-message("      Maintainer mode:        ${MAINTAINER_MODE}")
+message("      Maintainer mode:        ${enable_maintainer_mode}")
 message("      Supernovae mode:        ${supernovae}")
 message("")
 message("      Simgrid dependencies:   ${SIMGRID_DEP}")
@@ -30,8 +30,6 @@ message("     Gras dependencies:      ${GRAS_DEP}")
 message("      Ruby dependencies:      ${RUBY_DEP}")
 message("      Smpi dependencies:      ${SMPI_DEP}")
 message("")
-message("      Distrib_mode:           ${distrib}")
-if(NOT distrib)
+message("      USER_PREFIX:            ${prefix}")
 message("      INSTALL_PREFIX:         ${CMAKE_INSTALL_PREFIX}")
-endif(NOT distrib)
 message("")