X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d75cc686d3c2c508e129281f09a64b7630036130..8a47028116925fea959f95bfe881618489658231:/doc/installSimgrid.doc

diff --git a/doc/installSimgrid.doc b/doc/installSimgrid.doc
index 7a7987fc60..99c01b6bc5 100644
--- a/doc/installSimgrid.doc
+++ b/doc/installSimgrid.doc
@@ -27,7 +27,8 @@ For Unix and MacOS:
 
 For Windows :
   \li cmake 2.8 <a href="http://www.cmake.org/cmake/resources/software.html">(download page)</a>
-  \li perl strawberry <a href="http://www.strawberryperl.com/download/5.12.2.0/strawberry-perl-5.12.2.0.msi">(download page)</a>
+  \li MinGW <a href="http://sourceforge.net/projects/mingw/files/MinGW/">(download page)</a>
+  \li perl <a href="http://www.activestate.com/activeperl/downloads">(download page)</a>
   \li git <a href="http://msysgit.googlecode.com/files/Git-1.7.4-preview20110204.exe">(download page)</a>
   
 \subsubsection installSimgrid_cmakeoption1 Liste of options
@@ -41,7 +42,6 @@ For Windows :
 	enable_compile_warnings		ON/OFF or TRUE/FALSE or 1/0
 	enable_smpi			ON/OFF or TRUE/FALSE or 1/0
 	enable_maintainer_mode		ON/OFF or TRUE/FALSE or 1/0
-	enable_supernovae		ON/OFF or TRUE/FALSE or 1/0
 	enable_tracing 			ON/OFF or TRUE/FALSE or 1/0
 	enable_coverage 		ON/OFF or TRUE/FALSE or 1/0
 	enable_memcheck 		ON/OFF or TRUE/FALSE or 1/0
@@ -50,7 +50,6 @@ For Windows :
 	enable_jedule 	 		ON/OFF or TRUE/FALSE or 1/0
 	enable_latency_bound_tracking 	ON/OFF or TRUE/FALSE or 1/0
 	enable_lib_static		ON/OFF or TRUE/FALSE or 1/0
-	enable_pcre			ON/OFF or TRUE/FALSE or 1/0
 	custom_flags 			<flags>
 	gtnets_path			<path_to_gtnets_directory>
 	CMAKE_INSTALL_PREFIX		<path_to_install_directory>
@@ -73,8 +72,6 @@ For Windows :
 
   \li enable_maintainer_mode : set to true it remakes some files. 
 
-  \li enable_supernovae : set to true make one file for each lib and compile with those generated files.
-
   \li enable_tracing : To enable the generation of simulation traces for visualization.
 
   \li enable_coverage : When set to true this option enable code coverage by setting -fprofile-arcs -ftest-coverage flags.
@@ -89,9 +86,7 @@ For Windows :
   
   \li enable_latency_bound_tracking : Set to on if you want to be warned when communications are limited by round trip time.
   
-  \li enable_lib_static : Enable generated Simgrid and smpi static libraries.
-  
-  \li enable_pcre : Use or not the pcre lib for memory optimization. 	
+  \li enable_lib_static : Enable generated Simgrid and smpi static libraries.	
   
   \li custom_flags : If user wants to use a specific flag during compilation, give here.
 
@@ -113,11 +108,9 @@ Those options are initialized the first time you launch "cmake ." whithout speci
 enable_gtnets			on
 enable_lua			on
 enable_smpi			on
-enable_supernovae		on
 enable_tracing			on
 enable_compile_optimizations	on
 enable_debug			on
-enable_pcre			on
 enable_compile_warnings		off
 enable_maintainer_mode		off
 enable_coverage 		off
@@ -151,8 +144,8 @@ make
 On Windows platform:
 
 \verbatim
-cmake -G"Unix Makefiles" -D[name]=[value] ... ./
-gmake
+cmake -G"MinGW Makefiles" -D[name]=[value] ... ./
+mingw32-make
 \endverbatim
 
 \subsubsection installSimgrid_cmakecompilation2 With ccmake tool.
