pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-07-04 20:03:12 +02:00
Code Activity

- Applied #0003144 patch by Bock, fixing win32 install and such

Browse Source
This commit is contained in:
stskeeps
2007-07-10 10:41:24 +00:00
parent 686732b674
commit e1b48b7d3b
3 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changes
+1
View File
@@ -1522,3 +1522,4 @@
- Fixed fixed #003244 fix.
- Applied #0003422 help.conf patches by Bock
- Applied #0002999 patch by Bock, fixing a fd leak.
- Applied #0003144 patch by Bock, fixing win32 install and such
makefile.win32
+6 -2
View File
@@ -110,10 +110,12 @@ OPENSSL_LIB=/LIBPATH:"$(OPENSSL_LIB_DIR)"
!IFDEF DEBUGEXTRA
DBGCFLAG=/MDd /Zi /Od
DBGCFLAGST=/MTd /Zi /Od
DBGLFLAG=/debug
MODDBGCFLAG=/LDd /MDd /Zi
!ELSE
DBGCFLAG=/MD /Zi
DBGCFLAGST=/MT /Zi
DBGLFLAG=/debug
MODDBGCFLAG=/LDd /MD /Zi
!ENDIF
@@ -121,6 +123,8 @@ MODDBGCFLAG=/LDd /MD /Zi
FD_SETSIZE=/D FD_SETSIZE=16384
CFLAGS=$(DBGCFLAG) $(LIBCURL_INC) $(ZLIB_INC) $(OPENSSL_INC) /J /I ./INCLUDE /I ./INCLUDE/WIN32/ARES /Fosrc/ /nologo \
$(ZIPCFLAGS) $(CURLCFLAGS) $(FD_SETSIZE) $(SSLCFLAGS) $(NS_ADDRESS) /D NOSPOOF=1 /c /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE /D _USE_32BIT_TIME_T
CFLAGSST=$(DBGCFLAGST) $(LIBCURL_INC) $(ZLIB_INC) $(OPENSSL_INC) /J /I ./INCLUDE /I ./INCLUDE/WIN32/ARES /Fosrc/ /nologo \
$(ZIPCFLAGS) $(CURLCFLAGS) $(FD_SETSIZE) $(SSLCFLAGS) $(NS_ADDRESS) /D NOSPOOF=1 /c /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE /D _USE_32BIT_TIME_T
LFLAGS=kernel32.lib user32.lib gdi32.lib shell32.lib ws2_32.lib advapi32.lib \
dbghelp.lib oldnames.lib comctl32.lib comdlg32.lib $(ZLIB_LIB) $(ZIPLIB) \
$(OPENSSL_LIB) $(SSLLIBS) $(LIBCURL_LIB) $(CURLLIB) /def:wircd.def /implib:wircd.lib \
@@ -239,7 +243,7 @@ CLEAN:
-@erase src\modules\*.ilk >NUL
./UNREAL.EXE: SRC/UNREAL.OBJ SRC/WIN32/UNREAL.RES
$(LINK) $(DBGLFLAG) advapi32.lib src/unreal.obj src/win32/unreal.res
$(LINK) $(DBGLFLAGST) advapi32.lib src/unreal.obj src/win32/unreal.res
CONF:
-@copy include\win32\setup.h include\setup.h >NUL
@@ -393,7 +397,7 @@ src/win32.obj: src/win32/win32.c $(INCLUDES)
$(CC) $(CFLAGS) src/win32/win32.c
src/unreal.obj: src/win32/unreal.c $(INCLUDES)
$(CC) $(CFLAGS) src/win32/unreal.c
$(CC) $(CFLAGSST) src/win32/unreal.c
src/help.obj: src/help.c $(INCLUDES)
$(CC) $(CFLAGS) src/help.c
src/win32/unrealinst.iss
+32 -36
View File
@@ -11,7 +11,7 @@
[Setup]
AppName=UnrealIRCd
AppVerName=UnrealIRCd3.2.6
AppVerName=UnrealIRCd3.2.7-RC1
AppPublisher=UnrealIRCd Team
AppPublisherURL=http://www.unrealircd.com
AppSupportURL=http://www.unrealircd.com
@@ -104,53 +104,46 @@ function isxdl_Download(hWnd: Integer; URL, Filename: PChar): Integer;
external 'isxdl_Download@files:isxdl.dll stdcall';
function isxdl_SetOption(Option, Value: PChar): Integer;
external 'isxdl_SetOption@files:isxdl.dll stdcall';
const dbgurl = 'http://www.unrealircd.com/downloads/DbgHelp.Dll';
const crturl = 'http://www.unrealircd.com/downloads/msvcr70.dll';
const crturl = 'http://www.unrealircd.com/downloads/msvcr71.dll';
const cpturl = 'http://www.unrealircd.com/downloads/msvcp71.dll';
var didDbgDl,didCrtDl: Boolean;
function NextButtonClick(CurPage: Integer): Boolean;
var
dbghelp,tmp,output: String;
msvcrt: String;
m: String;
tmp, msvcrt, msvcpt: String;
hWnd,answer: Integer;
begin
if ((CurPage = wpReady)) then begin
// dbghelp := ExpandConstant('{sys}\DbgHelp.Dll');
// output := ExpandConstant('{app}\DbgHelp.Dll');
msvcrt := ExpandConstant('{sys}\msvcr70.Dll');
// GetVersionNumbersString(dbghelp,m);
msvcrt := ExpandConstant('{sys}\msvcr71.Dll');
msvcpt := ExpandConstant('{sys}\msvcp71.Dll');
if (NOT FileExists(msvcrt)) then begin
answer := MsgBox('Unreal requires the MS C Runtime 7.0 in order to run, do you wish to install it now?', mbConfirmation, MB_YESNO);
answer := MsgBox('Unreal requires the MS C Runtime 7.1 in order to run, do you wish to install it now?', mbConfirmation, MB_YESNO);
if answer = IDYES then begin
tmp := ExpandConstant('{tmp}\msvcr70.Dll');
isxdl_SetOption('title', 'Downloading msvcr70.dll');
tmp := ExpandConstant('{tmp}\msvcr71.Dll');
isxdl_SetOption('title', 'Downloading msvcr71.dll');
hWnd := StrToInt(ExpandConstant('{wizardhwnd}'));
if isxdl_Download(hWnd, crturl, tmp) = 0 then begin
MsgBox('Download and installation of msvcr70.dll failed, the file must be manually installed. The file can be downloaded at http://www.unrealircd.com/downloads/mscvr70.dll', mbInformation, MB_OK);
MsgBox('Download and installation of msvcr71.dll failed, the file must be manually installed. The file can be downloaded at http://www.unrealircd.com/downloads/mscvr71.dll', mbInformation, MB_OK);
end else
didCrtDl := true;
end else
MsgBox('In order for Unreal to properly function, you must manually install msvcr70.dll. The dll can be downloaded from http://www.unrealircd.com/downloads/msvcr70.dll', mbInformation, MB_OK);
MsgBox('In order for Unreal to properly function, you must manually install msvcr71.dll. The dll can be downloaded from http://www.unrealircd.com/downloads/msvcr71.dll', mbInformation, MB_OK);
end;
// if (NOT FileExists(output)) then begin
// if (NOT FileExists(dbghelp)) then
// m := StringOfChar('0',1);
// if (StrToInt(m[1]) < 5) then begin
// answer := MsgBox('DbgHelp.dll version 5.0 or higher is required to install Unreal, do you wish to install it now?', mbConfirmation, MB_YESNO);
// if answer = IDYES then begin
// tmp := ExpandConstant('{tmp}\dbghelp.dll');
// isxdl_SetOption('title', 'Downloading DbgHelp.dll');
// hWnd := StrToInt(ExpandConstant('{wizardhwnd}'));
// if isxdl_Download(hWnd, dbgurl, tmp) = 0 then begin
// MsgBox('Download and installation of DbgHelp.Dll failed, the file must be manually installed. The file can be downloaded at http://www.unrealircd.com/downloads/DbgHelp.Dll', mbInformation, MB_OK);
// end else
// didDbgDl := true;
// end else
// MsgBox('In order for Unreal to properly function you must manually install dbghelp.dll. The dll can be downloaded from http://www.unrealircd.com/downloads/DbgHelp.Dll', mbInformation, MB_OK);
// end;
// end;
if (NOT FileExists(msvcpt)) then begin
answer := MsgBox('Unreal requires the MS C++ Runtime 7.1 in order to run, do you wish to install it now?', mbConfirmation, MB_YESNO);
if answer = IDYES then begin
tmp := ExpandConstant('{tmp}\msvcp71.Dll');
isxdl_SetOption('title', 'Downloading msvcp71.dll');
hWnd := StrToInt(ExpandConstant('{wizardhwnd}'));
if isxdl_Download(hWnd, cpturl, tmp) = 0 then begin
MsgBox('Download and installation of msvcp71.dll failed, the file must be manually installed. The file can be downloaded at http://www.unrealircd.com/downloads/mscvp71.dll', mbInformation, MB_OK);
end else
didCrtDl := true;
end else
MsgBox('In order for Unreal to properly function, you must manually install msvcp71.dll. The dll can be downloaded from http://www.unrealircd.com/downloads/msvcp71.dll', mbInformation, MB_OK);
end;
end;
Result := true;
end;
@@ -166,8 +159,11 @@ begin
FileCopy(input, output, true);
end;
if (didCrtDl) then begin
input := ExpandConstant('{tmp}\msvcr70.dll');
output := ExpandConstant('{sys}\msvcr70.dll');
input := ExpandConstant('{tmp}\msvcr71.dll');
output := ExpandConstant('{sys}\msvcr71.dll');
FileCopy(input, output, true);
input := ExpandConstant('{tmp}\msvcp71.dll');
output := ExpandConstant('{sys}\msvcp71.dll');
FileCopy(input, output, true);
end;
end;
@@ -194,8 +190,8 @@ Filename: "{app}\unreal.exe"; Parameters: "config startup manual"; Flags: runmin
Filename: "{app}\unreal.exe"; Parameters: "config startup auto"; Flags: runminimized nowait; Tasks: installservice/startboot
Filename: "{app}\unreal.exe"; Parameters: "config crashrestart 2"; Flags: runminimized nowait; Tasks: installservice/crashrestart
#ifdef USE_SSL
Filename: "{app}\makecert.bat"; Tasks: makecert
Filename: "{app}\encpem.bat"; WorkingDir: "{app}"; Tasks: enccert
Filename: "{app}\makecert.bat"; Tasks: makecert; Flags: postinstall;
Filename: "{app}\encpem.bat"; WorkingDir: "{app}"; Tasks: enccert; Flags: postinstall;
#endif
[UninstallRun]