Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51bd4bb..4f1b981 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -321,9 +321,7 @@ CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)
 CHECK_FUNCTION_EXISTS(nanosleep HAVE_NANOSLEEP)
 CHECK_FUNCTION_EXISTS(getdtablesize HAVE_GETDTABLESIZE)
 CHECK_FUNCTION_EXISTS(sysconf HAVE_SYSCONF)
-CHECK_FUNCTION_EXISTS(readv HAVE_READV)
 CHECK_FUNCTION_EXISTS(popen HAVE_POPEN)
-CHECK_FUNCTION_EXISTS(signal HAVE_SIGNAL)
 
 CHECK_SYMBOL_EXISTS(snprintf stdio.h HAVE_SNPRINTF)
 CHECK_SYMBOL_EXISTS(vsnprintf stdio.h HAVE_VSNPRINTF)

diff --git a/doc/doxygen/install.doc b/doc/doxygen/install.doc
index 18fea41..10d3360 100644 (file)
--- a/doc/doxygen/install.doc
+++ b/doc/doxygen/install.doc
@@ -93,8 +93,11 @@ SimGrid only uses very standard tools:
       You need cmake version 2.8.8 or higher. You may want to use ccmake
       for a graphical interface over cmake.
   - LibBoost:
-    - osX: with <a href="http://www.finkproject.org/">fink</a>: `sudo fink install boost1.53.nopython`
+    - osX: with <a href="http://www.finkproject.org/">fink</a>: `fink install boost1.53.nopython`,
+      or with homebrew: `brew install boost`
     - debian: `apt-get install libboost-dev libboost-context-dev`
+  - Java (only needed if you want to use the Java bindings): Grab a
+    full JDK from http://www.oracle.com/technetwork/java/javase/downloads
 
 For platform specific details, please see  @ref install_cmake_mac and
 @ref install_cmake_windows.
@@ -266,6 +269,11 @@ warning that the "-pthread" argument is not used, if it appears.
 CMAKE_OSX_SYSROOT:PATH=/Applications/XCode.app/Contents/Developer/Platforms/MacOSX.platform/Developer
 @endverbatim
 
+In the El Capitan version of Max OS X, Apple decided that users don't
+need no /usr/include directory anymore. If you are hit by this pure
+madness, just run the following command to restore that classical
+UNIX directory: `xcode-select -install`
+
 \subsubsection install_cmake_windows Building on Windows
 
 Building from the source on Windows, may be something of an adventure.

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index 23c9120..218a8c8 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -16,9 +16,6 @@
 #include "src/surf/xml/platf.hpp"
 #include "smx_private.h"
 #include "smx_private.hpp"
-#include "xbt/heap.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
 #include "xbt/str.h"
 #include "xbt/ex.h"             /* ex_backtrace_display */
 #include "mc/mc.h"

diff --git a/tools/cmake/PrintArgs.cmake b/tools/cmake/PrintArgs.cmake
index 949a643..9486cf8 100644 (file)
--- a/tools/cmake/PrintArgs.cmake
+++ b/tools/cmake/PrintArgs.cmake
@@ -4,7 +4,6 @@ if(enable_print_message)
   message("______________________________________________________________________ DEBUG")
   message("CMAKE_HOME_DIRECTORY ........: ${CMAKE_HOME_DIRECTORY}")
   message("")
-  message("SIZEOF_MAX ..................: ${SIZEOF_MAX}")
   message("PTH_STACKGROWTH .............: ${PTH_STACKGROWTH}")
   message("need_asprintf ...............: ${simgrid_need_asprintf}")
   message("need_vasprintf ..............: ${simgrid_need_vasprintf}")
@@ -43,9 +42,7 @@ if(enable_print_message)
   message("HAVE_NANOSLEEP ..............: ${HAVE_NANOSLEEP}")
   message("HAVE_GETDTABLESIZE ..........: ${HAVE_GETDTABLESIZE}")
   message("HAVE_SYSCONF ................: ${HAVE_SYSCONF}")
-  message("HAVE_READV ..................: ${HAVE_READV}")
   message("HAVE_POPEN ..................: ${HAVE_POPEN}")
-  message("HAVE_SIGNAL .................: ${HAVE_SIGNAL}")
   message("HAVE_MAKECONTEXT ............: ${HAVE_MAKECONTEXT}")
   message("HAVE_SNPRINTF ...............: ${HAVE_SNPRINTF}")
   message("HAVE_VSNPRINTF ..............: ${HAVE_VSNPRINTF}")

