X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8be7ea3f9e71cd563e91b6aba63f5c70f043fbd5..559b2a0090857479ab19732b4c6af6b256ad1428:/buildtools/Cmake/src/simgrid.nsi.in

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