Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Corection of the gtnets-ruby bug with node.h and begining of the doc edition.
authornavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Fri, 26 Feb 2010 13:39:30 +0000 (13:39 +0000)
committernavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Fri, 26 Feb 2010 13:39:30 +0000 (13:39 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7126 48e7efb5-ca39-0410-a469-dd3cf9ba447f

buildtools/CPACK/src/CMakeCompleteInFiles.txt
buildtools/CPACK/src/CMakeDocs.txt [new file with mode: 0644]
buildtools/CPACK/src/CMakeFlags.txt
buildtools/CPACK/src/CMakeMakeExeLib.txt
buildtools/CPACK/src/CMakePrintArgs.txt

index 69f9075..97d60f2 100644 (file)
@@ -9,14 +9,12 @@ if(NOT disable_ruby)
        SET(RUBY_PATH "non")
        find_program(FIND_EXE NAMES find)
        exec_program("${FIND_EXE} /usr/lib -name ruby.h" OUTPUT_VARIABLE RUBY_PATH)
-       if(NOT RUBY_PATH)
-               set(RUBY_PATH "/usr/lib/ruby/ruby.h")
-       endif(NOT RUBY_PATH)
-       string(REPLACE "/ruby.h" "/" RUBY_PATH "${RUBY_PATH}")
+       string(REPLACE "/ruby.h" "/" RUBY_PATH ${RUBY_PATH})
        message("RUBY_PATH ${RUBY_PATH}")
        if(RUBY_PATH)
        SET(HAVE_RUBY_H 1)
-       add_definitions("-I${RUBY_PATH} -I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix -fPIC")
+       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${RUBY_PATH} -I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix -fPIC ")
+       #add_definitions("-I${RUBY_PATH} -I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix -fPIC")
        endif(RUBY_PATH)
 endif(NOT disable_ruby)
 
diff --git a/buildtools/CPACK/src/CMakeDocs.txt b/buildtools/CPACK/src/CMakeDocs.txt
new file mode 100644 (file)
index 0000000..05779fe
--- /dev/null
@@ -0,0 +1,178 @@
+if(MAINTAINER_MODE)
+
+       find_path(FIG2DEV_PATH  NAMES fig2dev   PATHS NO_DEFAULT_PATHS)
+       find_path(DOXYGEN_PATH  NAMES doxygen   PATHS NO_DEFAULT_PATHS)
+       find_path(BIBTOOL_PATH  NAMES bibtool   PATHS NO_DEFAULT_PATHS)
+       find_path(BIBTEX2HTML_PATH      NAMES bibtex2html       PATHS NO_DEFAULT_PATHS)
+       find_path(ICONV_PATH    NAMES iconv     PATHS NO_DEFAULT_PATHS)
+       find_path(MAKE_PATH     NAMES make      PATHS NO_DEFAULT_PATHS)
+
+       exec_program("rm -rf ${PROJECT_DIRECTORY}/doc/html" OUTPUT_VARIABLE OKITOKI)
+       exec_program("mkdir -p ${PROJECT_DIRECTORY}/doc/html" OUTPUT_VARIABLE OKITOKI)
+       exec_program("find ${PROJECT_DIRECTORY}/tools/gras  ${PROJECT_DIRECTORY}/src ${PROJECT_DIRECTORY}/include -name \"*.[chl]\"" OUTPUT_VARIABLE LISTE_UNE)
+       exec_program("find ${PROJECT_DIRECTORY} -name \"*.doc\" |grep -v logcategories.doc" OUTPUT_VARIABLE LISTE_DEUX)
+
+
+       set(DOCSSOURCES "${LISTE_UNE}\n${LISTE_DEUX}")
+       string(REPLACE "\n" ";" DOCSSOURCES ${DOCSSOURCES})
+
+       set(FIGS
+       ${PROJECT_DIRECTORY}/doc/fig/simgrid_modules.fig
+       ${PROJECT_DIRECTORY}/doc/fig/simgrid_modules2.fig
+       ${PROJECT_DIRECTORY}/doc/fig/amok_bw_test.fig
+       ${PROJECT_DIRECTORY}/doc/fig/amok_bw_sat.fig
+       ${PROJECT_DIRECTORY}/doc/fig/gras_comm.fig
+       )
+
+       string(REPLACE ".fig" ".png\n" LISTE_TROIS ${FIGS})
+
+       set(PNGS 
+       ${PROJECT_DIRECTORY}/doc/webcruft/simgrid_logo.png
+       ${PROJECT_DIRECTORY}/doc/webcruft/simgrid_logo_small.png
+       ${PROJECT_DIRECTORY}/doc/webcruft/poster_thumbnail.png
+       )
+
+       SET(PRINT false)
+
+       if(PRINT)
+               message("DOCSSOURCES:")
+               foreach(file ${DOCSSOURCES})
+                       message("${file}")
+               endforeach(file ${DOCSSOURCES})
+
+               message("\nFIGS:")
+               foreach(file ${FIGS})
+                       message("${file}")
+               endforeach(file ${FIGS})
+
+               message("\nPNGS:")
+               foreach(file ${PNGS})
+                       message("${file}")
+               endforeach(file ${PNGS})
+
+       message("${DOXYGEN_PATH}/doxygen")
+       message("${FIG2DEV_PATH}/fig2dev")
+       message("${BIBTOOL_PATH}/bibtool")
+       message("${BIBTEX2HTML_PATH}/bibtex2html")
+       message("${ICONV_PATH}/iconv")
+       message("\n\n")
+
+       endif(PRINT)
+
+       if(DOXYGEN_PATH AND FIG2DEV_PATH)
+
+               exec_program("${FIG2DEV_PATH}/fig2dev -Lmap ${PROJECT_DIRECTORY}/doc/fig/simgrid_modules.fig | grep -e IMG -e MAP -e AREA | sed 's/imagemap/simgrid_modules/g' | sed 's/\\.gif/.png/' | sed 's/<IMG /<IMG style=\"border:0px \"/g' | sed 's/\\.gif/.png/' > ${PROJECT_DIRECTORY}/doc/simgrid_modules.map" OUTPUT_VARIABLE OKITOKI)
+
+               foreach(file ${FIGS})
+                       string(REPLACE ".fig" ".png" tmp_file ${file})
+                       string(REPLACE "${PROJECT_DIRECTORY}/doc/fig/" "${PROJECT_DIRECTORY}/doc/html/" tmp_file ${tmp_file})
+                       exec_program("${FIG2DEV_PATH}/fig2dev -Lpng ${file} > ${tmp_file}" OUTPUT_VARIABLE OKITOKI)
+               endforeach(file ${FIGS})
+
+
+               exec_program("touch ${PROJECT_DIRECTORY}/doc/index-API.doc ${PROJECT_DIRECTORY}/doc/.FAQ.doc.toc ${PROJECT_DIRECTORY}/doc/.index.doc.toc ${PROJECT_DIRECTORY}/doc/.contrib.doc.toc ${PROJECT_DIRECTORY}/doc/.history.doc.toc" OUTPUT_VARIABLE OKITOKI)
+               exec_program("test -e html || mkdir html" OUTPUT_VARIABLE OKITOKI)
+
+               foreach(file ${PNGS})
+                       exec_program("cp ${file} ${PROJECT_DIRECTORY}/doc/html/" OUTPUT_VARIABLE OKITOKI)
+               endforeach(file ${PNGS})
+
+               exec_program("cp ${PROJECT_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot_thn.jpg ${PROJECT_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg ${PROJECT_DIRECTORY}/doc/html/" OUTPUT_VARIABLE OKITOKI)
+               exec_program("cp ${PROJECT_DIRECTORY}/doc/simgrid.css ${PROJECT_DIRECTORY}/doc/html/" OUTPUT_VARIABLE OKITOKI) 
+
+               set(top_srcdir "..")
+               set(WARNING "This file is generated, do not edit")
+               set(srcdir ".")
+               configure_file(${PROJECT_DIRECTORY}/doc/Doxyfile.in ${PROJECT_DIRECTORY}/doc/Doxyfile @ONLY)
+       # First pass
+               exec_program("${DOXYGEN_PATH}/doxygen Doxyfile >/dev/null" OUTPUT_VARIABLE OKITOKI)
+               exec_program("${PROJECT_DIRECTORY}/tools/doxygen/index_create.pl simgrid.tag index-API.doc" OUTPUT_VARIABLE OKITOKI)
+               exec_program("${PROJECT_DIRECTORY}/tools/doxygen/toc_create.pl ${PROJECT_DIRECTORY}/FAQ.doc ${PROJECT_DIRECTORY}/doc/index.doc ${PROJECT_DIRECTORY}/doc/contrib.doc ${PROJECT_DIRECTORY}/doc/gtut-introduction.doc ${PROJECT_DIRECTORY}/doc/history.doc" OUTPUT_VARIABLE OKITOKI)
+       # Second pass
+               exec_program("${DOXYGEN_PATH}/doxygen Doxyfile >/dev/null" OUTPUT_VARIABLE OKITOKI)
+       # Post-processing
+               exec_program("rm -f ${PROJECT_DIRECTORY}/doc/html/dir*" OUTPUT_VARIABLE OKITOKI)
+               exec_program("${PROJECT_DIRECTORY}/tools/doxygen/index_php.pl ${PROJECT_DIRECTORY}/doc/index.php.in ${PROJECT_DIRECTORY}/doc/html/index.html ${PROJECT_DIRECTORY}/doc/index.php" OUTPUT_VARIABLE OKITOKI)
+               exec_program("${PROJECT_DIRECTORY}/tools/doxygen/doxygen_postprocesser.pl" OUTPUT_VARIABLE OKITOKI)
+
+       #html/gras.html:
+               exec_program("echo \"<html><META HTTP-EQUIV='Refresh' content='0;URL=http://simgrid.gforge.inria.fr/doc/group__GRAS__API.html'>\" > ${PROJECT_DIRECTORY}/doc/html/gras.html" OUTPUT_VARIABLE OKITOKI)
+               exec_program("echo \"<center><h2><br><a href='http://simgrid.gforge.inria.fr/doc/group__GRAS__API.html'>Grid Reality And Simulation.</a></h2></center></html>\" >> ${PROJECT_DIRECTORY}/doc/html/gras.html" OUTPUT_VARIABLE OKITOKI)
+       #html/amok.html:
+               exec_program("echo \"<html><META HTTP-EQUIV='Refresh' content='0;URL=http://simgrid.gforge.inria.fr/doc/group__AMOK__API.html'>\" > ${PROJECT_DIRECTORY}/doc/html/amok.html" OUTPUT_VARIABLE OKITOKI)
+               exec_program("echo \"<center><h2><br><a href='http://simgrid.gforge.inria.fr/doc/group__AMOK__API.html'>Advanced Metacomputing Overlay Kit.</a></h2></center></html>\" >> ${PROJECT_DIRECTORY}/doc/html/amok.html" OUTPUT_VARIABLE OKITOKI)
+       #html/msg.html:
+               exec_program("echo \"<html><META HTTP-EQUIV='Refresh' content='0;URL=http://simgrid.gforge.inria.fr/doc/group__MSG__API.html'>\" > ${PROJECT_DIRECTORY}/doc/html/msg.html" OUTPUT_VARIABLE OKITOKI)
+               exec_program("echo \"<center><h2><br><a href='http://simgrid.gforge.inria.fr/doc/group__MSG__API.html'>Meta SimGrid.</a></h2></center></html>\" >> ${PROJECT_DIRECTORY}/doc/html/msg.html" OUTPUT_VARIABLE OKITOKI)
+       #html/simdag.html:
+               exec_program("echo \"<html><META HTTP-EQUIV='Refresh' content='0;URL=http://simgrid.gforge.inria.fr/doc/group__SD__API.html'>\" > ${PROJECT_DIRECTORY}/doc/html/simdag.html" OUTPUT_VARIABLE OKITOKI)
+               exec_program("echo \"<center><h2><br><a href='http://simgrid.gforge.inria.fr/doc/group__SD__API.html'>DAG Simulator.</a></h2></center></html>\" >> ${PROJECT_DIRECTORY}/doc/html/simdag.html" OUTPUT_VARIABLE OKITOKI)
+
+       if(BIBTOOL_PATH AND BIBTEX2HTML_PATH AND ICONV_PATH)
+
+       #publis_count.html: all.bib
+               exec_program("${PROJECT_DIRECTORY}/tools/doxygen/bibtex2html_table_count.pl < ${PROJECT_DIRECTORY}/doc/all.bib > ${PROJECT_DIRECTORY}/doc/publis_count.html" OUTPUT_VARIABLE OKITOKI)
+
+       #publis_core.bib: all.bib 
+               exec_program("${BIBTOOL_PATH}/bibtool -- 'select.by.string={category \"core\"}' -- 'preserve.key.case={on}' -- 'preserve.keys={on}' ${PROJECT_DIRECTORY}/doc/all.bib > ${PROJECT_DIRECTORY}/doc/publis_core.bib" OUTPUT_VARIABLE OKITOKI)
+
+       #publis_extern.bib: all.bib 
+               exec_program("${BIBTOOL_PATH}/bibtool -- 'select.by.string={category \"extern\"}' -- 'preserve.key.case={on}' -- 'preserve.keys={on}' ${PROJECT_DIRECTORY}/doc/all.bib > ${PROJECT_DIRECTORY}/doc/publis_extern.bib" OUTPUT_VARIABLE OKITOKI)
+
+       #publis_intra.bib: all.bib 
+               exec_program("${BIBTOOL_PATH}/bibtool -- 'select.by.string={category \"intra\"}' -- 'preserve.key.case={on}' -- 'preserve.keys={on}' ${PROJECT_DIRECTORY}/doc/all.bib > ${PROJECT_DIRECTORY}/doc/publis_intra.bib" OUTPUT_VARIABLE OKITOKI)
+
+       #%_bib.latin1.html: %.bib
+               exec_program("find ${PROJECT_DIRECTORY}/doc/ -name \"*.bib\"" OUTPUT_VARIABLE LISTE_QUATRE)
+               string(REPLACE "\n" ";" LISTE_QUATRE ${LISTE_QUATRE})
+               foreach(file ${LISTE_QUATRE})
+                       string(REPLACE ".bib" "_bib.latin1.html" file_tmp "${file}")
+                       exec_program("${BIBTEX2HTML_PATH}/bibtex2html -single -i -q ${file} | ${PROJECT_DIRECTORY}/tools/doxygen/bibtex2html_postprocessor.pl > ${file_tmp}\n" OUTPUT_VARIABLE OKITOKI)
+               endforeach(file ${LISTE_QUATRE})
+
+
+       #%_bib.html: %_bib.latin1.html
+               exec_program("find ${PROJECT_DIRECTORY}/doc/ -name \"*_bib.latin1.html\"" OUTPUT_VARIABLE LISTE_CINQ)
+               string(REPLACE "\n" ";" LISTE_CINQ ${LISTE_CINQ})
+               foreach(file ${LISTE_CINQ})
+                       string(REPLACE "_bib.latin1.html" "_bib.html" file_tmp "${file}")
+                       exec_program("${ICONV_PATH}/iconv --from-code latin1 --to-code utf8 ${file} --output ${file-tmp}" OUTPUT_VARIABLE OKITOKI)
+               endforeach(file ${LISTE_CINQ})
+       endif(BIBTOOL_PATH AND BIBTEX2HTML_PATH AND ICONV_PATH)
+
+       #publish:
+               #$(MAKE) -C .. sync-gforge
+
+       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"
+       )
+       exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/doc/logcategories.sh")
+       exec_program("${PROJECT_DIRECTORY}/doc/logcategories.sh")
+
+
+endif(MAINTAINER_MODE)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
index 2a67549..ed5dbec 100644 (file)
@@ -1,7 +1,7 @@
 set(warnCFLAGS "")
 set(optCFLAGS "")
 
