Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git] / buildtools / Cmake / DefinePackages.cmake
index c485b48..6378849 100644 (file)
@@ -49,6 +49,7 @@ set(EXTRA_DIST
        src/surf/gtnets/gtnets_simulator.h
        src/surf/gtnets/gtnets_topology.h
        src/surf/cpu_ti_private.h
+       src/surf/surf_routing_private.h
        src/include/surf/surf_resource.h
        src/include/surf/datatypes.h
        src/include/surf/maxmin.h
@@ -90,6 +91,14 @@ set(EXTRA_DIST
        src/smpi/smpi_mpi_dt_private.h
        src/smpi/README
        src/mk_supernovae.pl
+       
+       examples/gras/ping/ping.h
+       examples/gras/console/ping.h
+       examples/gras/mmrpc/mmrpc.h
+
+       tools/gras/gras_stub_generator.h
+       tools/tesh/run_context.h  
+       tools/tesh/tesh.h
 )
 
 set(XBT_RL_SRC 
@@ -166,6 +175,7 @@ set(XBT_SRC
        src/xbt/setset.c
        src/xbt/parmap.c
        src/xbt/xbt_replay_trace_reader.c
+       src/xbt/lib.c
 )
 
 if(HAVE_MMAP)
@@ -182,10 +192,21 @@ set(GTNETS_SRC
        src/surf/network_gtnets.c
 )
 
+set(NS3_SRC
+       src/surf/network_ns3.c
+       src/surf/ns3/ns3_interface.cc
+       src/surf/ns3/ns3_simulator.cc
+       )
+
 set(SURF_SRC 
        src/surf/surf_model.c
        src/surf/surf_action.c
        src/surf/surf_routing.c
+       src/surf/surf_routing_full.c
+       src/surf/surf_routing_floyd.c
+       src/surf/surf_routing_rulebased.c
+       src/surf/surf_routing_dijkstra.c
+       src/surf/surf_routing_none.c
        src/surf/surf_config.c
        src/surf/maxmin.c
        src/surf/fair_bottleneck.c
@@ -306,8 +327,6 @@ set(TRACING_SRC
        src/instr/instr_paje_trace.c
        src/instr/instr_msg_task.c
        src/instr/instr_msg_process.c
-       src/instr/instr_msg_volume.c
-       src/instr/instr_smx.c
        src/instr/instr_surf.c
        src/instr/instr_smpi.c
        src/instr/instr_simdag.c
@@ -343,7 +362,7 @@ set(RNGSTREAM_SRC
        src/rngstreams/RngStream.c
 )
 
-set(install_HEADERS
+set(headers_to_install
        include/xbt/misc.h
        include/xbt/sysdep.h
        include/xbt/virtu.h
@@ -363,6 +382,7 @@ set(install_HEADERS
        include/xbt/graph.h
        include/xbt/fifo.h
        include/xbt/swag.h
+       include/xbt/lib.h
        include/xbt/matrix.h
        include/xbt/peer.h
        include/xbt/config.h
@@ -383,11 +403,12 @@ set(install_HEADERS
        include/simdag/simdag.h
        include/simdag/datatypes.h
        include/smpi/smpi.h
-       ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h
        include/smpi/mpi.h
        include/smpi/mpif.h
+       include/smpi/smpi_cocci.h
        include/surf/surfxml_parse.h
        include/surf/simgrid_dtd.h
+       include/surf/surf_routing.h
        include/gras/datadesc.h
        include/gras/transport.h
        include/gras/virtu.h
@@ -399,13 +420,16 @@ set(install_HEADERS
        include/amok/peermanagement.h
        include/amok/bandwidth.h
        include/instr/instr.h
-       ${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h
        include/gras.h 
        include/xbt.h
        include/simix/simix.h
        include/simix/datatypes.h
        include/simix/context.h
 )
+set(source_of_generated_headers
+       include/simgrid_config.h.in
+       include/smpi/smpif.h.in
+       src/context_sysv_config.h.in)
 
 ### depend of some variables setted upper
 # -->CONTEXT_THREADS CONTEXT_UCONTEXT
@@ -448,7 +472,6 @@ else(HAVE_GTNETS)
        )
 endif(HAVE_GTNETS)
 
-
 ### Simgrid Lib sources
 set(simgrid_sources
        ${XBT_SRC}
@@ -472,6 +495,23 @@ if(HAVE_MC)
                )
 endif(HAVE_MC)
 
+if(HAVE_NS3)
+       set(simgrid_sources
+               ${simgrid_sources}
+               ${NS3_SRC}
+       )
+endif(HAVE_NS3)
+
+# WINDOWS
+if(WIN32)
+       set(simgrid_sources
+               ${simgrid_sources}
+               src/xbt/win32_ucontext.c
+               src/xbt/xbt_os_thread.c
+               src/simix/smx_context_thread.c
+               )
+endif(WIN32)
+
 ### Gras Lib sources
 set(gras_sources
        ${XBT_SRC}
@@ -506,11 +546,12 @@ file(GLOB_RECURSE examples_to_install_in_doc
 
 set(DOC_SOURCES
        doc/contrib.doc
-    doc/FAQ.doc
+       doc/FAQ.doc
        doc/gtut-howto-design.doc
        doc/gtut-howto.doc
        doc/gtut-introduction.doc
        doc/gtut-main.doc
+       doc/gtut-tour-00-install.doc
        doc/gtut-tour-01-bones.doc
        doc/gtut-tour-02-simple.doc
        doc/gtut-tour-03-args.doc
@@ -530,7 +571,7 @@ set(DOC_SOURCES
        doc/gtut-tour.doc
        doc/gtut-tour-recap-messages.doc
        doc/history.doc
-       doc/index-API.doc
+       #doc/index-API.doc
        doc/index.doc
        doc/module-amok.doc
        doc/module-gras.doc
@@ -584,6 +625,10 @@ set(DOC_SOURCES
        doc/webcruft/robots.txt
        doc/webcruft/simgrid_logo.png
        doc/webcruft/simgrid_logo_small.png
+       doc/webcruft/fish.gif
+       doc/triva-graph_configuration.png
+       doc/triva-graph_visualization.png
+       doc/simgrid.css
        
        doc/Doxyfile.in
        doc/footer.html.in
@@ -606,6 +651,10 @@ set(DOC_FIGS
        ${CMAKE_HOME_DIRECTORY}/doc/fig/gras_comm.fig
 )
 
+set(DOC_bib
+       ${CMAKE_HOME_DIRECTORY}/doc/all.bib
+)
+
 file(GLOB_RECURSE add_src_files
 "teshsuite/*.c"
 "teshsuite/*.cxx"
@@ -637,17 +686,6 @@ set(add_src_files
        src/simix/smx_context_sysv_private.h
 )
 
-file(GLOB_RECURSE include_files
-"include/*.h"
-"teshsuite/*.h"
-"testsuite/*.h"
-"tools/*.h"
-"examples/*.h"
-"examples/*.hpp"
-"src/*.h.in"
-"include/*.h.in"
-)
-
 file(GLOB_RECURSE xml_files
 "examples/*.xml"
 "include/*.xml"
@@ -671,13 +709,8 @@ set(txt_files
 "testsuite/surf/trace_A.txt"
 "testsuite/surf/trace_B.txt"
 "examples/smpi/hostfile"
-"examples/msg/procmig.trace"
-"examples/msg/volume.trace"
-"examples/msg/ms.trace"
 "examples/msg/trace/file.trace"
 "examples/msg/link5_state.trace"
-"examples/msg/categories.trace"
-"examples/msg/tasks.trace"
 "examples/msg/fafard_state.trace"
 "examples/msg/jupiter_state.trace"
 "examples/msg/actions/actions_allReduce.txt"
@@ -703,6 +736,10 @@ set(txt_files
 "teshsuite/gras/small_sleep/test_sg_64.tesh"
 "teshsuite/simdag/platforms/bob.fail"
 "teshsuite/simdag/platforms/bob.trace"
+"teshsuite/simdag/platforms/bob0_availability_file.trace"
+"teshsuite/simdag/platforms/bob0_state_file.trace"
+"teshsuite/simdag/platforms/bob2_availability_file.trace"
+"teshsuite/simdag/platforms/bob2_state_file.trace"
 "teshsuite/simdag/platforms/link1.bw"
 "teshsuite/simdag/platforms/link1.fail"
 "teshsuite/simdag/platforms/link1.lat"
@@ -759,6 +796,7 @@ file(GLOB_RECURSE README_files
 string(REPLACE "${CMAKE_HOME_DIRECTORY}/" "" README_files "${README_files}")
 
 file(GLOB_RECURSE CMAKE_SOURCE_FILES
+"buildtools/Cmake/Makefile.default"
 "buildtools/Cmake/test_java.sh"
 "buildtools/Cmake/*.cmake"
 "buildtools/Cmake/*.h.in"
@@ -775,8 +813,10 @@ tools/simgrid_update_xml.pl
 buildtools/Cmake/tesh.pl
 )
 
-# This is the complete lise of what will be added to the source archive
+# This is the complete list of what will be added to the source archive
 set(source_to_pack     
+       ${headers_to_install}
+       ${source_of_generated_headers}
        ${XBT_RL_SRC}
        ${EXTRA_DIST}
        ${SMPI_SRC}
@@ -796,14 +836,13 @@ set(source_to_pack
        ${JEDULE_SRC}
        ${RNGSTREAM_SRC}
        ${add_src_files}
-       ${include_files}
        ${xml_files}
        ${tesh_files}
        ${txt_files}
-       ${EXTRA_DIST}
        ${CMAKE_SOURCE_FILES}
        ${bin_files}
        ${DOC_SOURCES}
        ${DOC_FIGS}
+       ${DOC_bib}
        ${README_files}
 )