From 6735f2da27df23ee34936a4b17727f4ba44c04e8 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Mon, 9 Jul 2012 01:53:07 -0400
Subject: Fixed Windows build, int32_t is already defined in stdint.h. Add
 GnuTLS support for Windows. Made NSIS script include extra DLL files if
 supplied and include the conf/aliases and conf/modules example configuration
 files. Added make_gnutls_cert.bat to generate GnuTLS certificates on Windows.
 Fixed typo in gnutlscert.pm.

---
 win/inspircd.nsi            | 12 ++++++++++++
 win/inspircd_win32wrapper.h |  1 -
 win/make_gnutls_cert.bat    | 14 ++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 win/make_gnutls_cert.bat

(limited to 'win')

diff --git a/win/inspircd.nsi b/win/inspircd.nsi
index e263f4561..1fa21c6f9 100644
--- a/win/inspircd.nsi
+++ b/win/inspircd.nsi
@@ -153,6 +153,10 @@ SectionEnd
 Section "Config Files" SEC02
   SetOutPath "$INSTDIR\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
@@ -163,6 +167,10 @@ SectionEnd
 Section "Modules" SEC04
   SetOutPath "$INSTDIR\modules"
   File "..\bin\${BUILD}\modules\m_*.so"
+  ; Copy DLLs required for modules
+  SetOutPath "$INSTDIR"
+  File /nonfatal "*.dll"
+  File "make_gnutls_cert.bat"
 SectionEnd
 
 Section -AdditionalIcons
@@ -216,9 +224,13 @@ Section Uninstall
   Delete "$INSTDIR\uninst.exe"
   Delete "$INSTDIR\modules\*.so"
   Delete "$INSTDIR\conf\*.example"
+  Delete "$INSTDIR\conf\aliases\*.example"
+  Delete "$INSTDIR\conf\modules\*.example"
   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"
diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h
index 85572fd64..bc7165262 100644
--- a/win/inspircd_win32wrapper.h
+++ b/win/inspircd_win32wrapper.h
@@ -231,7 +231,6 @@ CoreExport int clock_gettime(int clock, struct timespec * tv);
 typedef unsigned char uint8_t;
 typedef unsigned long long uint64_t;
 typedef signed char int8_t;
-typedef signed long int32_t;
 typedef signed long long int64_t;
 typedef signed long ssize_t;
 
diff --git a/win/make_gnutls_cert.bat b/win/make_gnutls_cert.bat
new file mode 100644
index 000000000..97792cc29
--- /dev/null
+++ b/win/make_gnutls_cert.bat
@@ -0,0 +1,14 @@
+@echo off
+
+echo This program will generate SSL certificates for m_ssl_gnutls.so
+echo Ensure certtool.exe is in your system path. It can be downloaded
+echo at ftp://ftp.gnu.org/gnu/gnutls/w32/. If you do not know the answer
+echo to one of the questions just press enter.
+echo.
+
+pause
+
+certtool --generate-privkey --outfile conf/key.pem
+certtool --generate-self-signed --load-privkey conf/key.pem --outfile conf/cert.pem
+
+pause
\ No newline at end of file
-- 
cgit v1.2.3