-set(CMAKE_C_FLAGS -g3)
+set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS}-g3)
 
 if(CMAKE_C_COMPILER MATCHES "/usr/bin/gcc")
 
index 530b055..e59cb2a 100644 (file)
@@ -3,15 +3,15 @@
 if(supernovae)
        include(${PROJECT_DIRECTORY}/CPACK/src/CMakeSupernovae.txt)
 else(supernovae)
+       add_library(msg STATIC ${MSG_SRC_bis})
        add_library(simgrid STATIC ${simgrid_sources})
        add_library(gras SHARED ${gras_sources})
        add_library(smpi STATIC ${SMPI_SRC})
-       add_library(msg STATIC ${MSG_SRC_bis})
 endif(supernovae)
 
 set(GRAS_DEP "pthread")
-set(SIMGRID_DEP "")
-set(SMPI_DEP "simgrid")
+set(SIMGRID_DEP "ruby1.8")
+set(SMPI_DEP "")
 set(MSG_DEP "pthread -lrt -ldl -lcrypt -lm -lc")
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
@@ -21,21 +21,20 @@ endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 
 if(pthread)
        if(with_context MATCHES pthread)
-               SET(SIMGRID_DEP ${SIMGRID_DEP}pthread)
-               SET(ESPACE " ")
+               SET(SIMGRID_DEP "${SIMGRID_DEP} -lpthread")
        endif(with_context MATCHES pthread)
        
        if(with_context MATCHES windows)
