Tie module version display to servers/auspex priv.

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

diff --git a/win/inspircd.nsi b/win/inspircd.nsi
index 06a327c101357f00e8e49e65c6a2fc2af24c507f..907b5082ce0a8e1fb6c77ef6c9c0c1f3eae55551 100644 (file)
--- a/win/inspircd.nsi
+++ b/win/inspircd.nsi
@@ -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,7 +155,7 @@ 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\inspircd.censor.example"
   File "..\conf\inspircd.rules.example"
   File "..\conf\inspircd.quotes.example"
@@ -176,9 +182,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 +196,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 +246,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"