Add a documentation link.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c4281c..bb28602 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,7 @@ if(APPLE) #MAC
 else(APPLE)
     if(WIN32) #WINDOWS
         set(LIB_EXE "a")
+        set(BIN_EXE ".exe")
     else(WIN32) #UNIX
            set(LIB_EXE "so")
     endif(WIN32)

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index a856ebb..b7772b5 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -807,4 +807,10 @@ endif("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
 "${generate_files_to_clean}")
 
+
+IF(${ARCH_32_BITS})
+  set(WIN_ARCH "32")
+ELSE(${ARCH_32_BITS})
+    set(WIN_ARCH "64")
+ENDIF(${ARCH_32_BITS})
 configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/simgrid.nsi.in"       "${CMAKE_BINARY_DIR}/simgrid.nsi" @ONLY IMMEDIATE)

diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in
index 0be0240..281da0a 100644 (file)
--- a/buildtools/Cmake/simgrid.nsi.in
+++ b/buildtools/Cmake/simgrid.nsi.in
@@ -1,5 +1,5 @@
 # define installer name\r
-outFile "SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@.exe"\r
+outFile "SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@_win@WIN_ARCH@@BIN_EXE@"\r
 \r
 # set the default installation directory\r
 InstallDir $PROGRAMFILES\SimGrid\r
@@ -13,8 +13,8 @@ section
        # install lib\r
        CreateDirectory $INSTDIR\lib\r
        setOutPath $INSTDIR\lib\r
-       file lib\libgras.a\r
-       file lib\libsimgrid.a\r
+       file lib\libgras.@LIB_EXE@\r
+       file lib\libsimgrid.@LIB_EXE@\r
        \r
        #install headers\r
        CreateDirectory  $INSTDIR\include\r
@@ -118,8 +118,8 @@ section
        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\graphicator@BIN_EXE@\r
+       file bin\gras_stub_generator@BIN_EXE@\r
        file bin\simgrid_update_xml\r
        file bin\smpicc\r
        file bin\smpif2c\r
@@ -133,12 +133,13 @@ section
        file /r @CMAKE_HOME_DIRECTORY@\doc\html\r
 \r
        # define uninstaller name\r
-       writeUninstaller $INSTDIR\uninstaller.exe\r
+       writeUninstaller $INSTDIR\uninstaller@BIN_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
+       createShortCut  "$SMPROGRAMS\SimGrid\Uninstall simgrid.lnk" "$INSTDIR\uninstaller@BIN_EXE@"\r
+       createShortCut  "$SMPROGRAMS\SimGrid\Documentation.lnk" "$INSTDIR\doc\index.html"\r
+       \r
        MessageBox MB_OK "Installation was successful."\r
 \r
 # default section end\r
@@ -149,16 +150,16 @@ sectionEnd
 section "Uninstall"\r
 \r
        # always delete uninstaller first\r
-       delete $INSTDIR\uninstaller.exe\r
+       delete $INSTDIR\uninstaller@BIN_EXE@\r
 \r
        # delete installed libs\r
-       delete $INSTDIR\lib\libgras.a\r
-       delete $INSTDIR\lib\libsimgrid.a\r
+       delete $INSTDIR\lib\libgras.@LIB_EXE@\r
+       delete $INSTDIR\lib\libsimgrid.@LIB_EXE@\r
 \r
        # delete installed bin\r
        delete $INSTDIR\bin\colorize\r
-       delete $INSTDIR\bin\graphicator.exe\r
-       delete $INSTDIR\bin\gras_stub_generator.exe\r
+       delete $INSTDIR\bin\graphicator@BIN_EXE@\r
+       delete $INSTDIR\bin\gras_stub_generator@BIN_EXE@\r
        delete $INSTDIR\bin\simgrid_update_xml\r
        delete $INSTDIR\bin\smpicc\r
        delete $INSTDIR\bin\smpif2c\r
@@ -233,8 +234,9 @@ section "Uninstall"
        delete $INSTDIR\include\simix\context.h\r
                \r
        # delete link\r
-       delete "$SMPROGRAMS\SimGrid\uninstall simgrid.lnk"\r
-\r
+       delete "$SMPROGRAMS\SimGrid\Uninstall simgrid.lnk"\r
+       delete "$SMPROGRAMS\SimGrid\Documentation.lnk"\r
+       \r
        # now delete directories\r
        RMDir  "$INSTDIR\bin"\r
        RMDir  "$INSTDIR\lib"\r