Permit to make the distrib.

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

diff --git a/buildtools/CPACK/src/CMakeDefinePackages.txt b/buildtools/CPACK/src/CMakeDefinePackages.txt
index da924b3..a2d1f66 100644 (file)
--- a/buildtools/CPACK/src/CMakeDefinePackages.txt
+++ b/buildtools/CPACK/src/CMakeDefinePackages.txt
@@ -392,3 +392,36 @@ else(${HAVE_RUBY_H})
                ${RUBY_SRC}
        )
 endif(${HAVE_RUBY_H})
+
+
+file(GLOB_RECURSE add_src_files
+"${PROJECT_DIRECTORY}/examples/*.c"
+"${PROJECT_DIRECTORY}/teshsuite/*.c"
+"${PROJECT_DIRECTORY}/testsuite/*.c"
+"${PROJECT_DIRECTORY}/tools/*.c"
+"${PROJECT_DIRECTORY}/examples/*.cxx"
+"${PROJECT_DIRECTORY}/teshsuite/*.cxx"
+"${PROJECT_DIRECTORY}/testsuite/*.cxx"
+"${PROJECT_DIRECTORY}/tools/*.cxx"
+"${PROJECT_DIRECTORY}/examples/*CMakeLists.txt"
+"${PROJECT_DIRECTORY}/teshsuite/*CMakeLists.txt"
+"${PROJECT_DIRECTORY}/testsuite/*CMakeLists.txt"
+"${PROJECT_DIRECTORY}/tools/*CMakeLists.txt"
+)
+#message("\n\nadd_src_files:\n${add_src_files}")
+
+file(GLOB_RECURSE include_files
+"${PROJECT_DIRECTORY}/include/*.h"
+"${PROJECT_DIRECTORY}/include/*.h.in"
+)
+#message("\n\ninclude:\n${include_files}")
+
+file(GLOB_RECURSE xml_files
+"${PROJECT_DIRECTORY}/examples/*.xml"
+"${PROJECT_DIRECTORY}/include/*.xml"
+"${PROJECT_DIRECTORY}/src/*.xml"
+"${PROJECT_DIRECTORY}/teshsuite/*.xml"
+"${PROJECT_DIRECTORY}/testsuite/*.xml"
+"${PROJECT_DIRECTORY}/tools/*.xml"
+)
+#message("\n\nxml:\n${xml_files}")

diff --git a/buildtools/CPACK/src/CMakeDistrib.txt b/buildtools/CPACK/src/CMakeDistrib.txt
index 9f37039..b094d43 100644 (file)
--- a/buildtools/CPACK/src/CMakeDistrib.txt
+++ b/buildtools/CPACK/src/CMakeDistrib.txt
@@ -12,11 +12,61 @@ set(CPACK_GENERATOR "TBZ2") #;TGZ;TZ;ZIP
        
 if(distrib)
        
+set(to_svg     
+       ${XBT_RL_SRC}
+       ${EXTRA_DIST}
+       ${SMPI_SRC}
+       ${JMSG_C_SRC}
+       ${JMSG_JAVA_SRC}
+       ${GRAS_RL_SRC}
+       ${XBT_SRC}
+       ${GTNETS_SRC}
+       ${SURF_SRC}
+       ${SIMIX_SRC}
+       ${MSG_SRC}
+       ${SIMDAG_SRC}
+       ${GRAS_COMMON_SRC}
+       ${GRAS_SG_SRC}
+       ${AMOK_SRC}
+       ${LUA_SRC}
+       ${RUBY_SRC}
+       ${add_src_files}
+       ${include_files}
+       ${xml_files}
+       ${PROJECT_DIRECTORY}/./CMakeLists.txt
+       ${PROJECT_DIRECTORY}/./AUTHORS
+       ${PROJECT_DIRECTORY}/./ChangeLog
+       ${PROJECT_DIRECTORY}/./COPYING
+       ${PROJECT_DIRECTORY}/./missing
+       ${PROJECT_DIRECTORY}/./NEWS
+       ${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})
+
        set(CMAKE_INSTALL_PREFIX .)
 
        ###copy doc
        install(DIRECTORY "${PROJECT_DIRECTORY}/doc/"
        DESTINATION "doc/"
+       PATTERN ".svn" EXCLUDE 
+       PATTERN ".git" EXCLUDE 
+       PATTERN "*~" EXCLUDE
+       )
+
+       ###buildtools 
+       install(DIRECTORY "${PROJECT_DIRECTORY}/buildtools/CPACK/"
+       DESTINATION "buildtools/CPACK/"
+       PATTERN ".svn" EXCLUDE 
+       PATTERN ".git" EXCLUDE 
+       PATTERN "*~" EXCLUDE
        )
 
 elseif(distrib)

diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt
index 7da989c..20d3ee7 100644 (file)
--- a/buildtools/CPACK/src/CMakeMakeExeLib.txt
+++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt
@@ -4,6 +4,7 @@ if(supernovae)
        include(${PROJECT_DIRECTORY}/CPACK/src/CMakeSupernovae.txt)
 else(supernovae)       
        add_library(simgrid SHARED ${simgrid_sources})
+       add_library(simgrid_static STATIC ${simgrid_sources})
        add_library(gras SHARED ${gras_sources})
        add_library(smpi STATIC ${SMPI_SRC})
 endif(supernovae)
@@ -47,6 +48,7 @@ string(REPLACE "ruby1.8 " "" SIMGRID_DEP ${SIMGRID_DEP})
 endif(NOT HAVE_RUBY_H)
 
 target_link_libraries(simgrid  ${SIMGRID_DEP} -fprofile-arcs)
+target_link_libraries(simgrid_static   ${SIMGRID_DEP} -fprofile-arcs)
 target_link_libraries(gras     ${GRAS_DEP} -fprofile-arcs)
 target_link_libraries(smpi     simgrid ${SMPI_DEP} -fprofile-arcs)
 

diff --git a/buildtools/CPACK/src/CMakeOption.txt b/buildtools/CPACK/src/CMakeOption.txt
index 518eefe..f8f8cac 100644 (file)
--- a/buildtools/CPACK/src/CMakeOption.txt
+++ b/buildtools/CPACK/src/CMakeOption.txt
@@ -18,4 +18,4 @@ 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." ON)
+option(distrib "Set on if you want make a distribution." OFF)

diff --git a/buildtools/CPACK/src/CMakePrintArgs.txt b/buildtools/CPACK/src/CMakePrintArgs.txt
index 93bc143..3c76802 100644 (file)
--- a/buildtools/CPACK/src/CMakePrintArgs.txt
+++ b/buildtools/CPACK/src/CMakePrintArgs.txt
@@ -31,5 +31,7 @@ message("     Ruby dependencies:      ${RUBY_DEP}")
 message("      Smpi dependencies:      ${SMPI_DEP}")
 message("")
 message("      Distrib_mode:           ${distrib}")
+if(NOT distrib)
 message("      INSTALL_PREFIX:         ${CMAKE_INSTALL_PREFIX}")
-
+endif(NOT distrib)
+message("")

diff --git a/buildtools/CPACK/src/CMakeSupernovae.txt b/buildtools/CPACK/src/CMakeSupernovae.txt
index 55eeaa4..1a166d7 100644 (file)
--- a/buildtools/CPACK/src/CMakeSupernovae.txt
+++ b/buildtools/CPACK/src/CMakeSupernovae.txt
@@ -61,5 +61,6 @@ exec_program("${PROJECT_DIRECTORY}/src/mk_supernovae.sh ${PROJECT_DIRECTORY}/src
 exec_program("${PROJECT_DIRECTORY}/src/mk_supernovae.sh ${PROJECT_DIRECTORY}/src/supernovae_smpi.c ${temp_src_smpi}"   OUTPUT_VARIABLE "SUPER_OK")
 
 add_library(simgrid    SHARED  ${PROJECT_DIRECTORY}/src/supernovae_sg.c ${simgrid_fragile_sources})
+add_library(simgrid_static STATIC ${PROJECT_DIRECTORY}/src/supernovae_sg.c ${simgrid_fragile_sources})
 add_library(gras       SHARED  ${PROJECT_DIRECTORY}/src/supernovae_gras.c ${gras_fragile_sources})
 add_library(smpi       STATIC  ${PROJECT_DIRECTORY}/src/supernovae_smpi.c)