From: Navarrop Date: Tue, 6 Sep 2011 15:50:32 +0000 (+0200) Subject: Available command sync-gforge-website. X-Git-Tag: v3_6_2~144 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7ff79318b09b10352e946822714b333b8e71555c Available command sync-gforge-website. Update doc. --- diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake index 3001ef856d..c76e61b21a 100644 --- a/buildtools/Cmake/Distrib.cmake +++ b/buildtools/Cmake/Distrib.cmake @@ -332,11 +332,11 @@ WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}" ) #doc/index.php doc/webcruft/robots.txt doc/webcruft/fish.gif -#add_custom_target(sync-gforge-website -#COMMAND chmod g+rw -R doc/ -#COMMAND chmod a+rX -R doc/ -#COMMAND scp -r doc/website/ scm.gforge.inria.fr:/home/groups/simgrid/htdocs/ -#WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}" -#) +add_custom_target(sync-gforge-website +COMMAND chmod g+rw -R website/html +COMMAND chmod a+rX -R website/html +COMMAND scp -r website/html/* scm.gforge.inria.fr:/home/groups/simgrid/htdocs/ +WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}" +) include(CPack) diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake index ef9d8b9f0d..6e55644d55 100644 --- a/buildtools/Cmake/GenerateDoc.cmake +++ b/buildtools/Cmake/GenerateDoc.cmake @@ -267,7 +267,7 @@ configure_file(${CMAKE_HOME_DIRECTORY}/website/documentation.php.in ${CMAKE_HOME configure_file(${CMAKE_HOME_DIRECTORY}/website/download.php.in ${CMAKE_HOME_DIRECTORY}/website/html/download.php @ONLY) ADD_CUSTOM_TARGET(simgrid_website - COMMENT "Generating the SimGrid Website..." + COMMENT "Generating the SimGrid Website..." DEPENDS ${WEBSITE_SOURCES} ${CMAKE_HOME_DIRECTORY}/website/all.bib COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/toc_create.pl FAQ.doc contrib.doc history.doc COMMAND ${CMAKE_COMMAND} -E echo "XX Doxygen website pass" @@ -276,9 +276,12 @@ ADD_CUSTOM_TARGET(simgrid_website COMMAND ${CMAKE_COMMAND} -E echo "XX Post-processing Doxygen website result" COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/doxygen_postprocesser_website.pl - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/website/stylesheets/ ${CMAKE_HOME_DIRECTORY}/website/html/ - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/website/logos/ ${CMAKE_HOME_DIRECTORY}/website/html/ - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/website/img/ ${CMAKE_HOME_DIRECTORY}/website/html/ + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/website/stylesheets/ ${CMAKE_HOME_DIRECTORY}/website/html/stylesheets/ + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/website/logos/ ${CMAKE_HOME_DIRECTORY}/website/html/logos/ + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/website/img/ ${CMAKE_HOME_DIRECTORY}/website/html/img/ + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/website/documentation.html ${CMAKE_HOME_DIRECTORY}/website/html/documentation.html + + COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/website/html/index.html WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/website/ ) diff --git a/tools/doxygen/doxygen_postprocesser_website.pl b/tools/doxygen/doxygen_postprocesser_website.pl index 1c47f1d779..353ad9c925 100755 --- a/tools/doxygen/doxygen_postprocesser_website.pl +++ b/tools/doxygen/doxygen_postprocesser_website.pl @@ -172,7 +172,11 @@ sub handle_pub{ my $line; # BIG FAT WARNING : THIS HACK IS DEPENDANT OF THE DOXYGEN VERSION AND OUR TEXT (because of the string we are looking for, that is changing with doxygen version, either h1 or div class="title" ... So we're forced to use titles defined in doc files... while ($line = ) { - last if (($line =~ /Reference publications about SimGrid/) or ($line =~ /Publications about the SimGrid framework/) or ($line =~ /Papers that use SimGrid-generated results/) or ($line =~ /Our own papers that use SimGrid-generated results/)); + $line =~ s/

/

/g; + last if (($line =~ /Reference publications about SimGrid/) + or ($line =~ /Publications about the SimGrid framework/) + or ($line =~ /Papers that use SimGrid-generated results/) + or ($line =~ /Our own papers that use SimGrid-generated results/)); print OUT $line; } @@ -375,7 +379,7 @@ foreach my $file (@allfiles) { # LBO : ugly way to separate doc in 2 separate stuff ... $tmp_buff .= '
  • Download
    • '."\n"; - $tmp_buff .= '
  • Online documentation
    • '."\n"; + $tmp_buff .= '
  • Online documentation
    • '."\n"; $tmp_buff .= '
  • Publications
    • '."\n"; $tmp_buff .= '
  • People
    • '."\n"; $tmp_buff .= '
  • History
    • '."\n"; @@ -454,6 +458,7 @@ foreach my $file (@allfiles) { s|
  • Data Structures
    • \n||g; s|Related Pages<|Documentation Index<|g; s|