X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=win%2Finspircd.nsi;h=8d394d7edccc2acf7f647512ae4fb457b482d60e;hb=d9482db7e07c3d47b61848849b08375ff1037218;hp=96b2e498ed4f9f51a3bff6b48bddf6865455b4ad;hpb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/win/inspircd.nsi b/win/inspircd.nsi
index 96b2e498e..8d394d7ed 100644
--- a/win/inspircd.nsi
+++ b/win/inspircd.nsi
@@ -2,8 +2,8 @@
 ; *       | Inspire Internet Relay Chat Daemon |
 ; *       +------------------------------------+
 ; *
-; *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
-; * See: http://www.inspircd.org/wiki/index.php/Credits
+; *  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.
@@ -20,7 +20,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "InspIRCd"
-!define PRODUCT_VERSION "1.1"
+!define PRODUCT_VERSION "1.2"
 !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"
@@ -133,6 +133,10 @@ 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"
@@ -141,6 +145,8 @@ Section "Binary Executable" SEC01
   SetOutPath "$INSTDIR\bin"
   SetOverwrite ifnewer
   File "..\bin\${BUILD}\bin\inspircd.exe"
+  DetailPrint "Installing InspIRCd service..."
+  nsExec::Exec /TIMEOUT=30000 '"$INSTDIR\bin\inspircd.exe" --installservice'
 SectionEnd
 
 Section "Config Files" SEC02
@@ -149,10 +155,15 @@ Section "Config Files" SEC02
   File "..\conf\inspircd.helpop-full.example"
   File "..\conf\inspircd.helpop.example"
   File "..\conf\inspircd.filter.example"
-  File "..\docs\inspircd.conf.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"
 SectionEnd
 
 Section "Command Handlers" SEC03
@@ -176,9 +187,9 @@ Section  "SSL Modules" SEC05
   File "..\bin\${BUILD}\bin\libopencdk-8.dll"
   File "..\bin\${BUILD}\bin\libtasn1-3.dll"
   SetOutPath "$INSTDIR\modules"
-  File "d:\temp\m_ssl_gnutls.so"
-  File "d:\temp\m_sslinfo.so"
-  File "d:\temp\m_ssl_oper_cert.so"
+  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"
@@ -190,7 +201,7 @@ Section  "Regexp Modules" SEC06
   SetOverwrite ifnewer
   File "..\bin\${BUILD}\bin\pcre.dll"
   SetOutPath "$INSTDIR\modules"
-  File "d:\temp\m_filter_pcre.so"
+  File "c:\temp\m_filter_pcre.so"
 SectionEnd
 
 Section -AdditionalIcons
@@ -240,6 +251,8 @@ Function un.onInit
 FunctionEnd
 
 Section Uninstall
+  DetailPrint "Uninstalling InspIRCd service..."
+  nsExec::Exec /TIMEOUT=30000 '"$INSTDIR\bin\inspircd.exe" --removeservice'
   Delete "$INSTDIR\${PRODUCT_NAME}.url"
   Delete "$INSTDIR\uninst.exe"
   Delete "$INSTDIR\modules\m_*.so"