Rename libsimgrid.dll for libsimgrid_shared.dll

diff --git a/buildtools/Cmake/MakeLibWin.cmake b/buildtools/Cmake/MakeLibWin.cmake
index 4ffd5a4..27f7216 100644 (file)
--- a/buildtools/Cmake/MakeLibWin.cmake
+++ b/buildtools/Cmake/MakeLibWin.cmake
@@ -6,7 +6,7 @@ add_library(gras STATIC ${gras_sources})
 \r
 set_target_properties(gras            PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC -DDLL_STATIC" VERSION ${libgras_version}    OUTPUT_NAME "gras")\r
 set_target_properties(simgrid         PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC -DDLL_STATIC" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid")\r
-set_target_properties(simgrid_shared  PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid")\r
+set_target_properties(simgrid_shared  PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid_shared")\r
 \r
 set(GRAS_DEP "ws2_32 -lpthread")\r
 set(SIMGRID_DEP "ws2_32 -lpcre -lpthread")\r
@@ -26,5 +26,5 @@ find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS)
 message(STATUS "pexports: ${PEXPORTS_PATH}")\r
 if(PEXPORTS_PATH)\r
 add_custom_command(TARGET simgrid_shared POST_BUILD\r
-COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/libsimgrid.dll > ${CMAKE_BINARY_DIR}/lib/libsimgrid.ref)\r
+COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/libsimgrid_shared.dll > ${CMAKE_BINARY_DIR}/lib/libsimgrid_shared.ref)\r
 endif(PEXPORTS_PATH)
\ No newline at end of file

diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in
index b57b18a..57a99e6 100644 (file)
--- a/buildtools/Cmake/simgrid.nsi.in
+++ b/buildtools/Cmake/simgrid.nsi.in
@@ -30,6 +30,8 @@ Name "Simgrid"
 outFile "SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@_@NSIS_WIN_VERSION@@BIN_EXE@"\r
 Icon "@CMAKE_HOME_DIRECTORY@\doc\webcruft\SimGrid.ico"\r
 \r
+RequestExecutionLevel admin\r
+\r
 # set the default installation directory\r
 InstallDir c:\SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\r
 \r
@@ -47,9 +49,9 @@ Section "Libraries and Headers" LibSection
        setOutPath $INSTDIR\lib\r
        file lib\libgras.@LIB_EXE@\r
        file lib\libsimgrid.@LIB_EXE@\r
-       file /nonfatal lib\libsimgrid.dll\r
-       file /nonfatal lib\libsimgrid.dll.a\r
-       file /nonfatal lib\libsimgrid.ref\r
+       file /nonfatal lib\libsimgrid_shared.dll\r
+       file /nonfatal lib\libsimgrid_shared.dll.a\r
+       file /nonfatal lib\libsimgrid_shared.ref\r
        \r
        #install headers\r
        CreateDirectory  $INSTDIR\include\r
@@ -171,9 +173,9 @@ Section "Documentation" DocSection
        setOutPath $INSTDIR\doc\r
        file /nonfatal /r @CMAKE_HOME_DIRECTORY@\doc\html\r
        # create a shortcut in the start menu programs directory\r
-       CreateDirectory "$SMPROGRAMS\SimGrid"\r
-       createShortCut  "$SMPROGRAMS\SimGrid\Documentation.lnk" "$INSTDIR\doc\html\index.html"\r
-       createShortCut  "$SMPROGRAMS\SimGrid\Website.lnk"       "http://simgrid.gforge.inria.fr/"\r
+       CreateDirectory "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"\r
+       createShortCut  "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Documentation.lnk" "$INSTDIR\doc\html\index.html"\r
+       createShortCut  "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Website.lnk"       "http://simgrid.gforge.inria.fr/"\r
        \r
 SectionEnd\r
 Section "Examples" ExamplesSection     \r
@@ -197,9 +199,9 @@ Section "Examples" ExamplesSection
        file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\FindPCRE.cmake\r
        \r
        # create shortcuts in the start menu programs directory\r
-       CreateDirectory "$SMPROGRAMS\SimGrid\Examples\"\r
-       createShortCut  "$SMPROGRAMS\SimGrid\Examples\HelloWorld project.lnk"   "$INSTDIR\examples\HelloWorld"\r
-       createShortCut  "$SMPROGRAMS\SimGrid\Examples\MasterSlave project.lnk"  "$INSTDIR\examples\MasterSlave"\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
+       createShortCut  "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\MasterSlave project.lnk"  "$INSTDIR\examples\MasterSlave"\r
        \r
 SectionEnd\r
 Section "Pcre library" PCRESection     \r
@@ -219,8 +221,8 @@ section
        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@BIN_EXE@"\r
+       CreateDirectory "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"\r
+       createShortCut  "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Uninstall simgrid.lnk" "$INSTDIR\uninstaller@BIN_EXE@"\r
 \r
        # Include for some of the windows message defines\r
        !include "winmessages.nsh"\r
@@ -272,6 +274,9 @@ section "Uninstall"
        # delete installed libs\r
        delete $INSTDIR\lib\libgras.@LIB_EXE@\r
        delete $INSTDIR\lib\libsimgrid.@LIB_EXE@\r
+       delete $INSTDIR\lib\libsimgrid_shared.dll\r
+       delete $INSTDIR\lib\libsimgrid_shared.dll.a\r
+       delete $INSTDIR\lib\libsimgrid_shared.ref\r
 \r
        # delete installed bin\r
        delete $INSTDIR\bin\colorize\r
@@ -350,13 +355,6 @@ section "Uninstall"
        delete $INSTDIR\include\simix\datatypes.h\r
        delete $INSTDIR\include\simix\context.h\r
                \r
-       # delete link\r
-       delete "$SMPROGRAMS\SimGrid\Uninstall simgrid.lnk"\r
-       delete "$SMPROGRAMS\SimGrid\Documentation.lnk"\r
-       delete "$SMPROGRAMS\SimGrid\Website.lnk"\r
-       delete "$SMPROGRAMS\SimGrid\Examples\HelloWorld project.lnk"\r
-       delete "$SMPROGRAMS\SimGrid\Examples\MasterSlave project.lnk"\r
-       \r
        # delete EXTRA FILES\r
        delete $INSTDIR\AUTHORS\r
        delete $INSTDIR\Changelog\r
@@ -380,8 +378,7 @@ section "Uninstall"
        RMDir  "$INSTDIR\include"\r
        RMDir  /r "$INSTDIR\doc"\r
        RMDir  /r "$INSTDIR\examples"\r
-       RMDir  "$SMPROGRAMS\SimGrid\Examples"\r
-       RMDir  "$SMPROGRAMS\SimGrid"\r
+       RMDir  /r "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"\r
        \r
        # delete PCRE\r
        RMDir   /r "$INSTDIR\GnuWin32"\r