@@ -191,9 +184,9 @@ Those two kind of compilation permit to delete files created by compilation easi
  \li CMake
 \verbatim
 cmake <path>			configure the project for Unix and Mac
-cmake -G"Unix Makefiles" <path>	configure the project for Windows
+cmake -G"MinGW Makefiles" <path>	configure the project for Windows
 make				build all targets for Unix and Mac
-gmake				buill all targets for windows
+ming32-make				buill all targets for windows
 (g)make VERBOSE=1		build all targets and print build command lines
 make check			test all targets and summarize
 make dist			make the distrib
@@ -299,12 +292,37 @@ set(JMSG_JAVA_SRC
 
 Before start the installation, you need to be sure to have the following dependencies:
   \li cmake 2.8 <a href="http://www.cmake.org/cmake/resources/software.html">(download page)</a>
-  \li perl strawberry <a href="http://www.strawberryperl.com/download/5.12.2.0/strawberry-perl-5.12.2.0.msi">(download page)</a>
+  \li MinGW <a href="http://sourceforge.net/projects/mingw/files/MinGW/">(download page)</a>
+  \li perl <a href="http://www.activestate.com/activeperl/downloads">(download page)</a>
   \li git <a href="http://msysgit.googlecode.com/files/Git-1.7.4-preview20110204.exe">(download page)</a>
   
 Then download the package <a href="https://gforge.inria.fr/frs/?group_id=12">SimGrid Installer</a>,
 execute it and follow instructions.
 
+\htmlonly
+<a href="win_install_01.png" border=0><img src="win_install_01.png" border=0></a>
+\endhtmlonly
+
+Step 1: Accept the license. 
+
+\htmlonly
+<a href="win_install_02.png" border=0><img src="win_install_02.png" border=0></a>
+\endhtmlonly
+
+Step 2: Select packets to install.
+
+\htmlonly
+<a href="win_install_03.png" border=0><img src="win_install_03.png" border=0></a>
+\endhtmlonly
+
+Step 3: Choice where to install packets previously selected. Please don't use spaces in path.
+ 
+\htmlonly
+<a href="win_install_04.png" border=0><img src="win_install_04.png" border=0></a>
+\endhtmlonly
+
+Step 4: Restart your computer to take in consideration environment variables.
+
 \subsection installSimgrid_Win_compile1 Compile a project "HelloWorld"
 
 In the SimGrid install directroy you should have an HelloWorld project to explain you how to start 
@@ -317,11 +335,11 @@ compiling a source file. There are:
 \endverbatim
 
 Now let's compil this example:
-\li Run "Git bash" (installed with git) or windows shell "cmd".
+\li Run windows shell "cmd".
 \li Open HelloWorld Directory ('cd' command line).
 \li Create a build directory and change directory. (optional)
-\li Type 'cmake -G"Unix Makefiles" \<path_to_HelloWorld_project\>'
-\li Run gmake
+\li Type 'cmake -G"MinGW Makefiles" \<path_to_HelloWorld_project\>'
+\li Run mingw32-make
 \li You should obtain a runnable example ("HelloWorld.exe").
 
 For compiling your own code you can simply copy the HelloWorld project and rename source name. It will
@@ -340,9 +358,9 @@ target_link_libraries(TARGET_NAME simgrid pcre) #Links TARGET_NAME with simgrid
 \endverbatim	
 \li To initialize and build your project, you'll need to run
 \verbatim
-cmake -G"Unix Makefiles" \<path_to_HelloWorld_project\>
+cmake -G"MinGW Makefiles" \<path_to_HelloWorld_project\>
 \endverbatim
-\li Run "gmake"
+\li Run "mingw32-make"
 \li You should obtain "TARGET_NAME.exe".
 
 \section installSimgrid_setting_MSG Setting up your own MSG code