unify version name of executable

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

diff --git a/buildtools/Cmake/src/simgrid.nsi.in b/buildtools/Cmake/src/simgrid.nsi.in
index 2105d4d..2550b85 100644 (file)
--- a/buildtools/Cmake/src/simgrid.nsi.in
+++ b/buildtools/Cmake/src/simgrid.nsi.in
@@ -27,7 +27,7 @@
 ;--------------------------------\r
 \r
 Name "Simgrid"\r
-outFile "SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@_SGjava_@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\SGicon.ico"\r
 \r
 RequestExecutionLevel admin\r
@@ -174,11 +174,11 @@ Section "Java Bindings" JavaSection
        # install java library and examples\r
        CreateDirectory $INSTDIR\examples\simgrid-java\r
        setOutPath $INSTDIR\lib\r
-       file /nonfatal "$%SIMGRID_JAVA_SRC%\build\SG_java.dll"\r
-       file /nonfatal "$%SIMGRID_JAVA_SRC%\build\SG_java.def"\r
-       file /nonfatal "$%SIMGRID_JAVA_SRC%\simgrid.jar"\r
+       file /nonfatal "lib\SG_java.dll"\r
+       file /nonfatal "lib\SG_java.def"\r
+       file /nonfatal "simgrid.jar"\r
        setOutPath $INSTDIR\examples\simgrid-java\r
-       file /nonfatal /r "$%SIMGRID_JAVA_SRC%\examples\"\r
+       file /nonfatal /r ".\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
@@ -194,16 +194,14 @@ Section "SMPI Library" SMPISection
        file bin\smpif90\r
        \r
     setOutPath $INSTDIR\lib\r
-       file lib\libsmpi.dll\r
-       file lib\libsmpi.def\r
        \r
        CreateDirectory  $INSTDIR\include\smpi\r
        setOutPath $INSTDIR\include\smpi\r
        file @CMAKE_HOME_DIRECTORY@\include\smpi\smpi.h\r
        file @CMAKE_HOME_DIRECTORY@\include\smpi\mpi.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\smpi\mpif.h\r
        file @CMAKE_HOME_DIRECTORY@\include\smpi\smpi_cocci.h\r
        file @CMAKE_HOME_DIRECTORY@\include\smpi\smpi_main.h\r
+       file include\smpi\mpif.h\r
        file include\smpi\smpif.h\r
        \r
        CreateDirectory $INSTDIR\examples\smpi\r
@@ -212,8 +210,7 @@ Section "SMPI Library" SMPISection
        setOutPath $INSTDIR\examples\smpi\r
        file @CMAKE_HOME_DIRECTORY@\examples\smpi\bcbench.c\r
        file @CMAKE_HOME_DIRECTORY@\examples\smpi\mvmul.c\r
-       file @CMAKE_HOME_DIRECTORY@\examples\smpi\mc_bugged1.c\r
-       file @CMAKE_HOME_DIRECTORY@\examples\smpi\mc_bugged2.c\r
+       file /r @CMAKE_HOME_DIRECTORY@\examples\smpi\mc\r
        file @CMAKE_HOME_DIRECTORY@\examples\smpi\hostfile\r
        file @CMAKE_HOME_DIRECTORY@\examples\msg\small_platform_with_routers.xml\r
        file @CMAKE_HOME_DIRECTORY@\examples\smpi\CMakeLists.txt\r