Add sections to installer for pcre, segregate the m_filter_pcre for the installer

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7310 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 20 insertions, 2 deletions

diff --git a/win/inspircd.nsi b/win/inspircd.nsi
index 54ff9ede2..a0432eae5 100644
--- a/win/inspircd.nsi
+++ b/win/inspircd.nsi
@@ -168,15 +168,31 @@ SectionEnd
 Section  "SSL Modules" SEC05

   SetOutPath "$INSTDIR\bin"

   SetOverwrite ifnewer

-  File "..\bin\${BUILD}\bin\*.dll"

+  File "..\bin\${BUILD}\bin\libgcrypt-11.dll"

+  File "..\bin\${BUILD}\bin\libgnutls-13.dll"

+  File "..\bin\${BUILD}\bin\libgnutls-extra-13.dll"

+  File "..\bin\${BUILD}\bin\libgnutls-openssl-13.dll"

+  File "..\bin\${BUILD}\bin\libgpg-error-0.dll"

+  File "..\bin\${BUILD}\bin\libopencdk-8.dll"

+  File "..\bin\${BUILD}\bin\libtasn1-3.dll"

   SetOutPath "$INSTDIR\modules"

-  File "d:\temp\*.so"

+  File "d:\temp\m_ssl_gnutls.so"

+  File "d:\temp\m_sslinfo.so"

+  File "d:\temp\m_ssl_oper_cert.so"

   SetOutPath "$INSTDIR\conf"

   SetOverwrite off

   File "key.pem"

   File "cert.pem"

 SectionEnd

 

+Section  "Regexp Modules" SEC06

+  SetOutPath "$INSTDIR\bin"

+  SetOverwrite ifnewer

+  File "..\bin\${BUILD}\bin\pcre.dll"

+  SetOutPath "$INSTDIR\modules"

+  File "d:\temp\m_filter_pcre.so"

+SectionEnd

+

 Section -AdditionalIcons

   SetOutPath $INSTDIR

   WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"

@@ -203,6 +219,7 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "Default configuration files"

   !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Optional non-SSL modules"

   !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} "SSL modules and GnuTLS DLL libraries"

+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "Regular expression module and PCRE DLL library"

 !insertmacro MUI_FUNCTION_DESCRIPTION_END

 

 

diff --git a/win/makeinstaller.bat b/win/makeinstaller.bat
index be97b379a..ff5cbc658 100644
--- a/win/makeinstaller.bat
+++ b/win/makeinstaller.bat
@@ -2,5 +2,6 @@
 move ..\bin\release\modules\m_ssl_gnutls.so d:\temp\

 move ..\bin\release\modules\m_sslinfo.so d:\temp\

 move ..\bin\release\modules\m_ssl_oper_cert.so d:\temp\

+move ..\bin\release\modules\m_filter_pcre.so d:\temp

 "C:\Program Files\NSIS\makensisw.exe" "inspircd.nsi"

 move d:\temp\*.so ..\bin\release\modules\