X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1730b64078a6d654b7ddedf0fb462c444c14c332..4dbaf866d8db4d8978bb7872801f720fb42fa50b:/buildtools/Cmake/src/simgrid.nsi.in diff --git a/buildtools/Cmake/src/simgrid.nsi.in b/buildtools/Cmake/src/simgrid.nsi.in index da7aeb4fd5..53813ec2db 100644 --- a/buildtools/Cmake/src/simgrid.nsi.in +++ b/buildtools/Cmake/src/simgrid.nsi.in @@ -27,7 +27,7 @@ ;-------------------------------- Name "Simgrid" -outFile "SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@_SGjava_@NSIS_WIN_VERSION@@BIN_EXE@" +outFile "SimGrid-@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@_SGjava_@NSIS_WIN_VERSION@@BIN_EXE@" Icon "@CMAKE_HOME_DIRECTORY@\doc\webcruft\SGicon.ico" RequestExecutionLevel admin @@ -90,7 +90,6 @@ Section "Libraries and Headers" LibSection file @CMAKE_HOME_DIRECTORY@\include\xbt\mmalloc.h file @CMAKE_HOME_DIRECTORY@\include\xbt\parmap.h file @CMAKE_HOME_DIRECTORY@\include\xbt\automaton.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 @@ -163,8 +162,6 @@ Section "Examples" ExamplesSection file @CMAKE_HOME_DIRECTORY@\examples\msg\masterslave\deployment_masterslave_forwarder.xml file @CMAKE_HOME_DIRECTORY@\examples\msg\msg_platform.xml file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\CMakeLists.txt - file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\FindPcreWin.cmake - # create shortcuts in the start menu programs directory CreateDirectory "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\" @@ -172,26 +169,16 @@ Section "Examples" ExamplesSection createShortCut "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\MasterSlave project.lnk" "$INSTDIR\examples\MasterSlave" SectionEnd -Section "Pcre library" PCRESection - # install pcre library - CreateDirectory $INSTDIR\GnuWin32 - setOutPath $INSTDIR\GnuWin32 - file /r "@PCRE_LIBRARY_PATH@\lib" - file /r "@PCRE_LIBRARY_PATH@\include" - file /r "@PCRE_LIBRARY_PATH@\bin" - file /r "@PCRE_LIBRARY_PATH@\man" - file /r "@PCRE_LIBRARY_PATH@\share" -SectionEnd Section "Java Bindings" JavaSection # install java library and examples CreateDirectory $INSTDIR\examples\simgrid-java setOutPath $INSTDIR\lib - 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" + file /nonfatal "lib\simgrid-java.dll" + file /nonfatal "lib\simgrid-java.def" + file /nonfatal "simgrid.jar" setOutPath $INSTDIR\examples\simgrid-java - file /nonfatal /r "$%SIMGRID_JAVA_SRC%\examples\" + file /nonfatal /r ".\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" @@ -207,16 +194,14 @@ Section "SMPI Library" SMPISection file bin\smpif90 setOutPath $INSTDIR\lib - file lib\libsmpi.dll - file lib\libsmpi.def CreateDirectory $INSTDIR\include\smpi setOutPath $INSTDIR\include\smpi file @CMAKE_HOME_DIRECTORY@\include\smpi\smpi.h file @CMAKE_HOME_DIRECTORY@\include\smpi\mpi.h - file @CMAKE_HOME_DIRECTORY@\include\smpi\mpif.h file @CMAKE_HOME_DIRECTORY@\include\smpi\smpi_cocci.h file @CMAKE_HOME_DIRECTORY@\include\smpi\smpi_main.h + file include\smpi\mpif.h file include\smpi\smpif.h CreateDirectory $INSTDIR\examples\smpi @@ -225,12 +210,10 @@ Section "SMPI Library" SMPISection setOutPath $INSTDIR\examples\smpi file @CMAKE_HOME_DIRECTORY@\examples\smpi\bcbench.c file @CMAKE_HOME_DIRECTORY@\examples\smpi\mvmul.c - file @CMAKE_HOME_DIRECTORY@\examples\smpi\mc_bugged1.c - file @CMAKE_HOME_DIRECTORY@\examples\smpi\mc_bugged2.c + file /r @CMAKE_HOME_DIRECTORY@\examples\smpi\mc file @CMAKE_HOME_DIRECTORY@\examples\smpi\hostfile file @CMAKE_HOME_DIRECTORY@\examples\msg\small_platform_with_routers.xml file @CMAKE_HOME_DIRECTORY@\examples\smpi\CMakeLists.txt - file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\FindPcreWin.cmake SectionEnd # default section start @@ -250,8 +233,6 @@ section # Set Variables WriteRegExpandStr ${env_hkcu} SIMGRID_ROOT $INSTDIR WriteRegExpandStr ${env_hkcu} SIMGRID_VERSION @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@ - WriteRegExpandStr ${env_hkcu} SIMGRID_PCRE_LIBRARY_PATH $INSTDIR\GnuWin32 - WriteRegExpandStr ${env_hkcu} SIMGRID_PCRE_LIBRARY_VERSION "8.21" WriteRegStr HKCU "SOFTWARE\SimGrid" "Version" "@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@" WriteRegStr HKCU "SOFTWARE\SimGrid" "InstallPath" "$INSTDIR" @@ -268,25 +249,22 @@ LangString DESC_LibSection ${LANG_ENGLISH} "Install Simgrid libraries with ass LangString DESC_BinSection ${LANG_ENGLISH} "Install some useful tools for Simgrid." LangString DESC_DocSection ${LANG_ENGLISH} "Generated (doxygen) documentation." LangString DESC_ExamplesSection ${LANG_ENGLISH} "Simgrid's HelloWorld example and some classical platforms." -LangString DESC_PCRESection ${LANG_ENGLISH} "Install the PCRE and PCREPOSIX libraries for SimGrid." LangString DESC_JAVASection ${LANG_ENGLISH} "Install the Java binding and examples." LangString DESC_SMPISection ${LANG_ENGLISH} "Install the SMPI library, headers, and examples." -LangString DESC_LibSection ${LANG_FRENCH} "Installer les librairies Simgrid et leurs Entêtes." +LangString DESC_LibSection ${LANG_FRENCH} "Installer les librairies Simgrid et leurs Ent�tes." LangString DESC_BinSection ${LANG_FRENCH} "Installer les outils optionnels." LangString DESC_DocSection ${LANG_FRENCH} "Installer la documentation." LangString DESC_ExamplesSection ${LANG_FRENCH} "Installer un exemple 'HelloWorld' et des fichiers de plate-formes types." -LangString DESC_PCRESection ${LANG_FRENCH} "Installer les librairies PCRE et PCREPOSIX for SimGrid." LangString DESC_JAVASection ${LANG_FRENCH} "Installer la librairie Simgrid-java et les exemples." -LangString DESC_SMPISection ${LANG_FRENCH} "Installer la librairie SMPI, ses en-têtes, et ses exemples." +LangString DESC_SMPISection ${LANG_FRENCH} "Installer la librairie SMPI, ses en-t�tes, et ses exemples." !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${LibSection} $(DESC_LibSection) !insertmacro MUI_DESCRIPTION_TEXT ${BinSection} $(DESC_BinSection) !insertmacro MUI_DESCRIPTION_TEXT ${DocSection} $(DESC_DocSection) !insertmacro MUI_DESCRIPTION_TEXT ${ExamplesSection} $(DESC_ExamplesSection) - !insertmacro MUI_DESCRIPTION_TEXT ${PCRESection} $(DESC_PCRESection) !insertmacro MUI_DESCRIPTION_TEXT ${JAVASection} $(DESC_JAVASection) !insertmacro MUI_DESCRIPTION_TEXT ${SMPISection} $(DESC_SMPISection) !insertmacro MUI_FUNCTION_DESCRIPTION_END @@ -394,14 +372,9 @@ section "Uninstall" RMDir /r "$INSTDIR\examples" RMDir /r "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@" - # delete PCRE - RMDir /r "$INSTDIR\GnuWin32" - # Delete variable DeleteRegValue ${env_hkcu} SIMGRID_ROOT DeleteRegValue ${env_hkcu} SIMGRID_VERSION - DeleteRegValue ${env_hkcu} SIMGRID_PCRE_LIBRARY_PATH - DeleteRegValue ${env_hkcu} SIMGRID_PCRE_LIBRARY_VERSION DeleteRegKey HKCU "SOFTWARE\SimGrid" # delete JAVA-bindings @@ -411,4 +384,4 @@ section "Uninstall" RMDir /r "$INSTDIR" # uninstall section end -sectionEnd \ No newline at end of file +sectionEnd