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

diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in
index 2c74f04c82..b57b18a95d 100644
--- a/buildtools/Cmake/simgrid.nsi.in
+++ b/buildtools/Cmake/simgrid.nsi.in
@@ -4,7 +4,7 @@
 ;Interface Configuration
 
   !define MUI_HEADERIMAGE
-  !define MUI_HEADERIMAGE_BITMAP "@CMAKE_HOME_DIRECTORY@\doc\webcruft\simgrid_logo_win.bmp" ; optional
+  !define MUI_HEADERIMAGE_BITMAP "@CMAKE_HOME_DIRECTORY@\doc\webcruft\simgrid_logo_win_2011.bmp" ; optional
   !define MUI_ABORTWARNING
 
 ;--------------------------------
@@ -27,7 +27,7 @@
 ;--------------------------------
 
 Name "Simgrid"
-outFile "SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@_@SIMGRID_SYSTEM_PROCESSOR@@BIN_EXE@"
+outFile "SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@_@NSIS_WIN_VERSION@@BIN_EXE@"
 Icon "@CMAKE_HOME_DIRECTORY@\doc\webcruft\SimGrid.ico"
 
 # set the default installation directory
@@ -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
@@ -91,10 +94,14 @@ Section "Libraries and Headers" LibSection
 	file @CMAKE_HOME_DIRECTORY@\include\xbt\mmalloc.h
 	file @CMAKE_HOME_DIRECTORY@\include\xbt\replay_trace_reader.h
 	file @CMAKE_HOME_DIRECTORY@\include\xbt\parmap.h
-	
-	CreateDirectory  $INSTDIR\include\mc
-	setOutPath $INSTDIR\include\mc
-	file @CMAKE_HOME_DIRECTORY@\include\mc\modelchecker.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
+	file @CMAKE_HOME_DIRECTORY@\include\simgrid\modelchecker.h
 	
 	CreateDirectory  $INSTDIR\include\msg
 	setOutPath $INSTDIR\include\msg
@@ -122,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
@@ -156,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	
@@ -205,17 +206,11 @@ Section "Pcre library" PCRESection
 	# install pcre library
 	CreateDirectory $INSTDIR\GnuWin32
 	setOutPath $INSTDIR\GnuWin32
-	file "@PATH_PCRE_LICENCE@\LICENCE"
-
-	CreateDirectory $INSTDIR\GnuWin32\lib
-	setOutPath $INSTDIR\GnuWin32\lib
-	file @PATHLIBPCRE@\libpcre.a
-	file @PATHLIBPCRE@\libpcreposix.a
-	
-	CreateDirectory $INSTDIR\GnuWin32\include
-	setOutPath $INSTDIR\GnuWin32\include
-	file @PATH_PCRE_H@\pcre.h
-	file @PATH_PCRE_H@\pcreposix.h
+	file /r "@PCRE_LIBRARY_PATH@\lib"
+	file /r "@PCRE_LIBRARY_PATH@\include"
+	file /nonfatal /r "@PCRE_LIBRARY_PATH@\bin"
+	file /nonfatal /r "@PCRE_LIBRARY_PATH@\man"
+	file /nonfatal /r "@PCRE_LIBRARY_PATH@\share"
 SectionEnd
 
 # default section start
@@ -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.12"
+	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