From: unknown <pierre@.(none)>
Date: Tue, 5 Jul 2011 11:35:27 +0000 (+0200)
Subject: Add an icon to installer.
X-Git-Tag: v3_6_2~203^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a571515b08248b4824959bf03de34cdac0d5d1d5?hp=309b581b3300040e701e459fad72b5a8bd5667f8

Add an icon to installer.
Add registry values.
Need to restart computer after install (now or later).
---

diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in
index 838b8103bb..c6b2f4d882 100644
--- a/buildtools/Cmake/simgrid.nsi.in
+++ b/buildtools/Cmake/simgrid.nsi.in
@@ -1,8 +1,5 @@
 !include "MUI2.nsh"
 
-Name "Simgrid"
-outFile "SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@_@CMAKE_SYSTEM_PROCESSOR@@BIN_EXE@"
-
 ;--------------------------------
 ;Interface Configuration
 
@@ -17,18 +14,24 @@ outFile "SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION
   !insertmacro MUI_PAGE_COMPONENTS
   !insertmacro MUI_PAGE_DIRECTORY
   !insertmacro MUI_PAGE_INSTFILES
+  !insertmacro MUI_PAGE_FINISH
   
   !insertmacro MUI_UNPAGE_CONFIRM
   !insertmacro MUI_UNPAGE_INSTFILES
-  
+  !insertmacro MUI_UNPAGE_FINISH
+
 ;--------------------------------
 ;Languages
   !insertmacro MUI_LANGUAGE "English"
   !insertmacro MUI_LANGUAGE "French"
 ;--------------------------------
 
+Name "Simgrid"
+outFile "SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@_@CMAKE_SYSTEM_PROCESSOR@@BIN_EXE@"
+Icon "@CMAKE_HOME_DIRECTORY@\doc\webcruft\SimGrid.ico"
+
 # set the default installation directory
-InstallDir "c:\SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"
+InstallDir c:\SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@
 
 Section "Libraries and Headers" LibSection
 
@@ -194,6 +197,11 @@ section
 	WriteRegExpandStr ${env_hklm} SIMGRID_ROOT $INSTDIR
 	WriteRegExpandStr ${env_hklm} SIMGRID_VERSION @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@
 
+	WriteRegStr HKCU "SOFTWARE\SimGrid" "Version" "@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"
+	WriteRegStr HKCU "SOFTWARE\SimGrid" "InstallPath" "$INSTDIR"
+	
+	SetRebootFlag true
+
 # default section end
 sectionEnd
 
@@ -328,6 +336,7 @@ section "Uninstall"
 	# Delete variable
 	DeleteRegValue ${env_hklm} SIMGRID_ROOT
 	DeleteRegValue ${env_hklm} SIMGRID_VERSION
-
+      DeleteRegKey HKCU "SOFTWARE\SimGrid"
+    
 # uninstall section end
 sectionEnd
\ No newline at end of file
diff --git a/doc/webcruft/SimGrid.ico b/doc/webcruft/SimGrid.ico
new file mode 100644
index 0000000000..619a707afb
Binary files /dev/null and b/doc/webcruft/SimGrid.ico differ