we will never distribute a windows installer again

We would need to build with Visual C for that (because C compiler are
not compatible on Windows), and this proved to be too hard for me.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2363fac..b6dc451 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,15 +182,6 @@ if(WIN32)
   set(INCLUDES ${INCLUDES} ${CMAKE_INCLUDE_WIN})
   unset(CMAKE_INCLUDE_WIN)
 
-  find_program(NSIS_PROGRAM NAMES makensi)
-  set(NSIS_WIN_VERSION $ENV{PROCESSOR_ARCHITEW6432})
-  if(NSIS_WIN_VERSION MATCHES "")
-    set(NSIS_WIN_VERSION $ENV{PROCESSOR_ARCHITECTURE})
-  endif()
-  if(${NSIS_WIN_VERSION})
-    string(TOLOWER ${NSIS_WIN_VERSION} NSIS_WIN_VERSION)
-  endif()
-
   set(_XBT_WIN32 1)
 
   message(STATUS "C_COMPILER                    ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_VERSION}")
@@ -1134,8 +1125,6 @@ endif()
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
   "${generated_files_to_clean}")
 
-configure_file("${CMAKE_HOME_DIRECTORY}/tools/cmake/src/simgrid.nsi.in" "${CMAKE_BINARY_DIR}/simgrid.nsi" @ONLY IMMEDIATE)
-
 ### Define source packages for Libs
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake)
 

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index a4485bb..7049c5a 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -1216,7 +1216,6 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/scripts/update_tesh.pl
   tools/cmake/UnitTesting.cmake
   tools/cmake/src/internal_config.h.in
-  tools/cmake/src/simgrid.nsi.in
   tools/cmake/test_prog/prog_AC_CHECK_MCSC.c
   tools/cmake/test_prog/prog_gnu_dynlinker.c
   tools/cmake/test_prog/prog_mutex_timedlock.c

diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake
index 6a2a461..865cc32 100644 (file)
--- a/tools/cmake/Distrib.cmake
+++ b/tools/cmake/Distrib.cmake
@@ -359,15 +359,4 @@ add_custom_target(maintainer-clean
   WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
   )
 
-if(WIN32)
-  if(NSIS_PROGRAM)
-    ADD_CUSTOM_TARGET(nsis
-      COMMENT "Generating the SimGrid installer for Windows..."
-      DEPENDS simgrid simgrid graphicator simgrid-colorizer simgrid_update_xml
-      COMMAND ${NSIS_PROGRAM} simgrid.nsi
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/
-    )
-  endif()
-endif()
-
 include(CPack)

