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

diff --git a/doc/dev_guide/doxygen/cmake.doc b/doc/dev_guide/doxygen/cmake.doc
index 2da858e..23fbdb1 100644 (file)
--- a/doc/dev_guide/doxygen/cmake.doc
+++ b/doc/dev_guide/doxygen/cmake.doc
@@ -49,4 +49,19 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/<path_where_is_CMakeList.txt>)
 
 \section cmake_dev_guide_test How to add tests?
 
+\section cmake_dev_guide_dist How to make a clean dist?
+
+\subsection cmake_dev_guide_dist_sim Simgrid
+
+\subsubsection cmake_dev_guide_dist_sim_unix Under UNIX
+
+\subsubsection cmake_dev_guide_dist_sim_win Under Win32
+
+\subsection cmake_dev_guide_dist_bindings Bindings
+
+\subsubsection cmake_dev_guide_dist_bindings_java Java
+
+\subsubsection cmake_dev_guide_dist_bindings_lua LUA
+
+\subsubsection cmake_dev_guide_dist_bindings_ruby Ruby
 */

diff --git a/doc/dev_guide/doxygen/xps.doc b/doc/dev_guide/doxygen/xps.doc
index 3d7c7ce..1c88210 100644 (file)
--- a/doc/dev_guide/doxygen/xps.doc
+++ b/doc/dev_guide/doxygen/xps.doc
@@ -2,6 +2,37 @@
 \page xps SimGrid Developer Guide - XPs
 
 \section xps_dev_guide_pipol How to run test in pipol?
+
+In order to use PIPOL you have to create your account here: http://pipol.inria.fr/
+
+\subsection xps_dev_guide_pipol_general What is PIPOL?
+
+The PIPOL platform is a porting, testing and compilation cluster. It hosts several hardware and software
+architectures to perform its work. An user can reserve a resource (a specific hardware, an operating system...)
+to be used interactively or automatically (with a "Nightly Builds" system) for software testing.
+
+\subsection xps_dev_guide_pipol_frontend From PIPOL frontend
+
+You first need to be connected into pipol ssh.
+\verbatim
+user@caraja:~$ ssh pipol.inria.fr
+Linux pipol-server 2.6.26-2-amd64 #1 SMP Thu Nov 5 02:23:12 UTC 2009 x86_64
+***************************************************************************
+*           You are just logged-on the PIPOL platform server              *
+*   You can find some documentation about porting works on the platform   *
+*         on the PIPOL's web site: http://pipol.inria.fr/docs/            *
+*   To report bugs you can write to: pipol-sysadm@lists.gforge.inria.fr   *
+***************************************************************************
+
+
+user@pipol:~$
+\endverbatim
+Then you can see pipol images availables for deployment
+
+\subsection xps_dev_guide_pipol_home From a computer
+
+\section xps_dev_guide_cdash How to report tests in cdash?
+
 \section xps_dev_guide_g5k How to run simgrid scalability xps?
 
 */

diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index 8ca62bb..8d9e915 100644 (file)
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -13,7 +13,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix,
                                 "Logging specific to SIMIX (network)");
 
 static xbt_dict_t rdv_points = NULL;
-XBT_PUBLIC(unsigned long int) smx_total_comms = 0;
+XBT_IMPORT_NO_EXPORT(unsigned long int) smx_total_comms = 0;
 
 static void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall);
 static void SIMIX_comm_copy_data(smx_action_t comm);

diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in
index c5627b3..a508a38 100755 (executable)
--- a/src/smpi/smpicc.in
+++ b/src/smpi/smpicc.in
@@ -5,12 +5,12 @@ CC=@CMAKE_C_COMPILER@
 INCLUDEARGS="-I@includedir@ -I@includedir@/smpi -I@CMAKE_BINARY_DIR@/include"
 CMAKE_LINKARGS="-L@CMAKE_LINKARGS@"
 
-if [ @WIN32@ != 1 ]; then
-LINKARGS="-lsimgrid -lsmpi -lm"
-CFLAGS="-O2 -Dmain=smpi_simulated_main"
+if [ "@WIN32@" != "1" ]; then
+  LINKARGS="-lsimgrid -lsmpi -lm"
+  CFLAGS="-O2 -Dmain=smpi_simulated_main"
 else
-CFLAGS="-O2 -include @includedir@/smpi/smpi_main.h"
-LINKARGS="@CMAKE_BINARY_DIR@\lib\libsimgrid.dll @CMAKE_BINARY_DIR@\lib\libsmpi.dll"
+  CFLAGS="-O2 -include @includedir@/smpi/smpi_main.h"
+  LINKARGS="@CMAKE_BINARY_DIR@\lib\libsimgrid.dll @CMAKE_BINARY_DIR@\lib\libsmpi.dll"
 fi
 
 CMDLINE=""

diff --git a/src/surf/surfxml_parseplatf.c b/src/surf/surfxml_parseplatf.c
index 0a404f2..b3fdf29 100644 (file)
--- a/src/surf/surfxml_parseplatf.c
+++ b/src/surf/surfxml_parseplatf.c
@@ -25,8 +25,8 @@ int surfxml_bufferstack_size = 2048;
 
 static char *old_buff = NULL;
 
-XBT_PUBLIC(unsigned int) surfxml_buffer_stack_stack_ptr;
-XBT_PUBLIC(unsigned int) surfxml_buffer_stack_stack[1024];
+XBT_IMPORT_NO_EXPORT(unsigned int) surfxml_buffer_stack_stack_ptr;
+XBT_IMPORT_NO_EXPORT(unsigned int) surfxml_buffer_stack_stack[1024];
 
 
 void surfxml_bufferstack_push(int new)