Redo the way to install simgrid.

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

diff --git a/buildtools/Cmake/src/CMakeDefinePackages.txt b/buildtools/Cmake/src/CMakeDefinePackages.txt
index dd1638d..21c17f8 100644 (file)
--- a/buildtools/Cmake/src/CMakeDefinePackages.txt
+++ b/buildtools/Cmake/src/CMakeDefinePackages.txt
@@ -307,18 +307,72 @@ ${PROJECT_DIRECTORY}/src/bindings/ruby/rb_msg_task.c
 ${PROJECT_DIRECTORY}/src/bindings/ruby/rb_application_handler.c
 )
 
-set(TEST_CFILES
-${PROJECT_DIRECTORY}/src/xbt/cunit.c
-${PROJECT_DIRECTORY}/src/xbt/ex.c
-${PROJECT_DIRECTORY}/src/xbt/dynar.c
-${PROJECT_DIRECTORY}/src/xbt/dict.c
-${PROJECT_DIRECTORY}/src/xbt/set.c
-${PROJECT_DIRECTORY}/src/xbt/swag.c
-${PROJECT_DIRECTORY}/src/xbt/xbt_str.c
-${PROJECT_DIRECTORY}/src/xbt/xbt_strbuff.c
-${PROJECT_DIRECTORY}/src/xbt/xbt_sha.c
-${PROJECT_DIRECTORY}/src/xbt/config.c
-${PROJECT_DIRECTORY}/src/xbt/xbt_synchro.c
+set(install_libs
+${PROJECT_DIRECTORY}/src/.libs/libsimgrid.*
+${PROJECT_DIRECTORY}/src/.libs/libsimgrid_static.*
+${PROJECT_DIRECTORY}/src/.libs/libgras.*
+${PROJECT_DIRECTORY}/src/.libs/libsmpi.*
+)
+if(HAVE_RUBY_H)
+       set(install_libs
+       ${install_libs}
+       ${PROJECT_DIRECTORY}/src/.libs/libsimgrid_ruby.*
+       )
+endif(HAVE_RUBY_H)
+
+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
+./include/xbt/str.h
+./include/xbt/strbuff.h
+./include/xbt/hash.h
+./include/xbt/function_types.h
+./include/xbt/asserts.h 
+./include/xbt/ex.h
+./include/xbt/log.h
+./include/xbt/module.h
+./include/xbt/mallocator.h
+./include/xbt/dynar.h
+./include/xbt/dict.h
+./include/xbt/set.h
+./include/xbt/heap.h
+./include/xbt/graph.h
+./include/xbt/fifo.h
+./include/xbt/swag.h
+./include/xbt/matrix.h
+./include/xbt/peer.h
+./include/xbt/config.h
+./include/xbt/cunit.h
+./include/xbt/graphxml_parse.h
+./include/xbt/graphxml.h
+./include/xbt/time.h
+./include/xbt/synchro.h
+./include/xbt/synchro_core.h
+./include/xbt/queue.h
+./include/msg/msg.h
+./include/msg/datatypes.h
+./include/simdag/simdag.h
+./include/simdag/datatypes.h
+./include/smpi/smpi.h
+./include/smpi/mpi.h
+./include/surf/surfxml_parse.h
+./include/surf/simgrid_dtd.h
+./include/gras/datadesc.h
+./include/gras/transport.h
+./include/gras/virtu.h
+./include/gras/emul.h
+./include/gras/process.h
+./include/gras/module.h
+./include/gras/messages.h
+./include/gras/timer.h
+./include/amok/peermanagement.h
+./include/amok/bandwidth.h
+./include/instr/instr.h
+./include/instr/tracing_config.h
 )
 
 set(TEST_UNITS
@@ -335,14 +389,25 @@ config_unit.c
 xbt_synchro_unit.c
 )
 
