X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c0c6ff6136ed5d29f3b688b0772278ccfea8ac69..a9a3e089a22c469685cc78cf0c5fec1bfe8c0303:/buildtools/Cmake/simgrid.nsi.in

diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in
index d627181d35..48964ecc9e 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
 
 ;--------------------------------
@@ -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,6 +94,12 @@ 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
+	file @CMAKE_HOME_DIRECTORY@\include\xbt\automaton.h
+	file @CMAKE_HOME_DIRECTORY@\include\xbt\automatonparse_promela.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
@@ -205,17 +214,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
@@ -237,7 +240,7 @@ section
 	WriteRegExpandStr ${env_hklm} 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_hklm} 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"