Remove PCRE dependency and RuleBased routing

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

diff --git a/buildtools/Cmake/src/simgrid.nsi.in b/buildtools/Cmake/src/simgrid.nsi.in
index da7aeb4..1323865 100644 (file)
--- a/buildtools/Cmake/src/simgrid.nsi.in
+++ b/buildtools/Cmake/src/simgrid.nsi.in
@@ -163,8 +163,6 @@ Section "Examples" ExamplesSection
        file @CMAKE_HOME_DIRECTORY@\examples\msg\masterslave\deployment_masterslave_forwarder.xml\r
        file @CMAKE_HOME_DIRECTORY@\examples\msg\msg_platform.xml\r
        file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\CMakeLists.txt\r
-       file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\FindPcreWin.cmake\r
-\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
@@ -172,16 +170,6 @@ Section "Examples" ExamplesSection
        createShortCut  "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\MasterSlave project.lnk"  "$INSTDIR\examples\MasterSlave"\r
        \r
 SectionEnd\r
-Section "Pcre library" PCRESection     \r
-       # install pcre library\r
-       CreateDirectory $INSTDIR\GnuWin32\r
-       setOutPath $INSTDIR\GnuWin32\r
-       file /r "@PCRE_LIBRARY_PATH@\lib"\r
-       file /r "@PCRE_LIBRARY_PATH@\include"\r
-       file /r "@PCRE_LIBRARY_PATH@\bin"\r
-       file /r "@PCRE_LIBRARY_PATH@\man"\r
-       file /r "@PCRE_LIBRARY_PATH@\share"\r
-SectionEnd\r
 \r
 Section "Java Bindings" JavaSection    \r
        # install java library and examples\r
@@ -230,7 +218,6 @@ Section "SMPI Library" SMPISection
        file @CMAKE_HOME_DIRECTORY@\examples\smpi\hostfile\r
        file @CMAKE_HOME_DIRECTORY@\examples\msg\small_platform_with_routers.xml\r
        file @CMAKE_HOME_DIRECTORY@\examples\smpi\CMakeLists.txt\r
-       file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\FindPcreWin.cmake\r
 SectionEnd\r
 \r
 # default section start\r
@@ -250,8 +237,6 @@ section
        # 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
-       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
@@ -268,25 +253,22 @@ LangString DESC_LibSection                ${LANG_ENGLISH} "Install Simgrid libraries with ass
 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_PCRESection    ${LANG_ENGLISH} "Install the PCRE and PCREPOSIX libraries for SimGrid."\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_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_PCRESection    ${LANG_FRENCH}  "Installer les librairies PCRE et PCREPOSIX for SimGrid."\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
+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 ${PCRESection}             $(DESC_PCRESection)\r
   !insertmacro MUI_DESCRIPTION_TEXT ${JAVASection}             $(DESC_JAVASection)\r
   !insertmacro MUI_DESCRIPTION_TEXT ${SMPISection}             $(DESC_SMPISection)\r
 !insertmacro MUI_FUNCTION_DESCRIPTION_END\r
@@ -394,14 +376,9 @@ section "Uninstall"
        RMDir  /r "$INSTDIR\examples"\r
        RMDir  /r "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"\r
        \r
-       # delete PCRE\r
-       RMDir   /r "$INSTDIR\GnuWin32"\r
-       \r
        # Delete variable\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 JAVA-bindings\r