From a571515b08248b4824959bf03de34cdac0d5d1d5 Mon Sep 17 00:00:00 2001
From: unknown <pierre@.(none)>
Date: Tue, 5 Jul 2011 13:35:27 +0200
Subject: [PATCH] Add an icon to installer. Add registry values. Need to
 restart computer after install (now or later).

---
 buildtools/Cmake/simgrid.nsi.in |  21 +++++++++++++++------
 doc/webcruft/SimGrid.ico        | Bin 0 -> 4286 bytes
 2 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 doc/webcruft/SimGrid.ico

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 0000000000000000000000000000000000000000..619a707afb9cb8132d27800aa913a94e072c6824
GIT binary patch
literal 4286
zcmeH}J&X-e6vyxKL_tCXjgdExh>ymKMq<53wi1a>K~xHbhFT<6q1B0~w;`gCC^Q;D
zr4$i`_(+H#@$H52#_vBnC%L(1=FPshQwV4Cn=^Cnx#vG~XU=`=+ysAd>~wTjRyw!V
zIkyD}xxJuxg{6%Br(%H`8Vc8Z6qzMVnjXULlEMq2zna=%o$&fu1Ns-J`4m)JdIzCX
zz-eMXLAe{jx9~pwv0>-4BxwFuI1lTf$c_^<ovlHF#mxu9rI%XsYw#T&m1fNiG@<{N
z(z<7@!7%&V^w;x1RsF>7>gqiI0rK=sUIcr;C-T@Xyv*X}6+2ZBw{iJBP)A?ir9aO<
zzr~o$kLg_I>rZiQJ++N<<-CF~`FYj*Uqg<5hKkS{%F6WheCjF7Q?B+o#a_S<(A+A0
zhKE|2epOH1p{nNng1Y)Ga<z_n2H(cfe@~&h`fYNhRcHU%K;AwGZ7G2p@D5Z<`mf<S
zRGIqVF4WZzYi%c>K01`wP@N}m8}7p=I1H<x$j04&E>l#RKKc%2N5SGdv&f%^QS>)a
z=1tBwylKd5EtZ2!-_^35dwBI_NS~O^uk-%(ze4!T4~gk_RA_%JGQES7LkQoI-IsaQ
z_4gn3x_-AWX`lf!UGtLg_1g_-`Xx=*d|mw`Bre37n67#0?}wY9SQ|o{CU6xVgaad7
zo342)q3^Uz-}c`o^%tS9zIqH{KPCCSHK~t8X2&>|^_2Q;T(fmIKW@GG&Np52^PN9#
zzUlt!K3m6LnkK!0JCo6OQLo>PdLIT+@8cZtM89Qp&ZWub=V_ENGl;sb8+BXVXtL#^
fc*RT<pG}hv^*W#7Wt!}O$;D|h1(^<G_VRuMpmo%{

literal 0
HcmV?d00001

-- 
2.20.1