From: unknown <pierre@.(none)>
Date: Tue, 10 Jan 2012 21:16:32 +0000 (+0100)
Subject: Update nsis script.
X-Git-Tag: exp_20120216~155
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/efb208392b7630ccaad2b75e640def61124103a0?ds=sidebyside

Update nsis script.
Update version of pcre lib.
---

diff --git a/buildtools/Cmake/Modules/FindPCRE.cmake b/buildtools/Cmake/Modules/FindPCRE.cmake
index 0b3db37a89..5eb24f8a4c 100644
--- a/buildtools/Cmake/Modules/FindPCRE.cmake
+++ b/buildtools/Cmake/Modules/FindPCRE.cmake
@@ -83,6 +83,8 @@ if(PATH_PCRE_LIB AND PATH_PCRE_H)
 else(PATH_PCRE_LIB)
 	   message(FATAL_ERROR "Please install the libpcre3-dev package or equivalent before using SimGrid.")
 endif(PATH_PCRE_LIB AND PATH_PCRE_H)
-    
+
+set(PCRE_LIBRARY_PATH $ENV{PCRE_LIBRARY_PATH})
+
 mark_as_advanced(PATH_PCRE_H)
 mark_as_advanced(PATH_PCRE_LIB)
\ No newline at end of file
diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in
index d627181d35..a519916bb6 100644
--- a/buildtools/Cmake/simgrid.nsi.in
+++ b/buildtools/Cmake/simgrid.nsi.in
@@ -205,17 +205,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 +231,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"