X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0d1cfbdf8f785d1c333f982dea716dd429db95c8..35f62d21aaa13145012189acb5a84e9011a172e5:/buildtools/Cmake/simgrid.nsi.in

diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in
index a5c4f84224..5d797b9014 100644
--- a/buildtools/Cmake/simgrid.nsi.in
+++ b/buildtools/Cmake/simgrid.nsi.in
@@ -28,7 +28,7 @@
 
 Name "Simgrid"
 outFile "SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@_SGjava_@NSIS_WIN_VERSION@@BIN_EXE@"
-Icon "@CMAKE_HOME_DIRECTORY@\doc\webcruft\SimGrid.ico"
+Icon "@CMAKE_HOME_DIRECTORY@\doc\webcruft\SGicon.ico"
 
 RequestExecutionLevel admin
 
@@ -97,12 +97,17 @@ Section "Libraries and Headers" LibSection
 	file @CMAKE_HOME_DIRECTORY@\include\xbt\automaton.h
 	file @CMAKE_HOME_DIRECTORY@\include\xbt\automatonparse_promela.h
 	file @CMAKE_HOME_DIRECTORY@\include\xbt\datadesc.h
+	file @CMAKE_HOME_DIRECTORY@\include\xbt\socket.h
+	file @CMAKE_HOME_DIRECTORY@\include\xbt\file_stat.h
+    file @CMAKE_HOME_DIRECTORY@\include\xbt\xbt_os_thread.h
+    file @CMAKE_HOME_DIRECTORY@\include\xbt\RngStream.h
 
 	CreateDirectory  $INSTDIR\include\simgrid
 	setOutPath $INSTDIR\include\simgrid
 	file @CMAKE_HOME_DIRECTORY@\include\simgrid\platf.h
 	file @CMAKE_HOME_DIRECTORY@\include\simgrid\modelchecker.h
-	
+	file @CMAKE_HOME_DIRECTORY@\include\simgrid\simix.h
+
 	CreateDirectory  $INSTDIR\include\msg
 	setOutPath $INSTDIR\include\msg
 	file @CMAKE_HOME_DIRECTORY@\include\msg\msg.h
@@ -146,12 +151,6 @@ Section "Libraries and Headers" LibSection
 	setOutPath $INSTDIR\include\instr
 	file @CMAKE_HOME_DIRECTORY@\include\instr\instr.h
 	
-	CreateDirectory  $INSTDIR\include\simix
-	setOutPath $INSTDIR\include\simix
-	file @CMAKE_HOME_DIRECTORY@\include\simix\simix.h
-	file @CMAKE_HOME_DIRECTORY@\include\simix\datatypes.h
-	file @CMAKE_HOME_DIRECTORY@\include\simix\context.h
-	
 SectionEnd
 Section "Binaries" BinSection	
 	
@@ -216,11 +215,11 @@ Section "Java Bindings" JavaSection
 	# install java library and examples
 	CreateDirectory $INSTDIR\examples\simgrid-java
 	setOutPath $INSTDIR\lib
-	file "$%SIMGRID_JAVA_SRC%\build\SG_java.dll"
-	file "$%SIMGRID_JAVA_SRC%\build\SG_java.def"
-	file "$%SIMGRID_JAVA_SRC%\simgrid.jar"
+	file /nonfatal "$%SIMGRID_JAVA_SRC%\build\SG_java.dll"
+	file /nonfatal "$%SIMGRID_JAVA_SRC%\build\SG_java.def"
+	file /nonfatal "$%SIMGRID_JAVA_SRC%\simgrid.jar"
 	setOutPath $INSTDIR\examples\simgrid-java
-	file /r "$%SIMGRID_JAVA_SRC%\examples\"
+	file /nonfatal /r "$%SIMGRID_JAVA_SRC%\examples\"
 	# create shortcuts in the start menu programs directory
 	createShortCut  "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\Java project.lnk"	"$INSTDIR\examples\simgrid-java"
 	# create a popup box, with an OK button"
@@ -341,7 +340,13 @@ section "Uninstall"
 	delete $INSTDIR\include\xbt\mmalloc.h
 	delete $INSTDIR\include\xbt\replay_trace_reader.h
 	delete $INSTDIR\include\xbt\parmap.h
-	delete $INSTDIR\include\mc\modelchecker.h
+	delete $INSTDIR\include\xbt\socket.h
+	delete $INSTDIR\include\xbt\file_stat.h
+
+	delete $INSTDIR\include\simgrid\platf.h
+	delete $INSTDIR\include\simgrid\modelchecker.h
+	delete $INSTDIR\include\simgrid\simix.h
+
 	delete $INSTDIR\include\msg\msg.h
 	delete $INSTDIR\include\msg\datatypes.h	
 	delete $INSTDIR\include\simdag\simdag.h
@@ -365,9 +370,6 @@ section "Uninstall"
 	delete $INSTDIR\include\amok\peermanagement.h
 	delete $INSTDIR\include\amok\bandwidth.h
 	delete $INSTDIR\include\instr\instr.h
-	delete $INSTDIR\include\simix\simix.h
-	delete $INSTDIR\include\simix\datatypes.h
-	delete $INSTDIR\include\simix\context.h
 		
 	# delete EXTRA FILES
 	delete $INSTDIR\AUTHORS