add smpi to windows installer

diff --git a/buildtools/Cmake/src/simgrid.nsi.in b/buildtools/Cmake/src/simgrid.nsi.in
index ff66d55..da7aeb4 100644 (file)
--- a/buildtools/Cmake/src/simgrid.nsi.in
+++ b/buildtools/Cmake/src/simgrid.nsi.in
@@ -84,16 +84,12 @@ Section "Libraries and Headers" LibSection
        file @CMAKE_HOME_DIRECTORY@\include\xbt\cunit.h\r
        file @CMAKE_HOME_DIRECTORY@\include\xbt\graphxml_parse.h\r
        file @CMAKE_HOME_DIRECTORY@\include\xbt\graphxml.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\time.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\synchro.h\r
        file @CMAKE_HOME_DIRECTORY@\include\xbt\synchro_core.h\r
        file @CMAKE_HOME_DIRECTORY@\include\xbt\queue.h\r
        file @CMAKE_HOME_DIRECTORY@\include\xbt\setset.h\r
        file @CMAKE_HOME_DIRECTORY@\include\xbt\mmalloc.h\r
        file @CMAKE_HOME_DIRECTORY@\include\xbt\parmap.h\r
        file @CMAKE_HOME_DIRECTORY@\include\xbt\automaton.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\automatonparse_promela.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\socket.h\r
        file @CMAKE_HOME_DIRECTORY@\include\xbt\file_stat.h\r
     file @CMAKE_HOME_DIRECTORY@\include\xbt\xbt_os_thread.h\r
     file @CMAKE_HOME_DIRECTORY@\include\xbt\RngStream.h\r
@@ -113,14 +109,7 @@ Section "Libraries and Headers" LibSection
        setOutPath $INSTDIR\include\simdag\r
        file @CMAKE_HOME_DIRECTORY@\include\simdag\simdag.h\r
        file @CMAKE_HOME_DIRECTORY@\include\simdag\datatypes.h\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 include\smpi\smpif.h\r
+\r
        \r
        CreateDirectory  $INSTDIR\include\surf\r
        setOutPath $INSTDIR\include\surf\r
@@ -141,6 +130,7 @@ Section "Binaries" BinSection
        file bin\colorize\r
        file bin\graphicator@BIN_EXE@\r
        file bin\simgrid_update_xml\r
+\r
        \r
 SectionEnd\r
 Section "Documentation" DocSection     \r
@@ -174,7 +164,8 @@ Section "Examples" ExamplesSection
        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\FindPcreWin.cmake\r
-       \r
+\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
        createShortCut  "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\HelloWorld project.lnk"   "$INSTDIR\examples\HelloWorld"\r
@@ -207,6 +198,41 @@ Section "Java Bindings" JavaSection
        messageBox MB_OK "WARNING! Please add to your environment variable CLASSPATH value '$INSTDIR\lib\simgrid.jar;.' before executing Simgrid classes."\r
 SectionEnd\r
 \r
+Section "SMPI Library" SMPISection\r
+       setOutPath $INSTDIR\bin\r
+       file bin\smpicc\r
+       file bin\smpif2c\r
+       file bin\smpiff\r
+       file bin\smpirun\r
+       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\smpif.h\r
+       \r
+       CreateDirectory $INSTDIR\examples\smpi\r
+       file /r @CMAKE_HOME_DIRECTORY@\examples\smpi\tracing\r
+       file /r @CMAKE_HOME_DIRECTORY@\examples\smpi\replay\r
+       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 @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
+       file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\FindPcreWin.cmake\r
+SectionEnd\r
+\r
 # default section start\r
 section        \r
        # define uninstaller name\r
@@ -233,7 +259,7 @@ section
        # 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
+       SetRebootFlag false\r
 \r
 # default section end\r
 sectionEnd\r
@@ -244,13 +270,16 @@ LangString DESC_DocSection                ${LANG_ENGLISH} "Generated (doxygen) documentation.
 LangString DESC_ExamplesSection ${LANG_ENGLISH} "Simgrid's HelloWorld example and some classical platforms."\r
 LangString DESC_PCRESection    ${LANG_ENGLISH} "Install the PCRE and PCREPOSIX libraries for SimGrid."\r
 LangString DESC_JAVASection    ${LANG_ENGLISH} "Install the Java binding and examples."\r
+LangString DESC_SMPISection    ${LANG_ENGLISH} "Install the SMPI library, headers, and examples."\r
+\r
 \r
 LangString DESC_LibSection             ${LANG_FRENCH}  "Installer les librairies Simgrid et leurs Entêtes."\r
 LangString DESC_BinSection             ${LANG_FRENCH}  "Installer les outils optionnels."\r
 LangString DESC_DocSection             ${LANG_FRENCH}  "Installer la documentation."\r
 LangString DESC_ExamplesSection ${LANG_FRENCH}         "Installer un exemple 'HelloWorld' et des fichiers de plate-formes types."\r
 LangString DESC_PCRESection    ${LANG_FRENCH}  "Installer les librairies PCRE et PCREPOSIX for SimGrid."\r
-LangString DESC_JAVASection    ${LANG_FRENCH}  "Installer la librairie Simgrid-java and les examples."\r
+LangString DESC_JAVASection    ${LANG_FRENCH}  "Installer la librairie Simgrid-java et les exemples."\r
+LangString DESC_SMPISection    ${LANG_FRENCH}  "Installer la librairie SMPI, ses en-têtes, et ses exemples."\r
 \r
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN\r
   !insertmacro MUI_DESCRIPTION_TEXT ${LibSection}              $(DESC_LibSection)\r
@@ -259,6 +288,7 @@ LangString DESC_JAVASection         ${LANG_FRENCH}  "Installer la librairie Simgrid-jav
   !insertmacro MUI_DESCRIPTION_TEXT ${ExamplesSection}         $(DESC_ExamplesSection)\r
   !insertmacro MUI_DESCRIPTION_TEXT ${PCRESection}             $(DESC_PCRESection)\r
   !insertmacro MUI_DESCRIPTION_TEXT ${JAVASection}             $(DESC_JAVASection)\r
+  !insertmacro MUI_DESCRIPTION_TEXT ${SMPISection}             $(DESC_SMPISection)\r
 !insertmacro MUI_FUNCTION_DESCRIPTION_END\r
 \r
 # create a section to define what the uninstaller does.\r
@@ -334,6 +364,7 @@ section "Uninstall"
        delete $INSTDIR\include\smpi\mpi.h\r
        delete $INSTDIR\include\smpi\mpif.h\r
        delete $INSTDIR\include\smpi\smpi_cocci.h\r
+       delete $INSTDIR\include\smpi\smpi_main.h\r
        delete $INSTDIR\include\smpi\smpif.h\r
        delete $INSTDIR\include\surf\surfxml_parse.h\r
        delete $INSTDIR\include\surf\simgrid_dtd.h\r