Need distrib.cmake for update_xml file and update nsis script for headers.

[simgrid.git] / buildtools / Cmake / simgrid.nsi.in

diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in
index ab736c8..b57b18a 100644 (file)
--- a/buildtools/Cmake/simgrid.nsi.in
+++ b/buildtools/Cmake/simgrid.nsi.in
@@ -47,6 +47,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
        \r
        #install headers\r
        CreateDirectory  $INSTDIR\include\r
@@ -93,14 +96,12 @@ Section "Libraries and Headers" LibSection
        file @CMAKE_HOME_DIRECTORY@\include\xbt\parmap.h\r
        file @CMAKE_HOME_DIRECTORY@\include\xbt\automaton.h\r
        file @CMAKE_HOME_DIRECTORY@\include\xbt\automatonparse_promela.h\r
+       file @CMAKE_HOME_DIRECTORY@\include\xbt\datadesc.h\r
 \r
        CreateDirectory  $INSTDIR\include\simgrid\r
        setOutPath $INSTDIR\include\simgrid\r
        file @CMAKE_HOME_DIRECTORY@\include\simgrid\platf.h\r
-       \r
-       CreateDirectory  $INSTDIR\include\mc\r
-       setOutPath $INSTDIR\include\mc\r
-       file @CMAKE_HOME_DIRECTORY@\include\mc\modelchecker.h\r
+       file @CMAKE_HOME_DIRECTORY@\include\simgrid\modelchecker.h\r
        \r
        CreateDirectory  $INSTDIR\include\msg\r
        setOutPath $INSTDIR\include\msg\r
@@ -128,7 +129,6 @@ Section "Libraries and Headers" LibSection
        \r
        CreateDirectory  $INSTDIR\include\gras\r
        setOutPath $INSTDIR\include\gras\r
-       file @CMAKE_HOME_DIRECTORY@\include\gras\datadesc.h\r
        file @CMAKE_HOME_DIRECTORY@\include\gras\transport.h\r
        file @CMAKE_HOME_DIRECTORY@\include\gras\virtu.h\r
        file @CMAKE_HOME_DIRECTORY@\include\gras\emul.h\r
@@ -162,11 +162,6 @@ Section "Binaries" BinSection
        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
-       file bin\smpiff\r
-       file bin\smpirun\r
-       file bin\tesh\r
        \r
 SectionEnd\r
 Section "Documentation" DocSection     \r
@@ -233,11 +228,11 @@ section
        !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'\r
        !define env_hkcu 'HKCU "Environment"'\r
        # Set Variables\r
-       WriteRegExpandStr ${env_hklm} SIMGRID_ROOT $INSTDIR\r
-       WriteRegExpandStr ${env_hklm} SIMGRID_VERSION @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\r
+       WriteRegExpandStr ${env_hkcu} SIMGRID_ROOT $INSTDIR\r
+       WriteRegExpandStr ${env_hkcu} SIMGRID_VERSION @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\r
 \r
-       WriteRegExpandStr ${env_hklm} SIMGRID_PCRE_LIBRARY_PATH $INSTDIR\GnuWin32\r
-       WriteRegExpandStr ${env_hklm} SIMGRID_PCRE_LIBRARY_VERSION "8.21"\r
+       WriteRegExpandStr ${env_hkcu} SIMGRID_PCRE_LIBRARY_PATH $INSTDIR\GnuWin32\r
+       WriteRegExpandStr ${env_hkcu} SIMGRID_PCRE_LIBRARY_VERSION "8.21"\r
 \r
        WriteRegStr HKCU "SOFTWARE\SimGrid" "Version" "@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"\r
        WriteRegStr HKCU "SOFTWARE\SimGrid" "InstallPath" "$INSTDIR"\r
@@ -392,10 +387,10 @@ section "Uninstall"
        RMDir   /r "$INSTDIR\GnuWin32"\r
        \r
        # Delete variable\r
-       DeleteRegValue ${env_hklm} SIMGRID_ROOT\r
-       DeleteRegValue ${env_hklm} SIMGRID_VERSION\r
-       DeleteRegValue ${env_hklm} SIMGRID_PCRE_LIBRARY_PATH\r
-       DeleteRegValue ${env_hklm} SIMGRID_PCRE_LIBRARY_VERSION\r
+       DeleteRegValue ${env_hkcu} SIMGRID_ROOT\r
+       DeleteRegValue ${env_hkcu} SIMGRID_VERSION\r
+       DeleteRegValue ${env_hkcu} SIMGRID_PCRE_LIBRARY_PATH\r
+       DeleteRegValue ${env_hkcu} SIMGRID_PCRE_LIBRARY_VERSION\r
     DeleteRegKey HKCU "SOFTWARE\SimGrid"\r
     \r
     # delete INSTDIR\r