m_chanhistory Fix durations containing 'S' being rejected

[user/henk/code/inspircd.git] / win / inspircd.nsi

diff --git a/win/inspircd.nsi b/win/inspircd.nsi
index dbd9d55118bcefba09ae082baae399d45c522e89..4204ec29b0caa6d2e85f95a14d0aa4eda94397d9 100644 (file)
--- a/win/inspircd.nsi
+++ b/win/inspircd.nsi
@@ -1,14 +1,23 @@
-; *       +------------------------------------+
-; *       | Inspire Internet Relay Chat Daemon |
-; *       +------------------------------------+
-; *
-; *  InspIRCd: (C) 2002-2011 InspIRCd Development Team
-; * See: http://wiki.inspircd.org/Credits
-; *
-; * This program is free but copyrighted software; see
-; *            the file COPYING for details.
-; *
-; * ---------------------------------------------------
+;
+; InspIRCd -- Internet Relay Chat Daemon
+;
+;   Copyright (C) 2011 Adam <Adam@anope.org>
+;   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+;   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
+;
+; This file is part of InspIRCd.  InspIRCd is free software: you can
+; redistribute it and/or modify it under the terms of the GNU General Public
+; License as published by the Free Software Foundation, version 2.
+;
+; This program is distributed in the hope that it will be useful, but WITHOUT
+; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+; details.
+;
+; You should have received a copy of the GNU General Public License
+; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -136,14 +145,18 @@ Section "Binary Executable" SEC01
   CreateShortCut "$SMPROGRAMS\InspIRCd\InspIRCd.lnk" "$INSTDIR\inspircd.exe"
   SetOutPath "$INSTDIR"
   SetOverwrite ifnewer
-  File "..\bin\${BUILD}\bin\inspircd.exe"
+  File "..\bin\${BUILD}\inspircd.exe"
   DetailPrint "Installing InspIRCd service..."
   nsExec::Exec /TIMEOUT=30000 '"$INSTDIR\inspircd.exe" --installservice'
 SectionEnd
 
 Section "Config Files" SEC02
   SetOutPath "$INSTDIR\conf"
-  File "..\docs\*.example"
+  File "..\docs\conf\*.example"
+  SetOutPath "$INSTDIR\conf\aliases"
+  File "..\docs\conf\aliases\*.example"
+  SetOutPath "$INSTDIR\conf\modules"
+  File "..\docs\conf\modules\modules.*"
 SectionEnd
 
 Section "Command Handlers" SEC03
@@ -154,34 +167,10 @@ SectionEnd
 Section "Modules" SEC04
   SetOutPath "$INSTDIR\modules"
   File "..\bin\${BUILD}\modules\m_*.so"
-SectionEnd
-
-Section  "SSL Modules" SEC05
+  ; Copy DLLs required for modules
   SetOutPath "$INSTDIR"
-  SetOverwrite ifnewer
-  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 "c:\temp\m_ssl_gnutls.so"
-  File "c:\temp\m_sslinfo.so"
-  File "c:\temp\m_ssl_oper_cert.so"
-  SetOutPath "$INSTDIR\conf"
-  SetOverwrite off
-  File "key.pem"
-  File "cert.pem"
-SectionEnd
-
-Section  "Regexp Modules" SEC06
-  SetOutPath "$INSTDIR"
-  SetOverwrite ifnewer
-  File "..\bin\${BUILD}\bin\pcre.dll"
-  SetOutPath "$INSTDIR\modules"
-  File "c:\temp\m_filter_pcre.so"
+  File /nonfatal "*.dll"
+  File "make_gnutls_cert.bat"
 SectionEnd
 
 Section -AdditionalIcons
@@ -209,8 +198,6 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "Command modules"
   !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
 
 
@@ -237,10 +224,15 @@ Section Uninstall
   Delete "$INSTDIR\uninst.exe"
   Delete "$INSTDIR\modules\*.so"
   Delete "$INSTDIR\conf\*.example"
-  Delete "$INSTDIR\*.dll"
+  Delete "$INSTDIR\conf\aliases\*.example"
+  Delete "$INSTDIR\conf\modules\*.example"
+  Delete "$INSTDIR\conf\modules\modules.conf.charybdis"
+  Delete "$INSTDIR\conf\modules\modules.conf.unreal"
   Delete "$INSTDIR\*.log"
   Delete "$INSTDIR\logs\*"
   Delete "$INSTDIR\data\*"
+  Delete "$INSTDIR\*.dll"
+  Delete "$INSTDIR\make_gnutls_cert.bat"
   Delete "$INSTDIR\inspircd.exe"
   Delete "$SMPROGRAMS\InspIRCd\Uninstall.lnk"
   Delete "$SMPROGRAMS\InspIRCd\InspIRCd Website.lnk"
@@ -248,6 +240,8 @@ Section Uninstall
 
   RMDir "$SMPROGRAMS\InspIRCd"
   RMDir "$INSTDIR\modules"
+  RMDir "$INSTDIR\conf\aliases"
+  RMDir "$INSTDIR\conf\modules"
   RMDir "$INSTDIR\conf"
   RMDir "$INSTDIR\logs"
   RMDir "$INSTDIR\data"