X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd.nsi;h=4204ec29b0caa6d2e85f95a14d0aa4eda94397d9;hb=228ac9496b07a10bb0e3547d3991384739c37506;hp=117d1bc63b4f5183a2cb59de0aa88f297e5fa5d6;hpb=3f647b9c1649d62c3a91da1723afec121f396ee5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/win/inspircd.nsi b/win/inspircd.nsi
index 117d1bc63..4204ec29b 100644
--- a/win/inspircd.nsi
+++ b/win/inspircd.nsi
@@ -1,14 +1,23 @@
-; *       +------------------------------------+
-; *       | Inspire Internet Relay Chat Daemon |
-; *       +------------------------------------+
-; *
-; *  InspIRCd: (C) 2002-2009 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/>.
+;
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -50,9 +59,6 @@ Page directory
 !insertmacro MUI_PAGE_COMPONENTS
 ; Instfiles page
 !insertmacro MUI_PAGE_INSTFILES
-; Finish page
-!define MUI_FINISHPAGE_RUN "$INSTDIR\InspGUI.exe"
-!insertmacro MUI_PAGE_FINISH
 
 ; Uninstaller pages
 !insertmacro MUI_UNPAGE_INSTFILES
@@ -66,7 +72,7 @@ Page directory
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "Setup.exe"
+OutFile "${PRODUCT_NAME}-${PRODUCT_VERSION}-Setup.exe"
 InstallDir "$PROGRAMFILES\InspIRCd"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
@@ -133,75 +139,38 @@ FunctionEnd
 
 Section "Binary Executable" SEC01
   Call IsDotNetInstalled
-  SetOutPath "$TEMP"
-  SetOverwrite ifnewer
-  File "vcredist_x86.exe"
-  ExecWait "$TEMP\vcredist_x86.exe"
-  SetOutPath "$INSTDIR"
-  SetOverwrite ifnewer
-  File "..\bin\${BUILD}\InspGUI.exe"
   CreateDirectory "$SMPROGRAMS\InspIRCd"
-  CreateShortCut "$SMPROGRAMS\InspIRCd\InspIRCd.lnk" "$INSTDIR\InspGUI.exe"
-  SetOutPath "$INSTDIR\bin"
+  CreateDirectory "$INSTDIR\logs"
+  CreateDirectory "$INSTDIR\data"
+  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\bin\inspircd.exe" --installservice'
+  nsExec::Exec /TIMEOUT=30000 '"$INSTDIR\inspircd.exe" --installservice'
 SectionEnd
 
 Section "Config Files" SEC02
   SetOutPath "$INSTDIR\conf"
-  File "..\conf\inspircd.motd.example"
-  File "..\conf\inspircd.helpop-full.example"
-  File "..\conf\inspircd.helpop.example"
-  File "..\conf\inspircd.filter.example"
-  File "..\conf\inspircd.conf.example"
-  File "..\conf\opers.conf.example"
-  File "..\conf\modules.conf.example"
-  File "..\conf\links.conf.example"
-  File "..\conf\inspircd.censor.example"
-  File "..\conf\inspircd.rules.example"
-  File "..\conf\inspircd.quotes.example"
-  SetOutPath "$INSTDIR\conf\test"
-  File "..\conf\test\test.conf"
+  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
-  SetOutPath "$INSTDIR\lib"
-  File "..\bin\${BUILD}\lib\cmd_*.so"
+  SetOutPath "$INSTDIR\modules"
+  File "..\bin\${BUILD}\modules\cmd_*.so"
 SectionEnd
 
 Section "Modules" SEC04
   SetOutPath "$INSTDIR\modules"
   File "..\bin\${BUILD}\modules\m_*.so"
-SectionEnd
-
-Section  "SSL Modules" SEC05
-  SetOutPath "$INSTDIR\bin"
-  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\bin"
-  SetOverwrite ifnewer
-  File "..\bin\${BUILD}\bin\pcre.dll"
-  SetOutPath "$INSTDIR\modules"
-  File "c:\temp\m_filter_pcre.so"
+  ; Copy DLLs required for modules
+  SetOutPath "$INSTDIR"
+  File /nonfatal "*.dll"
+  File "make_gnutls_cert.bat"
 SectionEnd
 
 Section -AdditionalIcons
@@ -213,10 +182,10 @@ SectionEnd
 
 Section -Post
   WriteUninstaller "$INSTDIR\uninst.exe"
-  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\bin\inspircd.exe"
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\inspircd.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\bin\inspircd.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\inspircd.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
@@ -229,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
 
 
@@ -252,31 +219,32 @@ FunctionEnd
 
 Section Uninstall
   DetailPrint "Uninstalling InspIRCd service..."
-  nsExec::Exec /TIMEOUT=30000 '"$INSTDIR\bin\inspircd.exe" --removeservice'
+  nsExec::Exec /TIMEOUT=30000 '"$INSTDIR\inspircd.exe" --removeservice'
   Delete "$INSTDIR\${PRODUCT_NAME}.url"
   Delete "$INSTDIR\uninst.exe"
-  Delete "$INSTDIR\modules\m_*.so"
-  Delete "$INSTDIR\lib\cmd_*.so"
-  Delete "$INSTDIR\conf\inspircd.quotes.example"
-  Delete "$INSTDIR\conf\inspircd.rules.example"
-  Delete "$INSTDIR\conf\inspircd.censor.example"
-  Delete "$INSTDIR\conf\inspircd.conf.example"
-  Delete "$INSTDIR\conf\inspircd.filter.example"
-  Delete "$INSTDIR\conf\inspircd.helpop.example"
-  Delete "$INSTDIR\conf\inspircd.helpop-full.example"
-  Delete "$INSTDIR\conf\inspircd.motd.example"
-  Delete "$INSTDIR\bin\inspircd.exe"
-  Delete "$INSTDIR\bin\*.dll"
-  Delete "$INSTDIR\InspGUI.exe"
+  Delete "$INSTDIR\modules\*.so"
+  Delete "$INSTDIR\conf\*.example"
+  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"
   Delete "$SMPROGRAMS\InspIRCd\InspIRCd.lnk"
 
   RMDir "$SMPROGRAMS\InspIRCd"
   RMDir "$INSTDIR\modules"
-  RMDir "$INSTDIR\lib"
+  RMDir "$INSTDIR\conf\aliases"
+  RMDir "$INSTDIR\conf\modules"
   RMDir "$INSTDIR\conf"
-  RMDir "$INSTDIR\bin"
+  RMDir "$INSTDIR\logs"
+  RMDir "$INSTDIR\data"
   RMDir "$INSTDIR"
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"