-               SET(GRAS_DEP "")
+               SET(GRAS_DEP "msg")
        endif(with_context MATCHES windows)
 endif(pthread)
 
 if(HAVE_LUA)
-       SET(SIMGRID_DEP "${SIMGRID_DEP}${ESPACE}-ldl -llua5.1")
+       SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -llua5.1")
 endif(HAVE_LUA)
 
 if(HAVE_GTNETS)
-       SET(SIMGRID_DEP_GTNETS "gtnets ")
+       SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
 endif(HAVE_GTNETS)
 
 ### Add definitions for compile
@@ -43,9 +42,9 @@ endif(HAVE_GTNETS)
 #set(CMAKE_C_FLAGS "-fprofile-arcs -ftest-coverage")
 
 #add_definitions (-fprofile-arcs -ftest-coverage)
-target_link_libraries(simgrid  ${SIMGRID_DEP} ${SIMGRID_DEP_GTNETS} ruby1.8 msg -fprofile-arcs)
-target_link_libraries(gras     ${GRAS_DEP} msg -fprofile-arcs)
-target_link_libraries(smpi     ${SMPI_DEP} -fprofile-arcs)
+target_link_libraries(simgrid  msg ${SIMGRID_DEP} -fprofile-arcs)
+target_link_libraries(gras     msg ${GRAS_DEP} -fprofile-arcs)
+target_link_libraries(smpi     simgrid ${SMPI_DEP} -fprofile-arcs)
 target_link_libraries(msg      ${MSG_DEP} -fprofile-arcs)
 ### Make EXEs
 
index d8e767d..98a5588 100644 (file)
@@ -27,6 +27,7 @@ message("     Supernovae mode:        ${supernovae}")
 message("")
 message("      Simgrid dependencies:   ${SIMGRID_DEP}")
 message("      Gras dependencies:      ${GRAS_DEP}")
+message("      Msg dependencies:       ${MSG_DEP}")
 message("      Smpi dependencies:      ${SMPI_DEP}\n\n")