X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd.nsi;h=78f73ef0919e4817fd1711169415145edb2808f2;hb=038b550c832ca890ae0adbac15b824debb644c9f;hp=f21a8dd1288aa0f1066ec10eb9cdeae76685862b;hpb=2fdfbe85d38ee2f83e86c67f94af2e7e7efb3b9f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/win/inspircd.nsi b/win/inspircd.nsi
index f21a8dd12..78f73ef09 100644
--- a/win/inspircd.nsi
+++ b/win/inspircd.nsi
@@ -1,14 +1,23 @@
-; *       +------------------------------------+
-; *       | Inspire Internet Relay Chat Daemon |
-; *       +------------------------------------+
-; *
-; *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
-; * See: http://www.inspircd.org/wiki/index.php/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/>.
+;
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -20,7 +29,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "InspIRCd"
-!define PRODUCT_VERSION "1.2"
+!define PRODUCT_VERSION "2.0"
 !define PRODUCT_PUBLISHER "InspIRCd Development Team"
 !define PRODUCT_WEB_SITE "http://www.inspircd.org/"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\inspircd.exe"
@@ -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,36 +139,25 @@ 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"
-  ExecWait '"$INSTDIR\bin\inspircd.exe" --installservice'
+  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 "..\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\inspircd.censor.example"
-  File "..\conf\inspircd.rules.example"
-  File "..\conf\inspircd.quotes.example"
+  File "..\docs\*.example"
 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
@@ -170,34 +165,6 @@ Section "Modules" SEC04
   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"
-SectionEnd
-
 Section -AdditionalIcons
   SetOutPath $INSTDIR
   WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
@@ -207,10 +174,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}"
@@ -223,8 +190,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
 
 
@@ -245,31 +210,25 @@ Function un.onInit
 FunctionEnd
 
 Section Uninstall
-  ExecWait '"$INSTDIR\bin\inspircd.exe" --removeservice'
+  DetailPrint "Uninstalling InspIRCd service..."
+  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\*.log"
+  Delete "$INSTDIR\logs\*"
+  Delete "$INSTDIR\data\*"
+  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"
-  RMDir "$INSTDIR\bin"
+  RMDir "$INSTDIR\logs"
+  RMDir "$INSTDIR\data"
   RMDir "$INSTDIR"
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"