+set(TEST_CFILES
+${PROJECT_DIRECTORY}/src/xbt/cunit.c
+${PROJECT_DIRECTORY}/src/xbt/ex.c
+${PROJECT_DIRECTORY}/src/xbt/dynar.c
+${PROJECT_DIRECTORY}/src/xbt/dict.c
+${PROJECT_DIRECTORY}/src/xbt/set.c
+${PROJECT_DIRECTORY}/src/xbt/swag.c
+${PROJECT_DIRECTORY}/src/xbt/xbt_str.c
+${PROJECT_DIRECTORY}/src/xbt/xbt_strbuff.c
+${PROJECT_DIRECTORY}/src/xbt/xbt_sha.c
+${PROJECT_DIRECTORY}/src/xbt/config.c
+${PROJECT_DIRECTORY}/src/xbt/xbt_synchro.c
+)
+
 #Here must have all files which permit to generate source files
 set(SRC_TO_LOOK
 ${PROJECT_DIRECTORY}/src/surf/simgrid.dtd
 ${PROJECT_DIRECTORY}/src/xbt/graphxml.dtd
 ${PROJECT_DIRECTORY}/src/simdag/dax.dtd
-${PROJECT_DIRECTORY}/src/surf/simgrid_dtd.l
-${PROJECT_DIRECTORY}/src/xbt/graphxml.l
-${PROJECT_DIRECTORY}/src/simdag/dax_dtd.l
 ${PROJECT_DIRECTORY}/src/simgrid_units_main.c
 ${PROJECT_DIRECTORY}/examples/gras/ping/ping.xml
 ${PROJECT_DIRECTORY}/examples/gras/rpc/rpc.xml
@@ -361,11 +426,6 @@ ${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep/small_sleep.xml
 ${PROJECT_DIRECTORY}/examples/amok/bandwidth/bandwidth.xml
 ${PROJECT_DIRECTORY}/examples/amok/saturate/saturate.xml
 ${TEST_CFILES}
-${PROJECT_DIRECTORY}/src/context_sysv_config.h.in
-${PROJECT_DIRECTORY}/buildtools/Cmake/src/c_gras_config.h.in
-${PROJECT_DIRECTORY}/include/simgrid_config.h.in
-${PROJECT_DIRECTORY}/src/smpi/smpicc.in
-${PROJECT_DIRECTORY}/src/smpi/smpirun.in
 )
 
 ### depend of some variables setted upper

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index 2af6359..83a7266 100644 (file)
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -76,6 +76,9 @@ PATTERN "*~" EXCLUDE
 set(CPACK_SET_DESTDIR on)
 set(CMAKE_INSTALL_PREFIX ${prefix} CACHE TYPE INTERNAL FORCE)
 
+string(REPLACE ";" "\t" install_HEADERS "${install_HEADERS}")
+string(REPLACE ";" "\t" install_libs "${install_libs}")
+
 add_custom_target(install-simgrid
 COMMAND mkdir -p ${prefix}
 COMMAND mkdir -p ${prefix}/lib
@@ -83,12 +86,13 @@ 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 cp ${install_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"
+COMMAND cp --parent ${install_HEADERS} ${prefix}
+COMMAND echo "install include ok"
+WORKING_DIRECTORY "${PROJECT_DIRECTORY}/./"
 )
 
 add_custom_target(uninstall

diff --git a/buildtools/Cmake/src/CMakeFLEXml.txt b/buildtools/Cmake/src/CMakeFLEXml.txt
index efd332f..3977c75 100644 (file)
--- a/buildtools/Cmake/src/CMakeFLEXml.txt
+++ b/buildtools/Cmake/src/CMakeFLEXml.txt
@@ -125,15 +125,8 @@ message("")
 message("________________________________________________________________________________")
 message("________________________________________________________________________________ SG_UNIT_EXTRACTOR END")
 
-message("")
-message("________________________________________________________________________________")
-message("________________________________________________________________________________ LOOKED FILES")
 foreach(file ${SRC_TO_LOOK})
-       message("FILE : ${file}")
-       #configure_file(${file} ${file} @ONLY)
+       configure_file(${file} ${file} COPYONLY)
 endforeach(file ${SRC_TO_LOOK})
-message("")
-message("________________________________________________________________________________")
-message("________________________________________________________________________________ LOOKED FILES END")
 endif(enable_maintainer_mode)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 350f38e..9071904 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,6 @@ PROPERTIES GENERATED true)
 foreach(file ${TEST_UNITS})
        set_source_files_properties(${file}
 PROPERTIES GENERATED true)
-       message("Generated file :  ${file}")
 endforeach(file ${TEST_UNITS})