diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/configure.cpp | 7 | ||||
| -rw-r--r-- | win/inspircd.nsi | 12 | ||||
| -rw-r--r-- | win/inspircd.vcxproj | 3 | ||||
| -rw-r--r-- | win/inspircd_win32wrapper.cpp | 7 | ||||
| -rw-r--r-- | win/inspircd_win32wrapper.h | 1 | ||||
| -rw-r--r-- | win/make_gnutls_cert.bat | 14 |
6 files changed, 40 insertions, 4 deletions
diff --git a/win/configure.cpp b/win/configure.cpp index ee03b3659..768b68cc5 100644 --- a/win/configure.cpp +++ b/win/configure.cpp @@ -275,7 +275,11 @@ void Run() fclose(fI); } else - strcpy(version, "InspIRCD-Unknown"); + strcpy(version, "InspIRCd-0.0.0"); + + string branch(version); + branch.erase(branch.find_last_of('.')); + #ifdef WIN64 printf_c("Your operating system is: \033[1;32mwindows_x64 \033[0m\n"); #else @@ -351,6 +355,7 @@ void Run() sc(TGREEN); printf(" done\n"); sc(TNORMAL); printf("Writing inspircd_version.h..."); f = fopen("inspircd_version.h", "w"); + fprintf(f, "#define BRANCH \"%s\"\n", branch.c_str()); fprintf(f, "#define VERSION \"%s\"\n", version); fprintf(f, "#define REVISION \"%s\"\n", revision.c_str()); fprintf(f, "#define SYSTEM \"%s\"\n", machine_text); 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.vcxproj b/win/inspircd.vcxproj index 03bacaad3..d6da89562 100644 --- a/win/inspircd.vcxproj +++ b/win/inspircd.vcxproj @@ -308,7 +308,6 @@ nmake -f modules.mak <ClCompile Include="..\src\socket.cpp" /> <ClCompile Include="..\src\socketengine.cpp" /> <ClCompile Include="..\src\socketengines\socketengine_select.cpp" /> - <ClCompile Include="..\src\stats.cpp" /> <ClCompile Include="..\src\testsuite.cpp" /> <ClCompile Include="..\src\threadengine.cpp" /> <ClCompile Include="..\src\threadengines\threadengine_win32.cpp" /> @@ -390,4 +389,4 @@ nmake -f modules.mak <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp index 43ca87240..ec4e7833b 100644 --- a/win/inspircd_win32wrapper.cpp +++ b/win/inspircd_win32wrapper.cpp @@ -738,6 +738,7 @@ static void unused_function() reference<Link> unused_Link; reference<Autoconnect> unused_Autoconnect; reference<ssl_cert> unused_Cert; + reference<OperInfo> unused_OperInfo; if (unused_Link) unused_Link->Port = -1; @@ -745,20 +746,26 @@ static void unused_function() unused_Autoconnect->NextConnectTime = -1; if (unused_Cert) unused_Cert->dn = ""; + if (unused_OperInfo) + unused_OperInfo->name = ""; Autoconnect *a = unused_Autoconnect; Link *l = unused_Link; ssl_cert *s = unused_Cert; + OperInfo *o = unused_OperInfo; unused_Link = reference<Link>(unused_Link); unused_Autoconnect = reference<Autoconnect>(unused_Autoconnect); unused_Cert = reference<ssl_cert>(unused_Cert); + unused_OperInfo = reference<OperInfo>(unused_OperInfo); unused_Link = reference<Link>(l); unused_Autoconnect = reference<Autoconnect>(a); unused_Cert = reference<ssl_cert>(s); + unused_OperInfo = reference<OperInfo>(o); delete unused_Link; delete unused_Autoconnect; delete unused_Cert; + delete unused_OperInfo; } 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 |