X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2be0e4648c5b7055580df1c265b7c43ee6763a46..13333d25e7025f0903f45d33581243f3643dbbe2:/buildtools/Cmake/simgrid.nsi.in

diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in
index ab736c8a1b..b57b18a95d 100644
--- a/buildtools/Cmake/simgrid.nsi.in
+++ b/buildtools/Cmake/simgrid.nsi.in
@@ -47,6 +47,9 @@ Section "Libraries and Headers" LibSection
 	setOutPath $INSTDIR\lib
 	file lib\libgras.@LIB_EXE@
 	file lib\libsimgrid.@LIB_EXE@
+	file /nonfatal lib\libsimgrid.dll
+	file /nonfatal lib\libsimgrid.dll.a
+	file /nonfatal lib\libsimgrid.ref
 	
 	#install headers
 	CreateDirectory  $INSTDIR\include
@@ -93,14 +96,12 @@ Section "Libraries and Headers" LibSection
 	file @CMAKE_HOME_DIRECTORY@\include\xbt\parmap.h
 	file @CMAKE_HOME_DIRECTORY@\include\xbt\automaton.h
 	file @CMAKE_HOME_DIRECTORY@\include\xbt\automatonparse_promela.h
+	file @CMAKE_HOME_DIRECTORY@\include\xbt\datadesc.h
 
 	CreateDirectory  $INSTDIR\include\simgrid
 	setOutPath $INSTDIR\include\simgrid
 	file @CMAKE_HOME_DIRECTORY@\include\simgrid\platf.h
-	
-	CreateDirectory  $INSTDIR\include\mc
-	setOutPath $INSTDIR\include\mc
-	file @CMAKE_HOME_DIRECTORY@\include\mc\modelchecker.h
+	file @CMAKE_HOME_DIRECTORY@\include\simgrid\modelchecker.h
 	
 	CreateDirectory  $INSTDIR\include\msg
 	setOutPath $INSTDIR\include\msg
@@ -128,7 +129,6 @@ Section "Libraries and Headers" LibSection
 	
 	CreateDirectory  $INSTDIR\include\gras
 	setOutPath $INSTDIR\include\gras
-	file @CMAKE_HOME_DIRECTORY@\include\gras\datadesc.h
 	file @CMAKE_HOME_DIRECTORY@\include\gras\transport.h
 	file @CMAKE_HOME_DIRECTORY@\include\gras\virtu.h
 	file @CMAKE_HOME_DIRECTORY@\include\gras\emul.h
@@ -162,11 +162,6 @@ Section "Binaries" BinSection
 	file bin\graphicator@BIN_EXE@
 	file bin\gras_stub_generator@BIN_EXE@
 	file bin\simgrid_update_xml
-	file bin\smpicc
-	file bin\smpif2c
-	file bin\smpiff
-	file bin\smpirun
-	file bin\tesh
 	
 SectionEnd
 Section "Documentation" DocSection	
@@ -233,11 +228,11 @@ section
 	!define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
 	!define env_hkcu 'HKCU "Environment"'
 	# Set Variables
-	WriteRegExpandStr ${env_hklm} SIMGRID_ROOT $INSTDIR
-	WriteRegExpandStr ${env_hklm} SIMGRID_VERSION @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@
+	WriteRegExpandStr ${env_hkcu} SIMGRID_ROOT $INSTDIR
+	WriteRegExpandStr ${env_hkcu} SIMGRID_VERSION @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@
 
-	WriteRegExpandStr ${env_hklm} SIMGRID_PCRE_LIBRARY_PATH $INSTDIR\GnuWin32
-	WriteRegExpandStr ${env_hklm} SIMGRID_PCRE_LIBRARY_VERSION "8.21"
+	WriteRegExpandStr ${env_hkcu} SIMGRID_PCRE_LIBRARY_PATH $INSTDIR\GnuWin32
+	WriteRegExpandStr ${env_hkcu} SIMGRID_PCRE_LIBRARY_VERSION "8.21"
 
 	WriteRegStr HKCU "SOFTWARE\SimGrid" "Version" "@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"
 	WriteRegStr HKCU "SOFTWARE\SimGrid" "InstallPath" "$INSTDIR"
@@ -392,10 +387,10 @@ section "Uninstall"
 	RMDir   /r "$INSTDIR\GnuWin32"
 	
 	# Delete variable
-	DeleteRegValue ${env_hklm} SIMGRID_ROOT
-	DeleteRegValue ${env_hklm} SIMGRID_VERSION
-	DeleteRegValue ${env_hklm} SIMGRID_PCRE_LIBRARY_PATH
-	DeleteRegValue ${env_hklm} SIMGRID_PCRE_LIBRARY_VERSION
+	DeleteRegValue ${env_hkcu} SIMGRID_ROOT
+	DeleteRegValue ${env_hkcu} SIMGRID_VERSION
+	DeleteRegValue ${env_hkcu} SIMGRID_PCRE_LIBRARY_PATH
+	DeleteRegValue ${env_hkcu} SIMGRID_PCRE_LIBRARY_VERSION
     DeleteRegKey HKCU "SOFTWARE\SimGrid"
     
     # delete INSTDIR