X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/615d7a6fdc503a82e7b7ddedf2ac2787772ba806..36d6876bb57b051b1434737450f7177c9b7055f2:/buildtools/Cmake/simgrid.nsi.in

diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in
index ab736c8a1b..57a99e6178 100644
--- a/buildtools/Cmake/simgrid.nsi.in
+++ b/buildtools/Cmake/simgrid.nsi.in
@@ -30,6 +30,8 @@ Name "Simgrid"
 outFile "SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@_@NSIS_WIN_VERSION@@BIN_EXE@"
 Icon "@CMAKE_HOME_DIRECTORY@\doc\webcruft\SimGrid.ico"
 
+RequestExecutionLevel admin
+
 # set the default installation directory
 InstallDir c:\SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@
 
@@ -47,6 +49,9 @@ Section "Libraries and Headers" LibSection
 	setOutPath $INSTDIR\lib
 	file lib\libgras.@LIB_EXE@
 	file lib\libsimgrid.@LIB_EXE@
+	file /nonfatal lib\libsimgrid_shared.dll
+	file /nonfatal lib\libsimgrid_shared.dll.a
+	file /nonfatal lib\libsimgrid_shared.ref
 	
 	#install headers
 	CreateDirectory  $INSTDIR\include
@@ -93,14 +98,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 +131,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 +164,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	
@@ -176,9 +173,9 @@ Section "Documentation" DocSection
 	setOutPath $INSTDIR\doc
 	file /nonfatal /r @CMAKE_HOME_DIRECTORY@\doc\html
 	# create a shortcut in the start menu programs directory
-	CreateDirectory "$SMPROGRAMS\SimGrid"
-	createShortCut  "$SMPROGRAMS\SimGrid\Documentation.lnk"	"$INSTDIR\doc\html\index.html"
-	createShortCut  "$SMPROGRAMS\SimGrid\Website.lnk"	"http://simgrid.gforge.inria.fr/"
+	CreateDirectory "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"
+	createShortCut  "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Documentation.lnk"	"$INSTDIR\doc\html\index.html"
+	createShortCut  "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Website.lnk"	"http://simgrid.gforge.inria.fr/"
 	
 SectionEnd
 Section "Examples" ExamplesSection	
@@ -202,9 +199,9 @@ Section "Examples" ExamplesSection
 	file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\FindPCRE.cmake
 	
 	# create shortcuts in the start menu programs directory
-	CreateDirectory "$SMPROGRAMS\SimGrid\Examples\"
-	createShortCut  "$SMPROGRAMS\SimGrid\Examples\HelloWorld project.lnk"	"$INSTDIR\examples\HelloWorld"
-	createShortCut  "$SMPROGRAMS\SimGrid\Examples\MasterSlave project.lnk"	"$INSTDIR\examples\MasterSlave"
+	CreateDirectory "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\"
+	createShortCut  "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\HelloWorld project.lnk"	"$INSTDIR\examples\HelloWorld"
+	createShortCut  "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\MasterSlave project.lnk"	"$INSTDIR\examples\MasterSlave"
 	
 SectionEnd
 Section "Pcre library" PCRESection	
@@ -224,8 +221,8 @@ section
 	writeUninstaller $INSTDIR\uninstaller@BIN_EXE@
 
 	# create a shortcut in the start menu programs directory
-	CreateDirectory "$SMPROGRAMS\SimGrid"
-	createShortCut  "$SMPROGRAMS\SimGrid\Uninstall simgrid.lnk" "$INSTDIR\uninstaller@BIN_EXE@"
+	CreateDirectory "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"
+	createShortCut  "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Uninstall simgrid.lnk" "$INSTDIR\uninstaller@BIN_EXE@"
 
 	# Include for some of the windows message defines
 	!include "winmessages.nsh"
@@ -233,11 +230,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"
@@ -277,6 +274,9 @@ section "Uninstall"
 	# delete installed libs
 	delete $INSTDIR\lib\libgras.@LIB_EXE@
 	delete $INSTDIR\lib\libsimgrid.@LIB_EXE@
+	delete $INSTDIR\lib\libsimgrid_shared.dll
+	delete $INSTDIR\lib\libsimgrid_shared.dll.a
+	delete $INSTDIR\lib\libsimgrid_shared.ref
 
 	# delete installed bin
 	delete $INSTDIR\bin\colorize
@@ -355,13 +355,6 @@ section "Uninstall"
 	delete $INSTDIR\include\simix\datatypes.h
 	delete $INSTDIR\include\simix\context.h
 		
-	# delete link
-	delete "$SMPROGRAMS\SimGrid\Uninstall simgrid.lnk"
-	delete "$SMPROGRAMS\SimGrid\Documentation.lnk"
-	delete "$SMPROGRAMS\SimGrid\Website.lnk"
-	delete "$SMPROGRAMS\SimGrid\Examples\HelloWorld project.lnk"
-	delete "$SMPROGRAMS\SimGrid\Examples\MasterSlave project.lnk"
-	
 	# delete EXTRA FILES
 	delete $INSTDIR\AUTHORS
 	delete $INSTDIR\Changelog
@@ -385,17 +378,16 @@ section "Uninstall"
 	RMDir  "$INSTDIR\include"
 	RMDir  /r "$INSTDIR\doc"
 	RMDir  /r "$INSTDIR\examples"
-	RMDir  "$SMPROGRAMS\SimGrid\Examples"
-	RMDir  "$SMPROGRAMS\SimGrid"
+	RMDir  /r "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"
 	
 	# delete PCRE
 	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