Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index c5883ac..a856ebb 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -806,3 +806,5 @@ endif("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
 
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
 "${generate_files_to_clean}")
+
+configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/simgrid.nsi.in"       "${CMAKE_BINARY_DIR}/simgrid.nsi" @ONLY IMMEDIATE)

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 2321899..170f0aa 100644 (file)
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -20,7 +20,7 @@ option(release "Whether Release Mode is activated (disable tests on experimental
 
 option(enable_gtnets "Whether gtnets model is activated." on)
 option(enable_ns3    "Whether ns3 model is activated." off)
-option(enable_smpi "This variable set smpi lib." on)
+option(enable_smpi "This variable set smpi lib." off)
 option(enable_lua "Whether the lua bindings are activated." on)
 set(enable_pcre ${enable_pcre} CACHE FORCE "Whether the pcre lib is activated.")
 if(enable_pcre STREQUAL "")

diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in
new file mode 100644 (file)
index 0000000..424555e
--- /dev/null
+++ b/buildtools/Cmake/simgrid.nsi.in
@@ -0,0 +1,76 @@
+# define installer name\r
+outFile "SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@.exe"\r
+\r
+# set the default installation directory\r
+InstallDir $PROGRAMFILES\SimGrid\r
+\r
+# The text to prompt the user to enter a directory\r
+DirText "This will install Simgrid on your computer. Choose a directory"\r
+\r
+# default section start\r
+section\r
+\r
+       # install lib\r
+       CreateDirectory $INSTDIR\lib\r
+       setOutPath $INSTDIR\lib\r
+       file lib\libgras.a\r
+       file lib\libsimgrid.a\r
+\r
+       # insatll bin\r
+       CreateDirectory $INSTDIR\bin\r
+       setOutPath $INSTDIR\bin\r
+       file bin\colorize\r
+       file bin\graphicator.exe\r
+       file bin\gras_stub_generator.exe\r
+       file bin\simgrid_update_xml\r
+       file bin\smpicc\r
+       file bin\smpif2c\r
+       file bin\smpiff\r
+       file bin\smpirun\r
+       file bin\tesh\r
+\r
+       # define uninstaller name\r
+       writeUninstaller $INSTDIR\uninstaller.exe\r
+\r
+       # create a shortcut in the start menu programs directory\r
+       CreateDirectory "$SMPROGRAMS\SimGrid"\r
+       createShortCut  "$SMPROGRAMS\SimGrid\uninstall simgrid.lnk" "$INSTDIR\uninstaller.exe"\r
+\r
+       MessageBox MB_OK "Installation was successful."\r
+\r
+# default section end\r
+sectionEnd\r
+\r
+# create a section to define what the uninstaller does.\r
+# the section will always be named "Uninstall"\r
+section "Uninstall"\r
+\r
+       # always delete uninstaller first\r
+       delete $INSTDIR\uninstaller.exe\r
+\r
+       # delete installed libs\r
+       delete $INSTDIR\lib\libgras.a\r
+       delete $INSTDIR\lib\libsimgrid.a\r
+\r
+       # delete insatlled bin\r
+       delete $INSTDIR\bin\colorize\r
+       delete $INSTDIR\bin\graphicator.exe\r
+       delete $INSTDIR\bin\gras_stub_generator.exe\r
+       delete $INSTDIR\bin\simgrid_update_xml\r
+       delete $INSTDIR\bin\smpicc\r
+       delete $INSTDIR\bin\smpif2c\r
+       delete $INSTDIR\bin\smpiff\r
+       delete $INSTDIR\bin\smpirun\r
+       delete $INSTDIR\bin\tesh\r
+\r
+       # delete link\r
+       delete "$SMPROGRAMS\SimGrid\uninstall simgrid.lnk"\r
+\r
+       # now delete directories\r
+       RMDir  "$INSTDIR\bin"\r
+       RMDir  "$INSTDIR\lib"\r
+       RMDir  "$SMPROGRAMS\SimGrid"\r
+       RMDir  "$PROGRAMFILES\SimGrid"\r
+\r
+# uninstall section end\r
+sectionEnd
\ No newline at end of file