Add warning to set PATH and CLASSPATH on windows

[simgrid.git] / buildtools / Cmake / simgrid.nsi.in

diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in
index 2c9bba6..a5c4f84 100644 (file)
--- a/buildtools/Cmake/simgrid.nsi.in
+++ b/buildtools/Cmake/simgrid.nsi.in
@@ -27,7 +27,7 @@
 ;--------------------------------\r
 \r
 Name "Simgrid"\r
-outFile "SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@_@NSIS_WIN_VERSION@@BIN_EXE@"\r
+outFile "SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@_SGjava_@NSIS_WIN_VERSION@@BIN_EXE@"\r
 Icon "@CMAKE_HOME_DIRECTORY@\doc\webcruft\SimGrid.ico"\r
 \r
 RequestExecutionLevel admin\r
@@ -193,7 +193,7 @@ Section "Examples" ExamplesSection
        file @CMAKE_HOME_DIRECTORY@\examples\msg\masterslave\deployment_masterslave_forwarder.xml\r
        file @CMAKE_HOME_DIRECTORY@\examples\msg\msg_platform.xml\r
        file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\CMakeLists.txt\r
-       file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\FindPCRE.cmake\r
+       file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\FindPcreWin.cmake\r
        \r
        # create shortcuts in the start menu programs directory\r
        CreateDirectory "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\"\r
@@ -207,9 +207,9 @@ Section "Pcre library" PCRESection
        setOutPath $INSTDIR\GnuWin32\r
        file /r "@PCRE_LIBRARY_PATH@\lib"\r
        file /r "@PCRE_LIBRARY_PATH@\include"\r
-       file /nonfatal /r "@PCRE_LIBRARY_PATH@\bin"\r
-       file /nonfatal /r "@PCRE_LIBRARY_PATH@\man"\r
-       file /nonfatal /r "@PCRE_LIBRARY_PATH@\share"\r
+       file /r "@PCRE_LIBRARY_PATH@\bin"\r
+       file /r "@PCRE_LIBRARY_PATH@\man"\r
+       file /r "@PCRE_LIBRARY_PATH@\share"\r
 SectionEnd\r
 \r
 Section "Java Bindings" JavaSection    \r
@@ -223,6 +223,8 @@ Section "Java Bindings" JavaSection
        file /r "$%SIMGRID_JAVA_SRC%\examples\"\r
        # create shortcuts in the start menu programs directory\r
        createShortCut  "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\Java project.lnk" "$INSTDIR\examples\simgrid-java"\r
+       # create a popup box, with an OK button"\r
+       messageBox MB_OK "WARNING! Please add to your environment variable CLASSPATH value '$INSTDIR\lib\simgrid.jar;.' before executing Simgrid classes."\r
 SectionEnd\r
 \r
 # default section start\r
@@ -248,6 +250,9 @@ section
        WriteRegStr HKCU "SOFTWARE\SimGrid" "Version" "@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"\r
        WriteRegStr HKCU "SOFTWARE\SimGrid" "InstallPath" "$INSTDIR"\r
        \r
+       # create a popup box, with an OK button"\r
+       messageBox MB_OK "WARNING! Please add to your environment variable PATH value '$INSTDIR\lib;$INSTDIR\GnuWin32\bin' before executing Simgrid binaries."\r
+       \r
        SetRebootFlag true\r
 \r
 # default section end\r