diff --git a/tools/cmake/src/simgrid.nsi.in b/tools/cmake/src/simgrid.nsi.in
deleted file mode 100644 (file)
index f31ff0f..0000000
--- a/tools/cmake/src/simgrid.nsi.in
+++ /dev/null
@@ -1,381 +0,0 @@
-!include "MUI2.nsh"\r
-\r
-;--------------------------------\r
-;Interface Configuration\r
-\r
-  !define MUI_HEADERIMAGE\r
-  !define MUI_HEADERIMAGE_BITMAP "@CMAKE_HOME_DIRECTORY@\doc\webcruft\simgrid_logo_win_2011.bmp" ; optional\r
-  !define MUI_ABORTWARNING\r
-\r
-;--------------------------------\r
-;Pages\r
-\r
-  !insertmacro MUI_PAGE_LICENSE "@CMAKE_HOME_DIRECTORY@\LICENSE-LGPL-2.1"\r
-  !insertmacro MUI_PAGE_COMPONENTS\r
-  !insertmacro MUI_PAGE_DIRECTORY\r
-  !insertmacro MUI_PAGE_INSTFILES\r
-  !insertmacro MUI_PAGE_FINISH\r
-  \r
-  !insertmacro MUI_UNPAGE_CONFIRM\r
-  !insertmacro MUI_UNPAGE_INSTFILES\r
-  !insertmacro MUI_UNPAGE_FINISH\r
-\r
-;--------------------------------\r
-;Languages\r
-  !insertmacro MUI_LANGUAGE "English"\r
-  !insertmacro MUI_LANGUAGE "French"\r
-;--------------------------------\r
-\r
-Name "Simgrid"\r
-outFile "SimGrid-@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@_SGjava_@NSIS_WIN_VERSION@@BIN_EXE@"\r
-Icon "@CMAKE_HOME_DIRECTORY@\doc\webcruft\SGicon.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
-Section "Libraries and Headers" LibSection\r
-\r
-       setOutPath $INSTDIR\r
-       file @CMAKE_HOME_DIRECTORY@\AUTHORS\r
-       file @CMAKE_HOME_DIRECTORY@\Changelog\r
-       file @CMAKE_HOME_DIRECTORY@\COPYING\r
-       file @CMAKE_HOME_DIRECTORY@\LICENSE-LGPL-2.1\r
-       file @CMAKE_HOME_DIRECTORY@\NEWS\r
-\r
-       # install lib\r
-       CreateDirectory $INSTDIR\lib\r
-       setOutPath $INSTDIR\lib\r
-       file lib\libsimgrid.dll\r
-       file lib\libsimgrid.def\r
-       \r
-       #install headers\r
-       CreateDirectory  $INSTDIR\include\r
-       setOutPath $INSTDIR\include\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt.h\r
-       file include\simgrid_config.h\r
-       \r
-       CreateDirectory  $INSTDIR\include\xbt\r
-       setOutPath $INSTDIR\include\xbt\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\misc.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\sysdep.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\virtu.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\str.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\strbuff.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\hash.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\function_types.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\asserts.h \r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\ex.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\log.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\module.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\mallocator.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\dynar.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\dict.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\set.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\heap.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\graph.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\fifo.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\swag.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\lib.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\matrix.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\peer.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\config.h\r
-       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\synchro_core.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\xbt\queue.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\xbt_os_thread.h\r
-    file @CMAKE_HOME_DIRECTORY@\include\xbt\RngStream.h\r
-\r
-       CreateDirectory  $INSTDIR\include\simgrid\r
-       setOutPath $INSTDIR\include\simgrid\r
-       file @CMAKE_HOME_DIRECTORY@\include\simgrid\platf.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\simgrid\modelchecker.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\simgrid\simix.h\r
-\r
-       CreateDirectory  $INSTDIR\include\msg\r
-       setOutPath $INSTDIR\include\msg\r
-       file @CMAKE_HOME_DIRECTORY@\include\msg\msg.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\msg\datatypes.h\r
-       \r
-       CreateDirectory  $INSTDIR\include\simdag\r
-       setOutPath $INSTDIR\include\simdag\r
-       file @CMAKE_HOME_DIRECTORY@\include\simdag\simdag.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\simdag\datatypes.h\r
-\r
-       \r
-       CreateDirectory  $INSTDIR\include\surf\r
-       setOutPath $INSTDIR\include\surf\r
-       file @CMAKE_HOME_DIRECTORY@\include\surf\surfxml_parse.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\surf\simgrid_dtd.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\surf\surf_routing.h\r
-       \r
-       CreateDirectory  $INSTDIR\include\instr\r
-       setOutPath $INSTDIR\include\instr\r
-       file @CMAKE_HOME_DIRECTORY@\include\instr\instr.h\r
-       \r
-SectionEnd\r
-Section "Binaries" BinSection  \r
-       \r
-       # insatll bin\r
-       CreateDirectory $INSTDIR\bin\r
-       setOutPath $INSTDIR\bin\r
-       file bin\colorize\r
-       file bin\graphicator@BIN_EXE@\r
-       file bin\simgrid_update_xml\r
-\r
-       \r
-SectionEnd\r
-Section "Documentation" DocSection     \r
-       \r
-       # install doc\r
-       CreateDirectory $INSTDIR\doc\r
-       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 @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
-\r
-       CreateDirectory $INSTDIR\examples\r
-       setOutPath $INSTDIR\examples\r
-       \r
-       #install examples for platforms\r
-       file /r @CMAKE_HOME_DIRECTORY@\examples\platforms\r
-       \r
-       # install example HelloWorld\r
-       file /r @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\r
-               \r
-       # install example MasterSlave\r
-       CreateDirectory $INSTDIR\examples\MasterSlave\r
-       setOutPath $INSTDIR\examples\MasterSlave\r
-       file @CMAKE_HOME_DIRECTORY@\examples\msg\masterslave\masterslave_forwarder.c\r
-       file @CMAKE_HOME_DIRECTORY@\examples\msg\masterslave\deployment_masterslave_forwarder.xml\r
-       file @CMAKE_HOME_DIRECTORY@\examples\platforms\platform.xml\r
-       file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\CMakeLists.txt\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
-       createShortCut  "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\MasterSlave project.lnk"  "$INSTDIR\examples\MasterSlave"\r
-       \r
-SectionEnd\r
-\r
-Section "Java Bindings" JavaSection    \r
-       # install java library and examples\r
-       CreateDirectory $INSTDIR\examples\simgrid-java\r
-       setOutPath $INSTDIR\lib\r
-       file /nonfatal "lib\simgrid-java.dll"\r
-       file /nonfatal "lib\simgrid-java.def"\r
-       file /nonfatal "simgrid.jar"\r
-       setOutPath $INSTDIR\examples\simgrid-java\r
-       file /nonfatal /r ".\examples\"\r
-       # create shortcuts in the start menu programs directory\r
-       createShortCut  "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\Java project.lnk" "$INSTDIR\examples\simgrid-java"\r
-       # create a popup box, with an OK button"\r
-       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\smpiff\r
-       file bin\smpirun\r
-       file bin\smpif90\r
-       \r
-    setOutPath $INSTDIR\lib\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\smpi_cocci.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\smpi\smpi_main.h\r
-       file include\smpi\mpif.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 /r @CMAKE_HOME_DIRECTORY@\examples\smpi\mc\r
-       file @CMAKE_HOME_DIRECTORY@\examples\smpi\hostfile\r
-       file @CMAKE_HOME_DIRECTORY@\examples\platforms\small_platform_with_routers.xml\r
-       file @CMAKE_HOME_DIRECTORY@\examples\smpi\CMakeLists.txt\r
-SectionEnd\r
-\r
-# default section start\r
-section        \r
-       # define uninstaller name\r
-       writeUninstaller $INSTDIR\uninstaller@BIN_EXE@\r
-\r
-       # create a shortcut in the start menu programs directory\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
-       # HKLM (all users) vs HKCU (current user) defines\r
-       !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'\r
-       !define env_hkcu 'HKCU "Environment"'\r
-       # Set Variables\r
-       WriteRegExpandStr ${env_hkcu} SIMGRID_ROOT $INSTDIR\r
-       WriteRegExpandStr ${env_hkcu} SIMGRID_VERSION @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\r
-       \r
-       WriteRegStr HKCU "SOFTWARE\SimGrid" "Version" "@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"\r
-       WriteRegStr HKCU "SOFTWARE\SimGrid" "InstallPath" "$INSTDIR"\r
-       \r
-       # 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 false\r
-\r
-# default section end\r
-sectionEnd\r
-\r
-LangString DESC_LibSection             ${LANG_ENGLISH} "Install Simgrid libraries with associated headers."\r
-LangString DESC_BinSection             ${LANG_ENGLISH} "Install some useful tools for Simgrid."\r
-LangString DESC_DocSection             ${LANG_ENGLISH} "Generated (doxygen) documentation."\r
-LangString DESC_ExamplesSection ${LANG_ENGLISH} "Simgrid's HelloWorld example and some classical platforms."\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_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
-  !insertmacro MUI_DESCRIPTION_TEXT ${BinSection}              $(DESC_BinSection)\r
-  !insertmacro MUI_DESCRIPTION_TEXT ${DocSection}              $(DESC_DocSection)\r
-  !insertmacro MUI_DESCRIPTION_TEXT ${ExamplesSection}         $(DESC_ExamplesSection)\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
-# the section will always be named "Uninstall"\r
-section "Uninstall"\r
-\r
-       # always delete uninstaller first\r
-       delete $INSTDIR\uninstaller@BIN_EXE@\r
-\r
-       # delete installed libs\r
-       delete $INSTDIR\lib\libsimgrid.dll\r
-       delete $INSTDIR\lib\libsimgrid.def\r
-\r
-       # delete installed bin\r
-       delete $INSTDIR\bin\colorize\r
-       delete $INSTDIR\bin\graphicator@BIN_EXE@\r
-       delete $INSTDIR\bin\simgrid_update_xml\r
-       delete $INSTDIR\bin\smpicc\r
-       delete $INSTDIR\bin\smpiff\r
-       delete $INSTDIR\bin\smpirun\r
-       delete $INSTDIR\bin\tesh\r
-       \r
-       # delete installed headers\r
-       delete $INSTDIR\include\xbt.h\r
-       delete $INSTDIR\include\simgrid_config.h\r
-       delete $INSTDIR\include\xbt\misc.h\r
-       delete $INSTDIR\include\xbt\sysdep.h\r
-       delete $INSTDIR\include\xbt\virtu.h\r
-       delete $INSTDIR\include\xbt\str.h\r
-       delete $INSTDIR\include\xbt\strbuff.h\r
-       delete $INSTDIR\include\xbt\hash.h\r
-       delete $INSTDIR\include\xbt\function_types.h\r
-       delete $INSTDIR\include\xbt\asserts.h \r
-       delete $INSTDIR\include\xbt\ex.h\r
-       delete $INSTDIR\include\xbt\log.h\r
-       delete $INSTDIR\include\xbt\module.h\r
-       delete $INSTDIR\include\xbt\mallocator.h\r
-       delete $INSTDIR\include\xbt\dynar.h\r
-       delete $INSTDIR\include\xbt\dict.h\r
-       delete $INSTDIR\include\xbt\set.h\r
-       delete $INSTDIR\include\xbt\heap.h\r
-       delete $INSTDIR\include\xbt\graph.h\r
-       delete $INSTDIR\include\xbt\fifo.h\r
-       delete $INSTDIR\include\xbt\swag.h\r
-       delete $INSTDIR\include\xbt\lib.h\r
-       delete $INSTDIR\include\xbt\matrix.h\r
-       delete $INSTDIR\include\xbt\peer.h\r
-       delete $INSTDIR\include\xbt\config.h\r
-       delete $INSTDIR\include\xbt\cunit.h\r
-       delete $INSTDIR\include\xbt\graphxml_parse.h\r
-       delete $INSTDIR\include\xbt\graphxml.h\r
-       delete $INSTDIR\include\xbt\time.h\r
-       delete $INSTDIR\include\xbt\synchro.h\r
-       delete $INSTDIR\include\xbt\synchro_core.h\r
-       delete $INSTDIR\include\xbt\queue.h\r
-       delete $INSTDIR\include\xbt\mmalloc.h\r
-       delete $INSTDIR\include\xbt\replay_trace_reader.h\r
-       delete $INSTDIR\include\xbt\parmap.h\r
-       delete $INSTDIR\include\xbt\socket.h\r
-       delete $INSTDIR\include\xbt\file_stat.h\r
-\r
-       delete $INSTDIR\include\simgrid\platf.h\r
-       delete $INSTDIR\include\simgrid\modelchecker.h\r
-       delete $INSTDIR\include\simgrid\simix.h\r
-\r
-       delete $INSTDIR\include\msg\msg.h\r
-       delete $INSTDIR\include\msg\datatypes.h \r
-       delete $INSTDIR\include\simdag\simdag.h\r
-       delete $INSTDIR\include\simdag\datatypes.h\r
-       delete $INSTDIR\include\smpi\smpi.h\r
-       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\surf\surfxml_parse.h\r
-       delete $INSTDIR\include\surf\simgrid_dtd.h\r
-       delete $INSTDIR\include\surf\surf_routing.h\r
-       delete $INSTDIR\include\instr\instr.h\r
-               \r
-       # delete EXTRA FILES\r
-       delete $INSTDIR\AUTHORS\r
-       delete $INSTDIR\Changelog\r
-       delete $INSTDIR\COPYING\r
-       delete $INSTDIR\LICENSE-LGPL-2.1\r
-       delete $INSTDIR\NEWS\r
-       \r
-       # now delete directories\r
-       RMDir  "$INSTDIR\bin"\r
-       RMDir  "$INSTDIR\lib"\r
-       RMDir  "$INSTDIR\include\simix"\r
-       RMDir  "$INSTDIR\include\instr"\r
-       RMDir  "$INSTDIR\include\surf"\r
-       RMDir  "$INSTDIR\include\smpi"\r
-       RMDir  "$INSTDIR\include\simdag"\r
-       RMDir  "$INSTDIR\include\msg"\r
-       RMDir  "$INSTDIR\include\mc"\r
-       RMDir  "$INSTDIR\include\xbt"\r
-       RMDir  "$INSTDIR\include"\r
-       RMDir  /r "$INSTDIR\doc"\r
-       RMDir  /r "$INSTDIR\examples"\r
-       RMDir  /r "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"\r
-       \r
-       # Delete variable\r
-       DeleteRegValue ${env_hkcu} SIMGRID_ROOT\r
-       DeleteRegValue ${env_hkcu} SIMGRID_VERSION\r
-    DeleteRegKey HKCU "SOFTWARE\SimGrid"\r
-    \r
-    # delete JAVA-bindings\r
-    RMDir /r "$INSTDIR\simgrid-java"\r
-    \r
-    # delete INSTDIR\r
-    RMDir  /r "$INSTDIR"\r
-    \r
-# uninstall section end\r
-sectionEnd\r