diff --git a/tools/cmake/src/internal_config.h.in b/tools/cmake/src/internal_config.h.in
index a014fba..ed84952 100644 (file)
--- a/tools/cmake/src/internal_config.h.in
+++ b/tools/cmake/src/internal_config.h.in
@@ -39,11 +39,9 @@
 #ifndef _M_IX86
        #cmakedefine _M_IX86 @_M_IX86@
 #endif
-#cmakedefine _XBT_WIN32 @_XBT_WIN32@   //this variable is set if it is a windows platform
-#cmakedefine _WIN32 @_WIN32@                   //this variable is set if it is a 32 bits windows platform
-#cmakedefine _WIN64 @_WIN64@                   //this variable is set if it is a 64 bits  windows platform
-#cmakedefine __VISUALC__ @__VISUALC__@
-#cmakedefine __BORLANDC__ @__BORLANDC__@
+#cmakedefine _XBT_WIN32 @_XBT_WIN32@   // this variable is set if it is a windows platform
+#cmakedefine _WIN32 @_WIN32@           // this variable is set if it is a 32 bits windows platform
+#cmakedefine _WIN64 @_WIN64@           // this variable is set if it is a 64 bits  windows platform
 #cmakedefine APPLE @APPLE@
 /* Set to true if enable_model-checking is true */
 #cmakedefine MMALLOC_WANT_OVERRIDE_LEGACY @MMALLOC_WANT_OVERRIDE_LEGACY@
@@ -61,9 +59,6 @@
 /* Define if building universal (internal helper macro) */
 #cmakedefine AC_APPLE_UNIVERSAL_BUILD @AC_APPLE_UNIVERSAL_BUILD@
 
-/* Arguments passed to the configure script */
-#cmakedefine AC_CONFIGURE_ARGS @AC_CONFIGURE_ARGS@
-
 /* Path to the addr2line tool */
 #cmakedefine ADDR2LINE "@ADDR2LINE@"
 
@@ -83,9 +78,6 @@
 #cmakedefine HAVE_RAW_CONTEXTS @HAVE_RAW_CONTEXTS@
 #cmakedefine HAVE_BOOST_CONTEXTS @HAVE_BOOST_CONTEXTS@
 
-/* Define to 1 if you have the GNU ld library */
-#cmakedefine HAVE_GNU_LD @HAVE_GNU_LD@
-
 /* Define to 1 if you have the <errno.h> header file. */
 #cmakedefine HAVE_ERRNO_H @HAVE_ERRNO_H@
 
@@ -125,9 +117,6 @@
 /* defines whether Lua bindings must be compiled or not */
 #cmakedefine HAVE_LUA @HAVE_LUA@
 
-/* Define to 1 if you have the <lua5.1/lualib.h> header file. */
-#cmakedefine HAVE_LUA5_1_LUALIB_H @HAVE_LUA5_1_LUALIB_H@
-
 /* Define to 1 if you have the `makecontext' function. */
 #cmakedefine HAVE_MAKECONTEXT @HAVE_MAKECONTEXT@
 
@@ -141,18 +130,12 @@
 /* Define to 1 if threads are usable . */
 #cmakedefine HAVE_PTHREAD @HAVE_PTHREAD@
 
-/* Define to 1 if you have the `readv' function. */
-#cmakedefine HAVE_READV @HAVE_READV@
-
 /* Define if sem_init() is avaible or not (part of XPG6 standard only) */
 #cmakedefine HAVE_SEM_INIT @HAVE_SEM_INIT@
 
 /* Define if sem_timedwait() is avaible or not (part of XPG6 standard only) */
 #cmakedefine HAVE_SEM_TIMEDWAIT @HAVE_SEM_TIMEDWAIT@
 
-/* Define to 1 if you have the `signal' function. */
-#cmakedefine HAVE_SIGNAL @HAVE_SIGNAL@
-
 /* Define to 1 if you have the <signal.h> header file. */
 #cmakedefine HAVE_SIGNAL_H @HAVE_SIGNAL_H@
 
@@ -195,9 +178,6 @@
 /* Define to 1 if you have the <windows.h> header file. */
 #cmakedefine HAVE_WINDOWS_H @HAVE_WINDOWS_H@
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.*/
-#cmakedefine LT_OBJDIR @LT_OBJDIR@
-
 /* enable the asprintf replacement */
 #cmakedefine NEED_ASPRINTF @NEED_ASPRINTF@
 
@@ -231,9 +211,6 @@
 /* define for stack growth */
 #cmakedefine PTH_STACKGROWTH @PTH_STACKGROWTH@
 
-/* The maximal size of any scalar on this arch */
-#cmakedefine SIZEOF_MAX @SIZEOF_MAX@
-
 /* Define to 1 if you have the ANSI C header files. */
 #cmakedefine STDC_HEADERS @STDC_HEADERS@