Windows implementation

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8176 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 333be68..9672271 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,10 @@ SET(PROJECT_DIRECTORY "${CMAKE_HOME_DIRECTORY}")
 
 ### Set some variables for Cmake
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
-set(INCLUDES "-I${PROJECT_DIRECTORY} -I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I${CMAKE_CURRENT_BINARY_DIR}/src/")
+set(INCLUDES "-I${PROJECT_DIRECTORY} -I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I${CMAKE_CURRENT_BINARY_DIR}/src")
+if(WIN32)
+    set(INCLUDES "${INCLUDES} -I${PROJECT_DIRECTORY}/include/xbt -I${PROJECT_DIRECTORY}/src/xbt") #for win32_ucontext.[ch]
+endif(WIN32)
 set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY})
 
 if(EXISTS /usr/include/)
@@ -38,9 +41,18 @@ if(WIN32)
        set(INCLUDES_MORE $ENV{INCLUDE})
        string(REPLACE "\\" "/" INCLUDES_MORE "${INCLUDES_MORE}")
        foreach(include_dir ${INCLUDES_MORE})
-               set(INCLUDES "${INCLUDES} -I\"${include_dir}\"")
+           if(IS_DIRECTORY ${include_dir})
+               string(REGEX MATCH ".*[ ].*" testoki "${include_dir}")
+               if(testoki)
+                       string(REPLACE " " "\\ " include_dir "${include_dir}")
+                   set(INCLUDES "${INCLUDES} -I\"${include_dir}\"")
+               else(testoki)
+                   set(INCLUDES "${INCLUDES} -I${include_dir}")
+               endif(testoki)
+           else(IS_DIRECTORY ${include_dir})
+               message(FATAL_ERROR "${include_dir} not find")
+           endif(IS_DIRECTORY ${include_dir})
        endforeach(include_dir ${INCLUDES_MORE})
-       set(INCLUDES "${INCLUDES} -I${PROJECT_DIRECTORY}/include/xbt -I${PROJECT_DIRECTORY}/src/xbt") #for win32_ucontext.[ch]
 
     if(BORLAND)                        ### BORLAND COMPILER
            set(__BORLANDC__ 1)
@@ -76,7 +88,6 @@ if(WIN32)
     message("Be sure all those variables are correctely set.")
     message("  -- C_COMPILER                   $ENV{CC}")
     message("  -- CXX_COMPILER                 $ENV{CXX}")    
-    message("  -- RC_COMPILER                  $ENV{RC}")
     message("  -- INCLUDE                      $ENV{INCLUDE}")
     message("  -- LIB                          $ENV{LIB}")
     message("  -- MAKE_PROGRAM                 ${CMAKE_MAKE_PROGRAM}")
@@ -136,9 +147,10 @@ endif(HAVE_JAVA)
 ### Make tests
 if(NOT WIN32)
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/AddTests.cmake)
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake)
 endif(NOT WIN32)
 
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake)
+
 ### Setup the distrib
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/Distrib.cmake)
 

diff --git a/Devcpp.bat b/Devcpp.bat
index 5e83004..e7c56e1 100644 (file)
--- a/Devcpp.bat
+++ b/Devcpp.bat
@@ -2,14 +2,15 @@ echo off
 set CC=C:\Dev-Cpp\bin\gcc\r
 set CXX=C:\Dev-Cpp\bin\g++\r
 \r
-set INCLUDE=C:\Dev-Cpp\include;C:\Program Files\Microsoft SDKs\Windows\v7.0A\Include\r
-set LIB=C:\Dev-Cpp\lib;C:\Program Files\Microsoft SDKs\Windows\v7.0A\Lib\r
+set INCLUDE=C:\Dev-Cpp\include\r
+set LIB=C:\Dev-Cpp\lib\r
 \r
-set RC=C:\Program Files\Microsoft SDKs\Windows\v7.0A\bin\RC\r
+set Path=%Path%;C:\Dev-Cpp\bin\r
 \r
-set Path=%Path%;C:\Program Files\Microsoft SDKs\Windows\v7.0A\bin\r
-set Path=%Path%;C:\Program Files\Microsoft SDKs\Windows\v7.0A\Lib\r
-set Path=%Path%;C:\Program Files\Microsoft SDKs\Windows\v7.0A\Include\r
+echo on\r
 \r
-set Path=%Path%;C:\Borland\BCC55\r
-set Path=%Path%;C:\Dev-Cpp\bin
\ No newline at end of file
+del CMakeCache.txt\r
+\r
+cmake -G"Unix Makefiles" -Wno-dev -Denable_tracing=on -Denable_print_message=on .\r
+\r
+make clean
\ No newline at end of file

diff --git a/borland.bat b/borland.bat
index 4a032af..09e9dd8 100644 (file)
--- a/borland.bat
+++ b/borland.bat
@@ -1,11 +1,16 @@
 echo off\r
