From 678328fb7b84cbcebfff2e5df242b59fb0a0b9ff Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 23 Nov 2012 01:03:17 +0100 Subject: [PATCH] try to fix 'make dist' after GRAS murder (SMPI test still break it) --- buildtools/Cmake/DefinePackages.cmake | 94 +------------------------- buildtools/Cmake/Distrib.cmake | 3 - buildtools/Cmake/GenerateDoc.cmake | 97 --------------------------- tools/CMakeLists.txt | 1 - 4 files changed, 1 insertion(+), 194 deletions(-) diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 7fc7f03b87..726379c9b0 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -87,11 +87,6 @@ set(EXTRA_DIST tools/tesh/tesh.h ) -set(XBT_RL_SRC - src/xbt/xbt_rl_synchro.c - src/xbt/xbt_rl_time.c - ) - set(XBT_SG_SRC src/xbt/xbt_sg_synchro.c ) @@ -410,7 +405,6 @@ set(headers_to_install include/xbt/synchro.h include/xbt/synchro_core.h include/xbt/sysdep.h - include/xbt/time.h include/xbt/virtu.h include/xbt/xbt_os_thread.h ) @@ -542,42 +536,6 @@ set(DOC_TOOLS tools/doxygen/xbt_log_extract_hierarchy.pl ) -set(DOC_GTUT_SRC - doc/gtut-files/01-bones.c - doc/gtut-files/01-bones.output - doc/gtut-files/02-simple.c - doc/gtut-files/02-simple.output - doc/gtut-files/03-args.c - doc/gtut-files/03-args.output - doc/gtut-files/03-args.xml - doc/gtut-files/04-callback.c - doc/gtut-files/04-callback.output - doc/gtut-files/05-globals.c - doc/gtut-files/05-globals.output - doc/gtut-files/06-logs.c - doc/gtut-files/06-logs.output - doc/gtut-files/06-logs.output.error - doc/gtut-files/06-logs.output.fmt - doc/gtut-files/06-logs.output.fmt-bt - doc/gtut-files/06-logs.output.verbose - doc/gtut-files/07-timers.c - doc/gtut-files/07-timers.output - doc/gtut-files/08-exceptions.c - doc/gtut-files/08-exceptions.output - doc/gtut-files/09-datatype-dump.c - doc/gtut-files/09-simpledata.c - doc/gtut-files/09-simpledata.output - doc/gtut-files/10-rpc.c - doc/gtut-files/10-rpc.output - doc/gtut-files/11-explicitwait.c - doc/gtut-files/11-explicitwait.output - doc/gtut-files/11-explicitwait.xml - doc/gtut-files/gtut-platform-3nodes.xml - doc/gtut-files/gtut-platform.xml - doc/gtut-files/Makefile - doc/gtut-files/README - doc/gtut-files/test.xml -) set(USER_GUIDE_SOURCES doc/user_guide/doxygen/footer.html @@ -596,57 +554,7 @@ set(USER_GUIDE_SOURCES doc/user_guide/doxygen/use.doc doc/user_guide/doxygen/stylesheet.css ) - -set(LISTE_GTUT - doc/gtut-files/gtut-tour-00-install.doc - doc/gtut-files/gtut-tour-01-bones.doc - doc/gtut-files/gtut-tour-02-simple.doc - doc/gtut-files/gtut-tour-03-args.doc - doc/gtut-files/gtut-tour-04-callback.doc - doc/gtut-files/gtut-tour-05-globals.doc - doc/gtut-files/gtut-tour-06-logs.doc - doc/gtut-files/gtut-tour-07-timers.doc - doc/gtut-files/gtut-tour-08-exceptions.doc - doc/gtut-files/gtut-tour-09-simpledata.doc - doc/gtut-files/gtut-tour-10-rpc.doc - doc/gtut-files/gtut-tour-11-explicitwait.doc - doc/gtut-files/gtut-tour-12-staticstruct.doc - doc/gtut-files/gtut-tour-13-pointers.doc - doc/gtut-files/gtut-tour-14-dynar.doc - doc/gtut-files/gtut-tour-15-manualdatadef.doc - doc/gtut-files/gtut-tour-16-exchangecb.doc - doc/gtut-files/gtut-tour.doc - doc/gtut-files/gtut-tour-recap-messages.doc - ) - -set(EXTRA_LISTE_GTUT - doc/gtut-files/01-bones.output - doc/gtut-files/02-simple.output - doc/gtut-files/03-args.output - doc/gtut-files/03-args.xml - doc/gtut-files/04-callback.output - doc/gtut-files/05-globals.output - doc/gtut-files/06-logs.output - doc/gtut-files/06-logs.output.error - doc/gtut-files/06-logs.output.fmt - doc/gtut-files/06-logs.output.fmt-bt - doc/gtut-files/06-logs.output.verbose - doc/gtut-files/07-timers.output - doc/gtut-files/08-exceptions.output - doc/gtut-files/09-simpledata.output - doc/gtut-files/10-rpc.output - doc/gtut-files/11-explicitwait.output - doc/gtut-files/11-explicitwait.xml - doc/gtut-files/gtut-howto-design.doc - doc/gtut-files/gtut-howto.doc - doc/gtut-files/gtut-introduction.doc - doc/gtut-files/gtut-main.doc - doc/gtut-files/gtut-platform-3nodes.xml - doc/gtut-files/gtut-platform.xml - doc/gtut-files/README - doc/gtut-files/test.xml - ) - + set(REF_GUIDE_SOURCES doc/ref_guide/doxygen/footer.html doc/ref_guide/doxygen/header.html diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake index 4da978c9e5..c1b319c91a 100644 --- a/buildtools/Cmake/Distrib.cmake +++ b/buildtools/Cmake/Distrib.cmake @@ -205,9 +205,6 @@ set(source_to_pack ${DOC_FIGS} ${DOC_IMG} ${DOC_SOURCES} - ${DOC_GTUT_SRC} - ${LISTE_GTUT} - ${EXTRA_LISTE_GTUT} ${DOC_TOOLS} ${DOC_SHARED_TAG} ${REF_GUIDE_SOURCES} diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake index ae81f04f02..d70d56aa48 100644 --- a/buildtools/Cmake/GenerateDoc.cmake +++ b/buildtools/Cmake/GenerateDoc.cmake @@ -117,100 +117,3 @@ add_custom_target(sync-gforge-dtd WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}" ) -##############################################################################" -# GTUT FILES - -#message(STATUS "Check individual TOCs") - -#foreach(file_name ${LISTE_GTUT}) -# file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc) -# file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc) -# -# file(READ "${file_name}" file_content) -# string(REGEX MATCH "Table of Contents.*
" valeur_line "${file_content}") -# string(REPLACE "\n" ";" valeur_line "${valeur_line}") -# string(REPLACE "\n" ";" file_content "${file_content}") -# -# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc "\n") # make sure it exists -# foreach(line ${file_content}) -# string(REGEX MATCH "[\\]s?u?b?s?u?b?section.*" line2 "${line}") -# string(REGEX MATCH ".*_toc.*" line3 "${line}") -# if(line2 AND NOT line3) -# string(REPLACE "\\section " "" line2 ${line2}) -# string(REPLACE "\\subsection " "subsection" line2 ${line2}) -# string(REPLACE "\\subsubsection " "subsubsection" line2 ${line2}) -# string(REGEX REPLACE " .*" "" line2 ${line2}) -# set(line2 " - \\ref ${line2}") -# string(REPLACE " - \\ref subsection" " - \\ref " line2 ${line2}) -# string(REPLACE " - \\ref subsubsection" " - \\ref " line2 ${line2}) -# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc "${line2}\n") -# endif() -# endforeach(line ${file_content}) -# -# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc "\n") # make sure it exists -# foreach(line ${valeur_line}) -# string(REGEX MATCH ".*ref.*" line_ok ${line}) -# if(line_ok) -# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc "${line_ok}\n") -# endif() -# endforeach(line ${valeur_line}) -# -# exec_program("${CMAKE_COMMAND} -E compare_files ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc" OUTPUT_VARIABLE compare_files) -# if(compare_files) -# message(STATUS "Wrong toc for ${file_name}. Should be:") -# file(READ "${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc" file_content) -# message("${file_content}") -# exec_program("diff -u ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc") -# endif() -#endforeach(file_name ${LISTE_GTUT}) -# -#file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc) -#file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc) -# -#message(STATUS "Check main TOC") -# -#foreach(file_name ${LISTE_GTUT}) -# file(READ "${file_name}" file_content) -# string(REGEX MATCH "Table of Contents.*
" valeur_line "${file_content}") -# string(REPLACE "\n" ";" valeur_line "${valeur_line}") -# string(REPLACE "\n" ";" file_content "${file_content}") -# -# foreach(line ${file_content}) -# string(REGEX MATCH ".*@page.*" line2 "${line}") -# if(line2) -# string(REPLACE "@page " "" line2 "${line2}") -# string(REGEX REPLACE " .*" "" line2 "${line2}") -# set(line2 " - \\ref ${line2}") -# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc "${line2}\n") -# endif() -# endforeach(line ${file_content}) -# -# foreach(line ${valeur_line}) -# string(REGEX MATCH ".*toc.*" line1 "${line}") -# string(REGEX MATCH ".*
.*" line2 "${line}") -# string(REGEX MATCH "^[ ]*$" line3 "${line}") -# string(REGEX MATCH "Table of Contents" line4 "${line}") -# if(NOT line1 AND NOT line2 AND NOT line3 AND NOT line4) -# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc " ${line}\n") -# endif() -# endforeach(line ${valeur_line}) -#endforeach(file_name ${LISTE_GTUT}) -# -#file(READ "${CMAKE_HOME_DIRECTORY}/doc/doxygen/gtut-tour.doc" file_content) -#string(REPLACE "\n" ";" file_content "${file_content}") -#foreach(line ${file_content}) -# string(REGEX MATCH "^[ ]+.*\\ref" line1 "${line}") -# if(line1) -# file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc "${line}\n") -# endif() -#endforeach(line ${file_content}) -# -#exec_program("${CMAKE_COMMAND} -E compare_files ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc" OUTPUT_VARIABLE compare_files) -#if(compare_files) -# message(STATUS "Wrong toc for gtut-tour.doc Right one is in tmp.realtoc") -# exec_program("diff -u ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc") -#else() -# file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.realtoc) -#endif() -# -#file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/doxygen/tmp.curtoc) \ No newline at end of file diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 32efcc8133..7634adcc37 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 2.6) set(bin_files ${bin_files} - ${CMAKE_CURRENT_SOURCE_DIR}/compile-stats ${CMAKE_CURRENT_SOURCE_DIR}/fix-paje-trace.sh ${CMAKE_CURRENT_SOURCE_DIR}/indent ${CMAKE_CURRENT_SOURCE_DIR}/sg_unit_extractor.pl -- 2.20.1