From: navarro <navarro@caraja.(none)>
Date: Thu, 29 Mar 2012 08:36:27 +0000 (+0200)
Subject: Update installation of windows
X-Git-Tag: v3_7~158
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4d547f3cea82f4fd386135c42a52d522fd5d0607?ds=sidebyside

Update installation of windows
---

diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake
index 59132b5b84..a828caced4 100644
--- a/buildtools/Cmake/GenerateDoc.cmake
+++ b/buildtools/Cmake/GenerateDoc.cmake
@@ -43,6 +43,8 @@ if(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTEX2HTML_PATH AND GOOD_BIBTEX2HTML_VERSI
 		${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_02.png
 		${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_03.png
 		${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_04.png
+		${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_05.png
+		${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_06.png
 	)
 	
 	configure_file(${CMAKE_HOME_DIRECTORY}/doc/Doxyfile.in ${CMAKE_HOME_DIRECTORY}/doc/Doxyfile @ONLY)
diff --git a/doc/install.doc b/doc/install.doc
index 0b632d46bb..b737c17747 100644
--- a/doc/install.doc
+++ b/doc/install.doc
@@ -336,7 +336,19 @@ Step 3: Choice where to install packets previously selected. Please don't use sp
 <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.
+Step 4: Add CLASSPATH to environment variables.
+
+\htmlonly
+<a href="win_install_05.png" border=0><img src="win_install_05.png" border=0></a>
+\endhtmlonly
+
+Step 5: Add PATH to environment variables.
+
+\htmlonly
+<a href="win_install_06.png" border=0><img src="win_install_06.png" border=0></a>
+\endhtmlonly
+
+Step 6: Restart your computer to take in consideration environment variables.
 
 \subsection install_Win_compile1 Compile a project "HelloWorld"
 
diff --git a/doc/webcruft/win_install_01.png b/doc/webcruft/win_install_01.png
index f7ab9805a0..9d09bda2da 100644
Binary files a/doc/webcruft/win_install_01.png and b/doc/webcruft/win_install_01.png differ
diff --git a/doc/webcruft/win_install_02.png b/doc/webcruft/win_install_02.png
index 42d082d6d2..5d442a96b6 100644
Binary files a/doc/webcruft/win_install_02.png and b/doc/webcruft/win_install_02.png differ
diff --git a/doc/webcruft/win_install_03.png b/doc/webcruft/win_install_03.png
index a6c51d4811..012cb387ad 100644
Binary files a/doc/webcruft/win_install_03.png and b/doc/webcruft/win_install_03.png differ
diff --git a/doc/webcruft/win_install_04.png b/doc/webcruft/win_install_04.png
index b3fc6bbc5f..aedc2d94ae 100644
Binary files a/doc/webcruft/win_install_04.png and b/doc/webcruft/win_install_04.png differ
diff --git a/doc/webcruft/win_install_05.png b/doc/webcruft/win_install_05.png
new file mode 100644
index 0000000000..f7ebe88af2
Binary files /dev/null and b/doc/webcruft/win_install_05.png differ
diff --git a/doc/webcruft/win_install_06.png b/doc/webcruft/win_install_06.png
new file mode 100644
index 0000000000..b0323831ad
Binary files /dev/null and b/doc/webcruft/win_install_06.png differ