Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

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

diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in
index a5c4f84..5d797b9 100644 (file)
--- a/buildtools/Cmake/simgrid.nsi.in
+++ b/buildtools/Cmake/simgrid.nsi.in
@@ -28,7 +28,7 @@
 \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\SimGrid.ico"\r
+Icon "@CMAKE_HOME_DIRECTORY@\doc\webcruft\SGicon.ico"\r
 \r
 RequestExecutionLevel admin\r
 \r
@@ -97,12 +97,17 @@ Section "Libraries and Headers" LibSection
        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
+       file @CMAKE_HOME_DIRECTORY@\include\xbt\socket.h\r
+       file @CMAKE_HOME_DIRECTORY@\include\xbt\file_stat.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
-       \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
@@ -146,12 +151,6 @@ Section "Libraries and Headers" LibSection
        setOutPath $INSTDIR\include\instr\r
        file @CMAKE_HOME_DIRECTORY@\include\instr\instr.h\r
        \r
-       CreateDirectory  $INSTDIR\include\simix\r
-       setOutPath $INSTDIR\include\simix\r
-       file @CMAKE_HOME_DIRECTORY@\include\simix\simix.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\simix\datatypes.h\r
-       file @CMAKE_HOME_DIRECTORY@\include\simix\context.h\r
-       \r
 SectionEnd\r
 Section "Binaries" BinSection  \r
        \r
@@ -216,11 +215,11 @@ Section "Java Bindings" JavaSection
        # install java library and examples\r
        CreateDirectory $INSTDIR\examples\simgrid-java\r
        setOutPath $INSTDIR\lib\r
-       file "$%SIMGRID_JAVA_SRC%\build\SG_java.dll"\r
-       file "$%SIMGRID_JAVA_SRC%\build\SG_java.def"\r
-       file "$%SIMGRID_JAVA_SRC%\simgrid.jar"\r
+       file /nonfatal "$%SIMGRID_JAVA_SRC%\build\SG_java.dll"\r
+       file /nonfatal "$%SIMGRID_JAVA_SRC%\build\SG_java.def"\r
+       file /nonfatal "$%SIMGRID_JAVA_SRC%\simgrid.jar"\r
        setOutPath $INSTDIR\examples\simgrid-java\r
-       file /r "$%SIMGRID_JAVA_SRC%\examples\"\r
+       file /nonfatal /r "$%SIMGRID_JAVA_SRC%\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
@@ -341,7 +340,13 @@ section "Uninstall"
        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\mc\modelchecker.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
@@ -365,9 +370,6 @@ section "Uninstall"
        delete $INSTDIR\include\amok\peermanagement.h\r
        delete $INSTDIR\include\amok\bandwidth.h\r
        delete $INSTDIR\include\instr\instr.h\r
-       delete $INSTDIR\include\simix\simix.h\r
-       delete $INSTDIR\include\simix\datatypes.h\r
-       delete $INSTDIR\include\simix\context.h\r
                \r
        # delete EXTRA FILES\r
        delete $INSTDIR\AUTHORS\r