-set CC=C:\Borland\BCC55\Bin\bcc32\r
-set CXX=C:\Borland\BCC55\Bin\bcc32\r
-set INCLUDE=C:\Borland\BCC55\Include;C:\Program Files\Microsoft SDKs\Windows\v7.0A\Include\r
-set LIB=C:\Borland\BCC55\Lib;C:\Program Files\Microsoft SDKs\Windows\v7.0A\Lib\r
-set RC=C:\Program Files\Microsoft SDKs\Windows\v7.0A\bin\RC\r
-set Path=%Path%;C:\Program Files\Microsoft SDKs\Windows\v7.0A\bin\r
-set Path=%Path%;C:\Program Files\Microsoft SDKs\Windows\v7.0A\Lib\r
-set Path=%Path%;C:\Program Files\Microsoft SDKs\Windows\v7.0A\Include\r
-set Path=%Path%;C:\Borland\BCC55\r
-set Path=%Path%;C:\Borland\BCC55\Bin
\ No newline at end of file
+set CC=D:\Borland\BCC55\Bin\bcc32\r
+set CXX=D:\Borland\BCC55\Bin\bcc32\r
+\r
+set INCLUDE=D:\Borland\BCC55\Include\r
+set LIB=D:\Borland\BCC55\Lib\r
+\r
+set path=%path%;D:\Borland\BCC55;D:\Borland\BCC55\Bin;D:\Borland\BCC55\Lib;D:\Borland\BCC55\Include\r
+\r
+set PATHEXT=%PATHEXT%;.OBJ\r
+\r
+echo on\r
+\r
+del CMakeCache.txt\r
+\r
+cmake -G"Borland Makefiles" -Wno-dev
\ No newline at end of file

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 84fe86f..88751cd 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -41,6 +41,7 @@ CHECK_INCLUDE_FILE("stdlib.h" HAVE_STDLIB_H)
 CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H)
 CHECK_INCLUDE_FILE("string.h" HAVE_STRING_H)
 CHECK_INCLUDE_FILE("ucontext.h" HAVE_UCONTEXT_H)
+CHECK_INCLUDE_FILE("stdio.h" HAVE_STDIO_H)
 
 CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)
 CHECK_FUNCTION_EXISTS(usleep HAVE_USLEEP)

diff --git a/buildtools/Cmake/MakeExeLibWin.cmake b/buildtools/Cmake/MakeExeLibWin.cmake
index df0fc05..f0f6e40 100644 (file)
--- a/buildtools/Cmake/MakeExeLibWin.cmake
+++ b/buildtools/Cmake/MakeExeLibWin.cmake
@@ -10,9 +10,9 @@ if(MSVC)
                                                      OUTPUT_NAME   "simgrid")\r
 else(MSVC)\r
     if(CMAKE_COMPILER_IS_GNUCC)\r
-        set_target_properties(gras     PROPERTIES COMPILE_FLAGS "-D _XBT_DLL_STATIC"\r
+        set_target_properties(gras     PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC"\r
                                                          OUTPUT_NAME   "gras")\r
-        set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "-D _XBT_DLL_STATIC"\r
+        set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC"\r
                                                          OUTPUT_NAME   "simgrid")\r
     else(CMAKE_COMPILER_IS_GNUCC)\r
         message(FATAL_ERROR "Compilateur non connu!!!")\r
@@ -30,11 +30,80 @@ target_link_libraries(gras  ${GRAS_DEP})
 #src/testall\r
 add_subdirectory(${PROJECT_DIRECTORY}/src)\r
 \r
-#examples\r
-add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/icomms)\r
+#tools/gras\r
+add_subdirectory(${PROJECT_DIRECTORY}/tools/gras)\r
+\r
+#tools/tesh\r
+#add_subdirectory(${PROJECT_DIRECTORY}/tools/tesh)\r
 \r
 #testsuite/xbt\r
 add_subdirectory(${PROJECT_DIRECTORY}/testsuite/xbt)\r
 \r
+#testsuite/surf\r
+#add_subdirectory(${PROJECT_DIRECTORY}/testsuite/surf)\r
+\r
 #testsuite/simdag\r
-add_subdirectory(${PROJECT_DIRECTORY}/testsuite/simdag)
\ No newline at end of file
+add_subdirectory(${PROJECT_DIRECTORY}/testsuite/simdag)\r
+\r
+#teshsuite\r
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/xbt)\r
+#add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/datadesc)\r
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle)\r
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/empty_main)\r
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep)\r
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag)\r
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/network)\r
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/network/p2p)\r
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/network/mxn)\r
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/partask)\r
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/platforms)\r
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/msg)\r
+\r
+#examples\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/ping)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/rpc)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/spawn)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/timer)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/chrono)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/mmrpc)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/all2all)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/pmm)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/synchro)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/properties)\r
+\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/properties)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/actions)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/migration)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/sendrecv)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/suspend)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/parallel_task)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/priority)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/masterslave)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/trace)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/tracing)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/icomms)\r
+\r
+if(HAVE_MC)\r
+       add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/mc)\r
+endif(HAVE_MC)\r
+\r
+if(HAVE_GTNETS)\r
+       add_definitions("-lgtnets -L${gtnets_path}/lib -I${gtnets_path}/include/gtnets")\r
+       add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/gtnets)\r
+endif(HAVE_GTNETS)\r
+\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/amok/bandwidth)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/amok/saturate)\r
+\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dax)\r
+if(HAVE_CGRAPH_H)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dot)\r
+endif(HAVE_CGRAPH_H)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/metaxml)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties)\r
+add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/scheduling)\r
+if(enable_smpi)\r
+       add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)\r
+endif(enable_smpi)
\ No newline at end of file

diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index f45cbd5..2b46b72 100644 (file)
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -70,6 +70,7 @@ if(enable_print_message)
        message("HAVE_STDLIB_H                  ${HAVE_STDLIB_H}")
        message("HAVE_STRINGS_H                 ${HAVE_STRINGS_H}")
        message("HAVE_STRING_H                  ${HAVE_STRING_H}")
+       message("HAVE_STDIO_H           ${HAVE_STDIO_H}")
 
        message("")
        message("HAVE_GETTIMEOFDAY              ${HAVE_GETTIMEOFDAY}")