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

diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in
index 2191decb2d..a519916bb6 100644
--- a/buildtools/Cmake/simgrid.nsi.in
+++ b/buildtools/Cmake/simgrid.nsi.in
@@ -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
@@ -35,6 +35,13 @@ InstallDir c:\SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VE
 
 Section "Libraries and Headers" LibSection
 
+	setOutPath $INSTDIR
+	file @CMAKE_HOME_DIRECTORY@\AUTHORS
+	file @CMAKE_HOME_DIRECTORY@\Changelog
+	file @CMAKE_HOME_DIRECTORY@\COPYING
+	file @CMAKE_HOME_DIRECTORY@\LICENSE-LGPL-2.1
+	file @CMAKE_HOME_DIRECTORY@\NEWS
+
 	# install lib
 	CreateDirectory $INSTDIR\lib
 	setOutPath $INSTDIR\lib
@@ -165,34 +172,44 @@ Section "Documentation" DocSection
 	# 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/"
 	
 SectionEnd
 Section "Examples" ExamplesSection	
-	
-	# install examples
+
 	CreateDirectory $INSTDIR\examples
 	setOutPath $INSTDIR\examples
+	
+	#install examples for platforms
 	file /r @CMAKE_HOME_DIRECTORY@\examples\platforms
+	
+	# install example HelloWorld
 	file /r @CMAKE_HOME_DIRECTORY@\doc\HelloWorld
-	# create a shortcut in the start menu programs directory
-	createShortCut  "$SMPROGRAMS\SimGrid\HelloWorld project.lnk"	"$INSTDIR\examples\HelloWorld"	
+		
+	# install example MasterSlave
+	CreateDirectory $INSTDIR\examples\MasterSlave
+	setOutPath $INSTDIR\examples\MasterSlave
+	file @CMAKE_HOME_DIRECTORY@\examples\msg\masterslave\masterslave_forwarder.c
+	file @CMAKE_HOME_DIRECTORY@\examples\msg\masterslave\deployment_masterslave_forwarder.xml
+	file @CMAKE_HOME_DIRECTORY@\examples\msg\msg_platform.xml
+	file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\CMakeLists.txt
+	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"
 	
 SectionEnd
 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
@@ -214,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"
@@ -335,7 +352,16 @@ section "Uninstall"
 	# delete link
 	delete "$SMPROGRAMS\SimGrid\Uninstall simgrid.lnk"
 	delete "$SMPROGRAMS\SimGrid\Documentation.lnk"
-	delete "$SMPROGRAMS\SimGrid\HelloWorld project.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
+	delete $INSTDIR\COPYING
+	delete $INSTDIR\LICENSE-LGPL-2.1
+	delete $INSTDIR\NEWS
 	
 	# now delete directories
 	RMDir  "$INSTDIR\bin"
@@ -353,6 +379,7 @@ section "Uninstall"
 	RMDir  "$INSTDIR\include"
 	RMDir  /r "$INSTDIR\doc"
 	RMDir  /r "$INSTDIR\examples"
+	RMDir  "$SMPROGRAMS\SimGrid\Examples"
 	RMDir  "$SMPROGRAMS\SimGrid"
 	
 	# delete PCRE
@@ -363,7 +390,10 @@ section "Uninstall"
 	DeleteRegValue ${env_hklm} SIMGRID_VERSION
 	DeleteRegValue ${env_hklm} SIMGRID_PCRE_LIBRARY_PATH
 	DeleteRegValue ${env_hklm} SIMGRID_PCRE_LIBRARY_VERSION
-      DeleteRegKey HKCU "SOFTWARE\SimGrid"
+    DeleteRegKey HKCU "SOFTWARE\SimGrid"
+    
+    # delete INSTDIR
+    RMDir  /r "$INSTDIR"
     
 # uninstall section end
 sectionEnd
\ No newline at end of file