From: navarrop Date: Wed, 19 May 2010 15:25:13 +0000 (+0000) Subject: Prepare to windows. X-Git-Tag: v3_5~1034 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a6ff943c715348dfb571bd7c13f875d91e59a039 Prepare to windows. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7774 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ad6b932a67..cea929cfae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,14 +1,28 @@ cmake_minimum_required(VERSION 2.6) -exec_program("rm ${Project_BINARY_DIR}/CTestTestfile.cmake" OUTPUT_VARIABLE rmok) project(simgrid CXX C) set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE) +set(CMAKE_CXX_FLAGS "" CACHE TYPE INTERNAL FORCE) +set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE) set(release_version "3.5") set(libsimgrid_version "${release_version}") set(libgras_version "${release_version}") set(libsmpi_version "${release_version}") +exec_program("${CMAKE_COMMAND} -E remove -f ${simgrid_BINARY_DIR}/CTestTestfile.cmake" OUTPUT_VARIABLE rmok) + +if(WIN32) + message("C_COMPILER $ENV{CC}") + message("CXX_COMPILER $ENV{CXX}") + message("MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM}") + message("RC_COMPILER $ENV{RC}") + message("INCLUDE $ENV{INCLUDE}") + message("LIB $ENV{LIB}") + + if(NOT $ENV{CC} OR NOT $ENV{CXX} OR NOT $ENV{INCLUDE} OR NOT $ENV{RC} OR NOT $ENV{LIB}) + message(FATAL_ERROR "Need to set CC, CXX, RC, INCLUDE and LIB to environment variables.") + endif(NOT $ENV{CC} OR NOT $ENV{CXX} OR NOT $ENV{INCLUDE} OR NOT $ENV{RC} OR NOT $ENV{LIB}) +endif(WIN32) ### Find programs and paths -find_program(SED_EXE NAMES sed) find_path(GCOV_PATH NAMES gcov PATHS NO_DEFAULT_PATHS) find_path(VALGRIND_PATH NAMES valgrind PATHS NO_DEFAULT_PATHS) @@ -25,6 +39,10 @@ if(EXISTS /usr/include/) set(INCLUDES "${INCLUDES} -I/usr/include/") endif(EXISTS /usr/include/) +if(WIN32) + set(INCLUDES "${INCLUDES} -I$ENV{INCLUDE}") +endif(WIN32) + if(enable_coverage) add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) else(enable_coverage) diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt index f8f916623c..dba49fb12f 100755 --- a/buildtools/Cmake/src/CMakeDistrib.txt +++ b/buildtools/Cmake/src/CMakeDistrib.txt @@ -61,7 +61,7 @@ endif(HAVE_JAVA) if(HAVE_LUA) add_custom_target(absolute_liblink ALL - COMMAND ln -sf $ENV{DESTDIR}${prefix}/lib/libsimgrid.so ${CMAKE_BINARY_DIR}/libsimgrid.so) + COMMAND ${CMAKE_COMMAND} -E create_symlink $ENV{DESTDIR}${prefix}/lib/libsimgrid.so ${CMAKE_BINARY_DIR}/libsimgrid.so) install(FILES ${CMAKE_BINARY_DIR}/libsimgrid.so DESTINATION $ENV{DESTDIR}${prefix}/lib/lua/5.1 RENAME simgrid.so) @@ -79,32 +79,38 @@ endif(HAVE_RUBY) ########################################### add_custom_target(uninstall -COMMAND rm -rf ${prefix}/doc/simgrid -COMMAND echo "uninstall doc ok" -COMMAND rm -f ${uninstall_libs} -COMMAND echo "uninstall lib ok" -COMMAND rm -f ${uninstall_bins} -COMMAND rm -f ${prefix}/bin/simgrid_colorizer.pl -COMMAND echo "uninstall bin ok" -COMMAND rm -f ${uninstall_HEADERS} -COMMAND echo "uninstal include ok" -COMMAND rm -Rf ${prefix}/include/amok ${prefix}/include/gras ${prefix}/include/instr ${prefix}/include/msg -COMMAND rm -Rf ${prefix}/include/simdag ${prefix}/include/smpi ${prefix}/include/surf ${prefix}/include/xbt +COMMAND ${CMAKE_COMMAND} -E remove_directory ${prefix}/doc/simgrid +COMMAND ${CMAKE_COMMAND} -E echo "uninstall doc ok" +COMMAND ${CMAKE_COMMAND} -E remove -f ${uninstall_libs} +COMMAND ${CMAKE_COMMAND} -E echo "uninstall lib ok" +COMMAND ${CMAKE_COMMAND} -E remove -f ${uninstall_bins} +COMMAND ${CMAKE_COMMAND} -E remove -f ${prefix}/bin/simgrid_colorizer.pl +COMMAND ${CMAKE_COMMAND} -E echo "uninstall bin ok" +COMMAND ${CMAKE_COMMAND} -E remove -f ${uninstall_HEADERS} +COMMAND ${CMAKE_COMMAND} -E echo "uninstal include ok" +COMMAND ${CMAKE_COMMAND} -E remove_directory ${prefix}/include/amok +COMMAND ${CMAKE_COMMAND} -E remove_directory ${prefix}/include/gras +COMMAND ${CMAKE_COMMAND} -E remove_directory ${prefix}/include/instr +COMMAND ${CMAKE_COMMAND} -E remove_directory ${prefix}/include/msg +COMMAND ${CMAKE_COMMAND} -E remove_directory ${prefix}/include/simdag +COMMAND ${CMAKE_COMMAND} -E remove_directory ${prefix}/include/smpi +COMMAND ${CMAKE_COMMAND} -E remove_directory ${prefix}/include/surf +COMMAND ${CMAKE_COMMAND} -E remove_directory ${prefix}/include/xbt WORKING_DIRECTORY "${prefix}" ) if(HAVE_JAVA) add_custom_command(TARGET uninstall - COMMAND rm -f ${prefix}/share/simgrid.jar - COMMAND echo "uninstall binding java" + COMMAND ${CMAKE_COMMAND} -E remove -f ${prefix}/share/simgrid.jar + COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding java" WORKING_DIRECTORY "${PROJECT_DIRECTORY}/" ) endif(HAVE_JAVA) if(HAVE_LUA) add_custom_command(TARGET uninstall - COMMAND echo "uninstall binding lua" - COMMAND rm -f ${prefix}/lib/lua/5.1/simgrid.so + COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding lua" + COMMAND ${CMAKE_COMMAND} -E remove -f ${prefix}/lib/lua/5.1/simgrid.so WORKING_DIRECTORY "${PROJECT_DIRECTORY}/" ) endif(HAVE_LUA) @@ -112,9 +118,9 @@ endif(HAVE_LUA) if(HAVE_RUBY) string(REGEX REPLACE "^.*ruby/" "" install_link_ruby "${RUBY_ARCH_DIR}") add_custom_command(TARGET uninstall - COMMAND echo "uninstall binding ruby" - COMMAND rm -f ${prefix}/lib/ruby/${install_link_ruby}/libsimgrid.so - COMMAND rm -f ${prefix}/lib/ruby/${install_link_ruby}/simgrid.rb + COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding ruby" + COMMAND ${CMAKE_COMMAND} -E remove -f ${prefix}/lib/ruby/${install_link_ruby}/libsimgrid.so + COMMAND ${CMAKE_COMMAND} -E remove -f ${prefix}/lib/ruby/${install_link_ruby}/simgrid.rb WORKING_DIRECTORY "${PROJECT_DIRECTORY}/" ) endif(HAVE_RUBY) @@ -124,13 +130,13 @@ endif(HAVE_RUBY) ###################################### add_custom_target(html -COMMAND echo "Make the html doc" -COMMAND echo "cmake -DBIBTEX2HTML=${BIBTEX2HTML} ./" -COMMAND cmake -DBIBTEX2HTML=${BIBTEX2HTML} ./ -COMMAND rm -rf ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/CMakeFiles -COMMAND rm -f ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/CMakeCache.txt -COMMAND rm -f ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/cmake_install.cmake -COMMAND rm -f ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/Makefile +COMMAND ${CMAKE_COMMAND} -E echo "Make the html doc" +COMMAND ${CMAKE_COMMAND} -E echo "cmake -DBIBTEX2HTML=${BIBTEX2HTML} ./" +COMMAND ${CMAKE_COMMAND} -DBIBTEX2HTML=${BIBTEX2HTML} ./ +COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/CMakeFiles +COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/CMakeCache.txt +COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/cmake_install.cmake +COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/Makefile WORKING_DIRECTORY "${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc" ) @@ -224,73 +230,73 @@ COMMAND make test ####################################### add_custom_target(maintainer-clean -COMMAND rm -f src/config_unit.c -COMMAND rm -f src/cunit_unit.c -COMMAND rm -f src/dict_unit.c -COMMAND rm -f src/dynar_unit.c -COMMAND rm -f src/ex_unit.c -COMMAND rm -f src/set_unit.c -COMMAND rm -f src/simgrid_units_main.c -COMMAND rm -f src/swag_unit.c -COMMAND rm -f src/xbt_sha_unit.c -COMMAND rm -f src/xbt_str_unit.c -COMMAND rm -f src/xbt_strbuff_unit.c -COMMAND rm -f src/xbt_synchro_unit.c +COMMAND ${CMAKE_COMMAND} -E remove -f src/config_unit.c +COMMAND ${CMAKE_COMMAND} -E remove -f src/cunit_unit.c +COMMAND ${CMAKE_COMMAND} -E remove -f src/dict_unit.c +COMMAND ${CMAKE_COMMAND} -E remove -f src/dynar_unit.c +COMMAND ${CMAKE_COMMAND} -E remove -f src/ex_unit.c +COMMAND ${CMAKE_COMMAND} -E remove -f src/set_unit.c +COMMAND ${CMAKE_COMMAND} -E remove -f src/simgrid_units_main.c +COMMAND ${CMAKE_COMMAND} -E remove -f src/swag_unit.c +COMMAND ${CMAKE_COMMAND} -E remove -f src/xbt_sha_unit.c +COMMAND ${CMAKE_COMMAND} -E remove -f src/xbt_str_unit.c +COMMAND ${CMAKE_COMMAND} -E remove -f src/xbt_strbuff_unit.c +COMMAND ${CMAKE_COMMAND} -E remove -f src/xbt_synchro_unit.c WORKING_DIRECTORY "${PROJECT_DIRECTORY}" ) add_custom_target(supernovae-clean -COMMAND rm -f src/supernovae_gras.c -COMMAND rm -f src/supernovae_sg.c -COMMAND rm -f src/supernovae_smpi.c +COMMAND ${CMAKE_COMMAND} -E remove -f src/supernovae_gras.c +COMMAND ${CMAKE_COMMAND} -E remove -f src/supernovae_sg.c +COMMAND ${CMAKE_COMMAND} -E remove -f src/supernovae_smpi.c WORKING_DIRECTORY "${PROJECT_DIRECTORY}" ) add_custom_target(doc-clean -COMMAND rm -f doc/all_bib.html -COMMAND rm -f doc/all_bib.latin1.html -COMMAND rm -f doc/all_bib.latin1.html.tmp -COMMAND rm -f doc/logcategories.sh -COMMAND rm -f doc/publis_core.bib -COMMAND rm -f doc/publis_core_bib.html -COMMAND rm -f doc/publis_core_bib.latin1.html -COMMAND rm -f doc/publis_core_bib.latin1.html.tmp -COMMAND rm -f doc/publis_count.html -COMMAND rm -f doc/publis_extern.bib -COMMAND rm -f doc/publis_extern_bib.html -COMMAND rm -f doc/publis_extern_bib.latin1.html -COMMAND rm -f doc/publis_extern_bib.latin1.html.tmp -COMMAND rm -f doc/publis_intra.bib -COMMAND rm -f doc/publis_intra_bib.html -COMMAND rm -f doc/publis_intra_bib.latin1.html -COMMAND rm -f doc/publis_intra_bib.latin1.html.tmp -COMMAND rm -f doc/tmp.realtoc -COMMAND rm -f doc/using_bib.html -COMMAND rm -f doc/using_bib.latin1.html -COMMAND rm -f doc/using_bib.latin1.html.tmp -COMMAND rm -f doc/realtoc.sh +COMMAND ${CMAKE_COMMAND} -E remove -f doc/all_bib.html +COMMAND ${CMAKE_COMMAND} -E remove -f doc/all_bib.latin1.html +COMMAND ${CMAKE_COMMAND} -E remove -f doc/all_bib.latin1.html.tmp +COMMAND ${CMAKE_COMMAND} -E remove -f doc/logcategories.sh +COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_core.bib +COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_core_bib.html +COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_core_bib.latin1.html +COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_core_bib.latin1.html.tmp +COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_count.html +COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_extern.bib +COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_extern_bib.html +COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_extern_bib.latin1.html +COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_extern_bib.latin1.html.tmp +COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_intra.bib +COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_intra_bib.html +COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_intra_bib.latin1.html +COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_intra_bib.latin1.html.tmp +COMMAND ${CMAKE_COMMAND} -E remove -f doc/tmp.realtoc +COMMAND ${CMAKE_COMMAND} -E remove -f doc/using_bib.html +COMMAND ${CMAKE_COMMAND} -E remove -f doc/using_bib.latin1.html +COMMAND ${CMAKE_COMMAND} -E remove -f doc/using_bib.latin1.html.tmp +COMMAND ${CMAKE_COMMAND} -E remove -f doc/realtoc.sh WORKING_DIRECTORY "${PROJECT_DIRECTORY}" ) add_custom_target(java-clean -COMMAND rm -f src/simgrid.jar -COMMAND rm -rf src/.classes -COMMAND rm -f examples/java/basic/BasicTest.class -COMMAND rm -f examples/java/basic/FinalizeTask.class -COMMAND rm -f examples/java/basic/Forwarder.class -COMMAND rm -f examples/java/basic/Master.class -COMMAND rm -f examples/java/basic/Slave.class -COMMAND rm -f examples/java/comm_time/CommTimeTest.class -COMMAND rm -f examples/java/comm_time/FinalizeTask.class -COMMAND rm -f examples/java/comm_time/Master.class -COMMAND rm -f examples/java/comm_time/Slave.class -COMMAND rm -f examples/java/ping_pong/PingPongTask.class -COMMAND rm -f examples/java/ping_pong/PingPongTest.class -COMMAND rm -f examples/java/ping_pong/Receiver.class -COMMAND rm -f examples/java/ping_pong/Sender.class -COMMAND rm -f examples/java/suspend/DreamMaster.class -COMMAND rm -f examples/java/suspend/LazyGuy.class -COMMAND rm -f examples/java/suspend/SuspendTest.class +COMMAND ${CMAKE_COMMAND} -E remove -f src/simgrid.jar +COMMAND ${CMAKE_COMMAND} -E remove_directory src/.classes +COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/basic/BasicTest.class +COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/basic/FinalizeTask.class +COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/basic/Forwarder.class +COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/basic/Master.class +COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/basic/Slave.class +COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/comm_time/CommTimeTest.class +COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/comm_time/FinalizeTask.class +COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/comm_time/Master.class +COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/comm_time/Slave.class +COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/ping_pong/PingPongTask.class +COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/ping_pong/PingPongTest.class +COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/ping_pong/Receiver.class +COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/ping_pong/Sender.class +COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/suspend/DreamMaster.class +COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/suspend/LazyGuy.class +COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/suspend/SuspendTest.class WORKING_DIRECTORY "${PROJECT_DIRECTORY}" ) diff --git a/buildtools/Cmake/src/CMakeDocs.txt b/buildtools/Cmake/src/CMakeDocs.txt index a7a9db3ffa..4ac49782b1 100644 --- a/buildtools/Cmake/src/CMakeDocs.txt +++ b/buildtools/Cmake/src/CMakeDocs.txt @@ -63,12 +63,12 @@ ${PROJECT_DIRECTORY}/doc/webcruft/poster_thumbnail.png if(DOXYGEN_PATH AND FIG2DEV_PATH) - exec_program("${FIG2DEV_PATH}/fig2dev -Lmap ${PROJECT_DIRECTORY}/doc/fig/simgrid_modules.fig" OUTPUT_VARIABLE output_fig2dev) - string(REPLACE "\n" ";" output_fig2dev "${output_fig2dev}") - - file(REMOVE ${PROJECT_DIRECTORY}/doc/simgrid_modules.map) + exec_program("${FIG2DEV_PATH}/fig2dev -Lmap ${PROJECT_DIRECTORY}/doc/fig/simgrid_modules.fig" OUTPUT_VARIABLE output_fig2dev) + string(REPLACE "\n" ";" output_fig2dev "${output_fig2dev}") + + file(REMOVE ${PROJECT_DIRECTORY}/doc/simgrid_modules.map) - foreach(line ${output_fig2dev}) + foreach(line ${output_fig2dev}) string(REGEX MATCH "IMG" test_oki1 "${line}") string(REGEX MATCH "MAP" test_oki2 "${line}") string(REGEX MATCH "AREA" test_oki3 "${line}") @@ -164,10 +164,10 @@ if(BIBTOOL_PATH AND BIBTEX2HTML_PATH AND ICONV_PATH) string(REPLACE "\n" ";" READ_TMP ${READ_TMP}) foreach(line ${READ_TMP}) - string(REGEX MATCH "WARNING: unknown field type" line1 ${line}) - if(NOT line1) - file(APPEND ${file_tmp2} "${line}\n") - endif(NOT line1) + string(REGEX MATCH "WARNING: unknown field type" line1 ${line}) + if(NOT line1) + file(APPEND ${file_tmp2} "${line}\n") + endif(NOT line1) endforeach(line ${READ_TMP}) exec_program("${PROJECT_DIRECTORY}/tools/doxygen/bibtex2html_postprocessor.pl < ${file_tmp2} > ${file_tmp}" "${PROJECT_DIRECTORY}/doc/") endforeach(file ${LISTE_QUATRE}) @@ -188,7 +188,7 @@ endif(DOXYGEN_PATH AND FIG2DEV_PATH) file(REMOVE ${PROJECT_DIRECTORY}/doc/logcategories.doc) file(APPEND ${PROJECT_DIRECTORY}/doc/logcategories.doc "/* Generated file, do not edit */\n") file(APPEND ${PROJECT_DIRECTORY}/doc/logcategories.doc "/** \\addtogroup XBT_log_cats\n") -file(APPEND ${PROJECT_DIRECTORY}/doc/logcategories.doc " @{\n") +file(APPEND ${PROJECT_DIRECTORY}/doc/logcategories.doc " @{\n") exec_program("${PROJECT_DIRECTORY}/tools/doxygen/xbt_log_extract_hierarchy.pl" "${PROJECT_DIRECTORY}/src" OUTPUT_VARIABLE output_log_extract_hierarchy) file(APPEND ${PROJECT_DIRECTORY}/doc/logcategories.doc "${output_log_extract_hierarchy}\n") file(APPEND ${PROJECT_DIRECTORY}/doc/logcategories.doc "@}*/") @@ -245,39 +245,39 @@ file(REMOVE ${PROJECT_DIRECTORY}/doc/tmp.realtoc) message("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}") - + 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 ${PROJECT_DIRECTORY}/doc/tmp.realtoc "${line2}\n") - endif(line2) + if(line2) + string(REPLACE "@page " "" line2 "${line2}") + string(REGEX REPLACE " .*" "" line2 "${line2}") + set(line2 " - \\ref ${line2}") + file(APPEND ${PROJECT_DIRECTORY}/doc/tmp.realtoc "${line2}\n") + endif(line2) 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 ${PROJECT_DIRECTORY}/doc/tmp.realtoc " ${line}\n") - endif(NOT line1 AND NOT line2 AND NOT line3 AND NOT line4) + 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 ${PROJECT_DIRECTORY}/doc/tmp.realtoc " ${line}\n") + endif(NOT line1 AND NOT line2 AND NOT line3 AND NOT line4) endforeach(line ${valeur_line}) endforeach(file_name ${LISTE_GTUT}) file(READ "${PROJECT_DIRECTORY}/doc/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 ${PROJECT_DIRECTORY}/doc/tmp.curtoc "${line}\n") - endif(line1) + string(REGEX MATCH "^[ ]+.*\\ref" line1 "${line}") + if(line1) + file(APPEND ${PROJECT_DIRECTORY}/doc/tmp.curtoc "${line}\n") + endif(line1) endforeach(line ${file_content}) exec_program("${CMAKE_COMMAND} -E compare_files ${PROJECT_DIRECTORY}/doc/tmp.curtoc ${PROJECT_DIRECTORY}/doc/tmp.realtoc" OUTPUT_VARIABLE compare_files) diff --git a/buildtools/Cmake/src/CMakeMaintainerMode.txt b/buildtools/Cmake/src/CMakeMaintainerMode.txt index 675a5bcf69..bb5319b078 100644 --- a/buildtools/Cmake/src/CMakeMaintainerMode.txt +++ b/buildtools/Cmake/src/CMakeMaintainerMode.txt @@ -1,4 +1,4 @@ -if(enable_maintainer_mode) +if(enable_maintainer_mode AND NOT WIN32) message("") message("________________________________________________________________________________") message("________________________________________________________________________________ FLEXMl") @@ -126,5 +126,5 @@ message("_______________________________________________________________________ foreach(file ${SRC_TO_LOOK}) configure_file(${file} ${file} COPYONLY) endforeach(file ${SRC_TO_LOOK}) -endif(enable_maintainer_mode) +endif(enable_maintainer_mode AND NOT WIN32) diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt index e4ac81d0f0..90351fca56 100644 --- a/buildtools/Cmake/src/CMakeMakeExeLib.txt +++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt @@ -1,15 +1,15 @@ ### Make Libs -if(enable_supernovae) +if(enable_supernovae AND NOT WIN32) include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeSupernovae.txt) -else(enable_supernovae) +else(enable_supernovae AND NOT WIN32) add_library(simgrid SHARED ${simgrid_sources}) add_library(simgrid_static STATIC ${simgrid_sources}) add_library(gras SHARED ${gras_sources}) if(enable_smpi) add_library(smpi SHARED ${SMPI_SRC}) endif(enable_smpi) -endif(enable_supernovae) +endif(enable_supernovae AND NOT WIN32) set_target_properties(simgrid PROPERTIES VERSION ${libsimgrid_version}) set_target_properties(gras PROPERTIES VERSION ${libgras_version}) @@ -22,9 +22,13 @@ set(GRAS_DEP "-lm -lpthread") set(SIMGRID_DEP "-lm") set(SMPI_DEP "") +if(WIN32) + set(GRAS_DEP "-lm") +endif(WIN32) + if(HAVE_RUBY) set(SIMGRID_DEP "${SIMGRID_DEP} -l${RUBY_LIBRARY_NAME} -module") - exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.so" "${PROJECT_DIRECTORY}" OUTPUT_VARIABLE LIEN_OK) + exec_program("${CMAKE_COMMAND} -E create_symlink ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.so" "${PROJECT_DIRECTORY}" OUTPUT_VARIABLE LIEN_OK) endif(HAVE_RUBY) if(CMAKE_SYSTEM_NAME MATCHES "Darwin") @@ -44,7 +48,7 @@ endif(pthread) if(HAVE_LUA) SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -l${liblua}") - exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so ${PROJECT_DIRECTORY}/examples/lua/simgrid.so" "${PROJECT_DIRECTORY}" OUTPUT_VARIABLE LIEN_OK) + exec_program("${CMAKE_COMMAND} -E create_symlink ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so ${PROJECT_DIRECTORY}/examples/lua/simgrid.so" "${PROJECT_DIRECTORY}" OUTPUT_VARIABLE LIEN_OK) endif(HAVE_LUA) if(HAVE_GTNETS) diff --git a/buildtools/Cmake/src/CMakeOption.txt b/buildtools/Cmake/src/CMakeOption.txt index 7827bb6288..d1ccd82c71 100644 --- a/buildtools/Cmake/src/CMakeOption.txt +++ b/buildtools/Cmake/src/CMakeOption.txt @@ -26,6 +26,12 @@ option(enable_memcheck "Enable memcheck." off) option(enable_print_message "Enable print message during config." off) option(enable_model-checking "" off) +if(WIN32) #actually not enable with windows + message("Mode supernovae and maintainer disable with Windows.") + set(enable_supernovae false CACHE TYPE INTERNAL FORCE) + set(enable_maintainer_mode false CACHE TYPE INTERNAL FORCE) +endif(WIN32) + mark_as_advanced(enable_coverage) mark_as_advanced(enable_memcheck) mark_as_advanced(enable_print_message) diff --git a/buildtools/Cmake/src/CMakeSupernovae.txt b/buildtools/Cmake/src/CMakeSupernovae.txt index 56a485238f..36cc483b63 100644 --- a/buildtools/Cmake/src/CMakeSupernovae.txt +++ b/buildtools/Cmake/src/CMakeSupernovae.txt @@ -52,7 +52,7 @@ foreach(file ${gras_sources}) endif(en_plus) endforeach(file ${gras_sources}) -exec_program("rm ${PROJECT_DIRECTORY}/src/supernovae_sg.c ${PROJECT_DIRECTORY}/src/supernovae_gras.c ${PROJECT_DIRECTORY}/src/supernovae_smpi.c"OUTPUT_VARIABLE "SUPER_OK") +exec_program("${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/src/supernovae_sg.c ${PROJECT_DIRECTORY}/src/supernovae_gras.c ${PROJECT_DIRECTORY}/src/supernovae_smpi.c"OUTPUT_VARIABLE "SUPER_OK") exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/src/mk_supernovae.sh" OUTPUT_VARIABLE "SUPER_OK") exec_program("${PROJECT_DIRECTORY}/src/mk_supernovae.sh ${PROJECT_DIRECTORY}/src/supernovae_sg.c ${temp_src_simgrid}" OUTPUT_VARIABLE "SUPER_OK") exec_program("${PROJECT_DIRECTORY}/src/mk_supernovae.sh ${PROJECT_DIRECTORY}/src/supernovae_gras.c ${temp_src_gras}" OUTPUT_VARIABLE "SUPER_OK")