From 36d6876bb57b051b1434737450f7177c9b7055f2 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Feb 2012 19:06:01 +0100 Subject: [PATCH] Rename libsimgrid.dll for libsimgrid_shared.dll --- buildtools/Cmake/MakeLibWin.cmake | 4 ++-- buildtools/Cmake/simgrid.nsi.in | 37 ++++++++++++++----------------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/buildtools/Cmake/MakeLibWin.cmake b/buildtools/Cmake/MakeLibWin.cmake index 4ffd5a4fef..27f7216c24 100644 --- a/buildtools/Cmake/MakeLibWin.cmake +++ b/buildtools/Cmake/MakeLibWin.cmake @@ -6,7 +6,7 @@ add_library(gras STATIC ${gras_sources}) set_target_properties(gras PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC -DDLL_STATIC" VERSION ${libgras_version} OUTPUT_NAME "gras") set_target_properties(simgrid PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC -DDLL_STATIC" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid") -set_target_properties(simgrid_shared PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid") +set_target_properties(simgrid_shared PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid_shared") set(GRAS_DEP "ws2_32 -lpthread") set(SIMGRID_DEP "ws2_32 -lpcre -lpthread") @@ -26,5 +26,5 @@ find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS) message(STATUS "pexports: ${PEXPORTS_PATH}") if(PEXPORTS_PATH) add_custom_command(TARGET simgrid_shared POST_BUILD -COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/libsimgrid.dll > ${CMAKE_BINARY_DIR}/lib/libsimgrid.ref) +COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/libsimgrid_shared.dll > ${CMAKE_BINARY_DIR}/lib/libsimgrid_shared.ref) endif(PEXPORTS_PATH) \ No newline at end of file diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in index b57b18a95d..57a99e6178 100644 --- 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@" Icon "@CMAKE_HOME_DIRECTORY@\doc\webcruft\SimGrid.ico" +RequestExecutionLevel admin + # set the default installation directory InstallDir c:\SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@ @@ -47,9 +49,9 @@ Section "Libraries and Headers" LibSection setOutPath $INSTDIR\lib file lib\libgras.@LIB_EXE@ file lib\libsimgrid.@LIB_EXE@ - file /nonfatal lib\libsimgrid.dll - file /nonfatal lib\libsimgrid.dll.a - file /nonfatal lib\libsimgrid.ref + file /nonfatal lib\libsimgrid_shared.dll + file /nonfatal lib\libsimgrid_shared.dll.a + file /nonfatal lib\libsimgrid_shared.ref #install headers CreateDirectory $INSTDIR\include @@ -171,9 +173,9 @@ Section "Documentation" DocSection setOutPath $INSTDIR\doc file /nonfatal /r @CMAKE_HOME_DIRECTORY@\doc\html # create a shortcut in the start menu programs directory - CreateDirectory "$SMPROGRAMS\SimGrid" - createShortCut "$SMPROGRAMS\SimGrid\Documentation.lnk" "$INSTDIR\doc\html\index.html" - createShortCut "$SMPROGRAMS\SimGrid\Website.lnk" "http://simgrid.gforge.inria.fr/" + CreateDirectory "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@" + createShortCut "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Documentation.lnk" "$INSTDIR\doc\html\index.html" + createShortCut "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Website.lnk" "http://simgrid.gforge.inria.fr/" SectionEnd Section "Examples" ExamplesSection @@ -197,9 +199,9 @@ Section "Examples" ExamplesSection file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\FindPCRE.cmake # create shortcuts in the start menu programs directory - CreateDirectory "$SMPROGRAMS\SimGrid\Examples\" - createShortCut "$SMPROGRAMS\SimGrid\Examples\HelloWorld project.lnk" "$INSTDIR\examples\HelloWorld" - createShortCut "$SMPROGRAMS\SimGrid\Examples\MasterSlave project.lnk" "$INSTDIR\examples\MasterSlave" + CreateDirectory "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\" + createShortCut "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\HelloWorld project.lnk" "$INSTDIR\examples\HelloWorld" + createShortCut "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\MasterSlave project.lnk" "$INSTDIR\examples\MasterSlave" SectionEnd Section "Pcre library" PCRESection @@ -219,8 +221,8 @@ section writeUninstaller $INSTDIR\uninstaller@BIN_EXE@ # create a shortcut in the start menu programs directory - CreateDirectory "$SMPROGRAMS\SimGrid" - createShortCut "$SMPROGRAMS\SimGrid\Uninstall simgrid.lnk" "$INSTDIR\uninstaller@BIN_EXE@" + CreateDirectory "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@" + createShortCut "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Uninstall simgrid.lnk" "$INSTDIR\uninstaller@BIN_EXE@" # Include for some of the windows message defines !include "winmessages.nsh" @@ -272,6 +274,9 @@ section "Uninstall" # delete installed libs delete $INSTDIR\lib\libgras.@LIB_EXE@ delete $INSTDIR\lib\libsimgrid.@LIB_EXE@ + delete $INSTDIR\lib\libsimgrid_shared.dll + delete $INSTDIR\lib\libsimgrid_shared.dll.a + delete $INSTDIR\lib\libsimgrid_shared.ref # delete installed bin delete $INSTDIR\bin\colorize @@ -350,13 +355,6 @@ section "Uninstall" delete $INSTDIR\include\simix\datatypes.h delete $INSTDIR\include\simix\context.h - # delete link - delete "$SMPROGRAMS\SimGrid\Uninstall simgrid.lnk" - delete "$SMPROGRAMS\SimGrid\Documentation.lnk" - delete "$SMPROGRAMS\SimGrid\Website.lnk" - delete "$SMPROGRAMS\SimGrid\Examples\HelloWorld project.lnk" - delete "$SMPROGRAMS\SimGrid\Examples\MasterSlave project.lnk" - # delete EXTRA FILES delete $INSTDIR\AUTHORS delete $INSTDIR\Changelog @@ -380,8 +378,7 @@ section "Uninstall" RMDir "$INSTDIR\include" RMDir /r "$INSTDIR\doc" RMDir /r "$INSTDIR\examples" - RMDir "$SMPROGRAMS\SimGrid\Examples" - RMDir "$SMPROGRAMS\SimGrid" + RMDir /r "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@" # delete PCRE RMDir /r "$INSTDIR\GnuWin32" -- 2.20.1