X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/00255adf47970918999b2b4495ce8a69b036e68a..0d1cfbdf8f785d1c333f982dea716dd429db95c8:/buildtools/Cmake/simgrid.nsi.in

diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in
index bfbb9c1672..a5c4f84224 100644
--- a/buildtools/Cmake/simgrid.nsi.in
+++ b/buildtools/Cmake/simgrid.nsi.in
@@ -27,9 +27,11 @@
 ;--------------------------------
 
 Name "Simgrid"
-outFile "SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@_@NSIS_WIN_VERSION@@BIN_EXE@"
+outFile "SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@_SGjava_@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@
 
@@ -45,11 +47,9 @@ Section "Libraries and Headers" LibSection
 	# install lib
 	CreateDirectory $INSTDIR\lib
 	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
+	file lib\libgras.dll
+	file lib\libsimgrid.dll
+	file lib\libsimgrid.def
 	
 	#install headers
 	CreateDirectory  $INSTDIR\include
@@ -96,14 +96,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
@@ -131,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
@@ -163,7 +160,6 @@ Section "Binaries" BinSection
 	setOutPath $INSTDIR\bin
 	file bin\colorize
 	file bin\graphicator@BIN_EXE@
-	file bin\gras_stub_generator@BIN_EXE@
 	file bin\simgrid_update_xml
 	
 SectionEnd
@@ -174,9 +170,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	
@@ -197,12 +193,12 @@ Section "Examples" ExamplesSection
 	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
+	file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\FindPcreWin.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	
@@ -211,9 +207,24 @@ Section "Pcre library" PCRESection
 	setOutPath $INSTDIR\GnuWin32
 	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"
+	file /r "@PCRE_LIBRARY_PATH@\bin"
+	file /r "@PCRE_LIBRARY_PATH@\man"
+	file /r "@PCRE_LIBRARY_PATH@\share"
+SectionEnd
+
+Section "Java Bindings" JavaSection	
+	# install java library and examples
+	CreateDirectory $INSTDIR\examples\simgrid-java
+	setOutPath $INSTDIR\lib
+	file "$%SIMGRID_JAVA_SRC%\build\SG_java.dll"
+	file "$%SIMGRID_JAVA_SRC%\build\SG_java.def"
+	file "$%SIMGRID_JAVA_SRC%\simgrid.jar"
+	setOutPath $INSTDIR\examples\simgrid-java
+	file /r "$%SIMGRID_JAVA_SRC%\examples\"
+	# create shortcuts in the start menu programs directory
+	createShortCut  "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\Java project.lnk"	"$INSTDIR\examples\simgrid-java"
+	# create a popup box, with an OK button"
+	messageBox MB_OK "WARNING! Please add to your environment variable CLASSPATH value '$INSTDIR\lib\simgrid.jar;.' before executing Simgrid classes."
 SectionEnd
 
 # default section start
@@ -222,8 +233,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,13 +244,15 @@ section
 	# Set Variables
 	WriteRegExpandStr ${env_hkcu} SIMGRID_ROOT $INSTDIR
 	WriteRegExpandStr ${env_hkcu} SIMGRID_VERSION @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@
-
 	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"
 	
+	# create a popup box, with an OK button"
+	messageBox MB_OK "WARNING! Please add to your environment variable PATH value '$INSTDIR\lib;$INSTDIR\GnuWin32\bin' before executing Simgrid binaries."
+	
 	SetRebootFlag true
 
 # default section end
@@ -250,12 +263,14 @@ LangString DESC_BinSection 		${LANG_ENGLISH} "Install some useful tools for Simg
 LangString DESC_DocSection 		${LANG_ENGLISH} "Generated (doxygen) documentation."
 LangString DESC_ExamplesSection ${LANG_ENGLISH} "Simgrid's HelloWorld example and some classical platforms."
 LangString DESC_PCRESection 	${LANG_ENGLISH} "Install the PCRE and PCREPOSIX libraries for SimGrid."
+LangString DESC_JAVASection 	${LANG_ENGLISH} "Install the Java binding and examples."
 
 LangString DESC_LibSection 		${LANG_FRENCH} 	"Installer les librairies Simgrid et Gras et leurs Entêtes."
 LangString DESC_BinSection 		${LANG_FRENCH} 	"Installer les outils optionnels."
 LangString DESC_DocSection 		${LANG_FRENCH} 	"Installer la documentation."
 LangString DESC_ExamplesSection ${LANG_FRENCH} 	"Installer un exemple 'HelloWorld' et des fichiers de plate-formes types."
 LangString DESC_PCRESection 	${LANG_FRENCH}  "Installer les librairies PCRE et PCREPOSIX for SimGrid."
+LangString DESC_JAVASection 	${LANG_FRENCH}  "Installer la librairie Simgrid-java and les examples."
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${LibSection} 		$(DESC_LibSection)
@@ -263,6 +278,7 @@ LangString DESC_PCRESection 	${LANG_FRENCH}  "Installer les librairies PCRE et P
   !insertmacro MUI_DESCRIPTION_TEXT ${DocSection} 		$(DESC_DocSection)
   !insertmacro MUI_DESCRIPTION_TEXT ${ExamplesSection} 	$(DESC_ExamplesSection)
   !insertmacro MUI_DESCRIPTION_TEXT ${PCRESection} 		$(DESC_PCRESection)
+  !insertmacro MUI_DESCRIPTION_TEXT ${JAVASection} 		$(DESC_JAVASection)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 # create a section to define what the uninstaller does.
@@ -273,13 +289,13 @@ section "Uninstall"
 	delete $INSTDIR\uninstaller@BIN_EXE@
 
 	# delete installed libs
-	delete $INSTDIR\lib\libgras.@LIB_EXE@
-	delete $INSTDIR\lib\libsimgrid.@LIB_EXE@
+	delete $INSTDIR\lib\libgras.dll
+	delete $INSTDIR\lib\libsimgrid.dll
+	delete $INSTDIR\lib\libsimgrid.def
 
 	# delete installed bin
 	delete $INSTDIR\bin\colorize
 	delete $INSTDIR\bin\graphicator@BIN_EXE@
-	delete $INSTDIR\bin\gras_stub_generator@BIN_EXE@
 	delete $INSTDIR\bin\simgrid_update_xml
 	delete $INSTDIR\bin\smpicc
 	delete $INSTDIR\bin\smpif2c
@@ -353,13 +369,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
@@ -383,8 +392,7 @@ 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"
@@ -396,6 +404,9 @@ section "Uninstall"
 	DeleteRegValue ${env_hkcu} SIMGRID_PCRE_LIBRARY_VERSION
     DeleteRegKey HKCU "SOFTWARE\SimGrid"
     
+    # delete JAVA-bindings
+    RMDir /r "$INSTDIR\simgrid-java"
+    
     # delete INSTDIR
     RMDir  /r "$INSTDIR"