diff options
| -rw-r--r-- | Changes | 1 | ||||
| -rw-r--r-- | Makefile.win32 | 30 | ||||
| -rw-r--r-- | install.vbs | 680 | ||||
| -rw-r--r-- | lang/Makefile.win32 | 4 | ||||
| -rw-r--r-- | src/makefile.win32 | 2 | ||||
| -rw-r--r-- | version.log | 6 |
6 files changed, 410 insertions, 313 deletions
@@ -1,6 +1,7 @@ Anope Version S V N -------------------- Provided by Anope Dev. <dev@anope.org> - 2005 +08/10 A New Windows installation files. [ #00] 07/04 A Warning when running Anope as root (DON'T DO THAT! :)). [ #00] 07/01 A Events for channel access/xop updates. [ #00] 06/26 A New module pack module: hs_request. [ #00] diff --git a/Makefile.win32 b/Makefile.win32 index 5b31fff05..fcfa08f9a 100644 --- a/Makefile.win32 +++ b/Makefile.win32 @@ -25,21 +25,21 @@ install: cd lang && $(MAKE) install && cd .. cd src && $(MAKE) install && cd .. cd src\modules && $(MAKE) install && cd .. - cd src\modules && $(MAKE) subs-install && cd .. - cd src\protocol && $(MAKE) install && cd .. - cd src\core && $(MAKE) install && cd .. - cd src\tools && $(MAKE) install && cd .. + cd src\modules && $(MAKE) subs-install && cd .. + cd src\protocol && $(MAKE) install && cd .. + cd src\core && $(MAKE) install && cd .. + cd src\tools && $(MAKE) install && cd .. -@echo --- -@echo Anope has been insalled successfully! - -@echo See docs\INSTALL for details on how to configure Anope for use. + -@echo See docs\INSTALL for details on how to configure Anope for use. -@echo --- clean: cd src && $(MAKE) spotless && cd .. - cd src\modules && $(MAKE) spotless && cd .. - cd src\protocol && $(MAKE) spotless && cd .. - cd src\core && $(MAKE) spotless && cd .. - cd src\tools && $(MAKE) spotless && cd .. + cd src\modules && $(MAKE) spotless && cd .. + cd src\protocol && $(MAKE) spotless && cd .. + cd src\core && $(MAKE) spotless && cd .. + cd src\tools && $(MAKE) spotless && cd .. cd lang && $(MAKE) spotless && cd .. -@erase *.exe version.h *.obj @@ -47,9 +47,9 @@ spotless: cd lang && $(MAKE) spotless && cd .. cd src && $(MAKE) spotless && cd .. cd src\modules && $(MAKE) spotless && cd ..\.. - cd src\protocol && $(MAKE) spotless && cd ..\.. - cd src\core && $(MAKE) spotless && cd ..\.. - cd src\tools && $(MAKE) spotless && cd ..\.. + cd src\protocol && $(MAKE) spotless && cd ..\.. + cd src\core && $(MAKE) spotless && cd ..\.. + cd src\tools && $(MAKE) spotless && cd ..\.. -@erase include\language.h include\version.h *~ anope.exe version.sh.exe *.obj anopesmtp.exe mypasql: @@ -67,10 +67,10 @@ tools: FRC cd src\tools && $(MAKE) && cd ..\.. core: FRC - cd src\core && $(MAKE) && cd ..\.. + cd src\core && $(MAKE) && cd ..\.. protocols: FRC - cd src\protocol && $(MAKE) && cd ..\.. + cd src\protocol && $(MAKE) && cd ..\.. modules: FRC cd src\modules && $(MAKE) && cd ..\.. @@ -94,6 +94,6 @@ include\version.h: version.sh.exe version.log include\services.h include\pseudo. copy version.h include\version.h version.sh.exe: - $(CC) include\version.sh.c + $(CC) $(BASE_CFLAGS) include\version.sh.c /link $(LFLAGS) FRC: diff --git a/install.vbs b/install.vbs index 2144b02f2..c08c44c2c 100644 --- a/install.vbs +++ b/install.vbs @@ -1,294 +1,386 @@ -' Configuration for Anope
-'
-' (C) 2003-2005 Anope Team
-' Contact us at info@anope.org
-'
-' This program is free but copyrighted software; see the file COPYING for
-' details.
-'
-' Based on the original code of Epona by Lara.
-' Based on the original code of Services by Andy Church.
-
-
-' Required Variables
-Dim StdIn
-Dim UseMySQL, UseDBEnc, CompilerVer
-Dim fso
-Set fso = CreateObject("Scripting.FileSystemObject")
-
-' Setup StdIn for use
-Set StdIn = WScript.StdIn
-
-' Display introductory header
-WScript.Echo ""
-WScript.Echo " ___"
-WScript.Echo " / _ \ http://www.anope.org"
-WScript.Echo " | /_\ | _ __ _ _ _ _ ___"
-WScript.Echo " | _ || '_ \/ _ \/ _ \ / _ \"
-WScript.Echo " | | | || | | |_| |_| | __/"
-WScript.Echo " |_| |_||_| |_\___/| _/ \___|"
-WScript.Echo " | |"
-WScript.Echo " |_| IRC Services"
-WScript.Echo " v1.7.10"
-WScript.Echo ""
-WScript.Echo ""
-WScript.Echo "This program will help you to compile your Services, and ask you"
-WScript.Echo "questions regarding the compile-time settings of it during the"
-WScript.Echo "process."
-WScript.Echo ""
-WScript.Echo "Anope is a set of Services for IRC networks that allows users to"
-WScript.Echo "manage their nicks and channels in a secure and efficient way,"
-WScript.Echo "and administrators to manage their network with powerful tools."
-WScript.Echo ""
-WScript.Echo "Do not forget to read all the documents located in docs/,"
-WScript.Echo "especially the README and INSTALL files."
-WScript.Echo ""
-WScript.Echo "For all your Anope needs please visit our portal at"
-WScript.Echo "http://www.anope.org/"
-WScript.Echo ""
-WScript.Echo "Press Enter to Continue..."
-StdIn.ReadLine
-
-' Enable MySQL Support?
-Do While (UseMySQL <> "Y" AND UseMySQL <> "N" AND UseMySQL <> "YES" AND UseMySQL <> "NO")
- WScript.Echo "Would you like to compile Anope with MySQL Support?"
- WScript.Echo "(NOTE: You must have MySQL 3.23 or Later installed)"
- WScript.Echo ""
- WScript.Echo "Yes / No (Default)"
- UseMySQL = UCase(Trim(StdIn.ReadLine))
- If (UseMySQL = "") Then
- UseMySQL = "N"
- End If
- If (UseMySQL <> "Y" AND UseMySQL <> "N" AND UseMySQL <> "YES" AND UseMySQL <> "NO") Then
- WScript.Echo ""
- WScript.Echo "Invalid Selection!"
- WScript.Echo ""
- End If
-Loop
-
-WScript.Echo ""
-
-If (UseMySQL = "Y" OR UseMySQL = "YES") Then
- If (fso.FileExists("C:\mysql\lib\opt\libmysql.lib") = False) Then
- WScript.Echo "ERROR: Cannot find LibMySQL.lib in c:\mysql\lib\opt!"
- WScript.Echo "MySQL Support Disabled.."
- UseMySQL = "0"
- ElseIf (fso.FileExists("C:\mysql\include\mysql.h") = False) Then
- WScript.Echo "ERROR: Cannot find mysql.h in c:\mysql\include!"
- WScript.Echo "MySQL Support Disabled.."
- UseMySQL = "0"
- Else
- WScript.Echo "All required files for MySQL Support have been located!"
- WScript.Echo "MySQL Support Enabled.."
- UseMySQL = "1"
- End If
-Else
- WScript.Echo "MySQL Support Disabled.."
- UseMySQL = "0"
-End If
-
-WScript.Echo ""
-
-' Enable Database Encryption Support?
-Do While (UseDBEnc <> "Y" AND UseDBEnc <> "N" AND UseDBEnc <> "YES" AND UseDBEnc <> "NO")
- WScript.Echo "Would you like to enable Database Encryption?"
- WScript.Echo "(NOTE: If you enable encryption, you will NOT be able to recover"
- WScript.Echo "passwords at a later date. GETPASS and SENDPASS will also be useless)"
- WScript.Echo ""
- WScript.Echo "Yes / No (Default)"
- UseDBEnc = UCase(Trim(StdIn.ReadLine))
- If (UseDBEnc = "") Then
- UseDBEnc = "N"
- End If
- If (UseDBEnc <> "Y" AND UseDBEnc <> "N" AND UseDBEnc <> "YES" AND UseDBEnc <> "NO") Then
- WScript.Echo ""
- WScript.Echo "Invalid Selection!"
- WScript.Echo ""
- End If
-Loop
-
-WScript.Echo ""
-
-If (UseDBEnc = "Y" OR UseDBEnc = "YES") Then
- WScript.Echo "Database Encryption Enabled.."
- UseDBEnc = "1"
-Else
- WScript.Echo "Database Encryption Disabled.."
- UseDBEnc = "0"
-End If
-
-WScript.Echo ""
-WScript.Echo "I will now check you have all the things I need..."
-
-Dim libPath, libPath2
-If (fso.FolderExists("C:\Program Files\Microsoft Visual Studio .NET 2003\VC7\Lib")) Then
- WScript.Echo "I found a copy of Microsoft Visual Studio .NET 2003.."
- libPath = "C:\Program Files\Microsoft Visual Studio .NET 2003\VC7\Lib"
- libPath2 = "C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\PlatformSDK\Lib"
- If (fso.FileExists(libPath & "/MSVCRT.lib") = False And fso.FileExists(libPath2 & "/MSVCRT.lib") = False) Then
- WScript.Echo "Hm. I can't seem to find the default library.. Are you sure this is installed properly?"
- libPath = ""
- libPath2 = ""
- ElseIf (fso.FileExists(libPath & "/wsock32.lib") = False And fso.FileExists(libPath2 & "/wsock32.lib") = False) Then
- WScript.Echo "I couldn't seem to find wsock32.lib.. We kind of need this.."
- libPath = ""
- libPath2 = ""
- ElseIf (fso.FileExists(libPath & "/advapi32.lib") = False And fso.FileExists(libPath2 & "/advapi32.lib") = False) Then
- WScript.Echo "I couldn't seem to find advapi32.lib.. We kind of need this.."
- libPath = ""
- libPath2 = ""
- ElseIf (fso.FileExists(libPath & "/uuid.lib") = False And fso.FileExists(libPath2 & "/uuid.lib") = False) Then
- WScript.Echo "I couldn't seem to find uuid.lib.. We kind of need this.."
- libPath = ""
- libPath2 = ""
- End If
-End If
-
-If (fso.FolderExists("C:\Program Files\Microsoft Visual Studio\VC98\Lib") And LibPath = "") Then
- WScript.Echo "I found a copy of Microsoft Visual Studio 6.. It's old, but we can use it.."
- libPath = "C:\Program Files\Microsoft Visual Studio\VC98\Lib"
- CompilerVer = "VC6"
- If (fso.FileExists(libPath & "/MSVCRT.lib") = False) Then
- WScript.Echo "Hm. I can't seem to find the default library.. Are you sure this is installed properly?"
- libPath = ""
- ElseIf (fso.FileExists(libPath & "/wsock32.lib") = False) Then
- WScript.Echo "I couldn't seem to find wsock32.lib.. We kind of need this.."
- libPath = ""
- ElseIf (fso.FileExists(libPath & "/advapi32.lib") = False) Then
- WScript.Echo "I couldn't seem to find advapi32.lib.. We kind of need this.."
- libPath = ""
- ElseIf (fso.FileExists(libPath & "/uuid.lib") = False) Then
- WScript.Echo "I couldn't seem to find uuid.lib.. We kind of need this.."
- libPath = ""
- End If
-End If
-
-If (fso.FolderExists("C:\Program Files\Microsoft Platform SDK\Lib") And LibPath = "") Then
- WScript.Echo "I found a copy of Microsoft Platform SDK.."
- libPath = "C:\Program Files\Microsoft Platform SDK\Lib"
- CompilerVer = "SDK"
- If (fso.FileExists(libPath & "/MSVCRT.lib") = False) Then
- WScript.Echo "Hm. I can't seem to find the default library.. Are you sure this is installed properly?"
- libPath = ""
- ElseIf (fso.FileExists(libPath & "/wsock32.lib") = False) Then
- WScript.Echo "I couldn't seem to find wsock32.lib.. We kind of need this.."
- libPath = ""
- ElseIf (fso.FileExists(libPath & "/advapi32.lib") = False) Then
- WScript.Echo "I couldn't seem to find advapi32.lib.. We kind of need this.."
- libPath = ""
- ElseIf (fso.FileExists(libPath & "/uuid.lib") = False) Then
- WScript.Echo "I couldn't seem to find uuid.lib.. We kind of need this.."
- libPath = ""
- End If
-End If
-
-If (fso.FileExists("C:\Program Files\Microsoft Visual Studio .NET 2003\VC7\Bin\nmake.exe") = False AND fso.FileExists("C:\Program Files\Microsoft Visual Studio\VC98\Bin\nmake.exe") = False AND fso.FileExists("C:\nmake.exe") = False AND fso.FileExists("C:\Program Files\Microsoft Platform SDK\Bin\nmake.exe") = False) Then
- WScript.Echo ""
- WScript.Echo "I couldn't seem to find a copy of nmake.exe on your system.."
- WScript.Echo ""
- WScript.Echo "I can continue without it for now, but you'll need it when you want to compile."
- WScript.Echo "I suggest downloading a copy from the URL below, and placing it in your C:\ drive."
- WScript.Echo ""
- WScript.Echo "http://download.microsoft.com/download/vc15/patch/1.52/w95/en-us/nmake15.exe"
- WScript.Echo ""
- WScript.Echo "You should place nmake.exe in c:\"
- WScript.Echo ""
-End If
-
-If (libPath = "") Then
- Dim tmpPath
- WScript.Echo "I couldn't find any of the paths I was looking for.."
- WScript.Echo "If you have installed the Visual C++ Libraries in a non-standard location, enter"
- WScript.Echo "this location below, and I will try and look there.."
- WScript.Echo "(NOTE: Do NOT enter a trailing slash)"
- WScript.Echo ""
- WScript.Echo "Path to Visual C++ Libraries: "
- tmpPath = Trim(StdIn.ReadLine)
- If (fso.FolderExists(tmpPath) AND fso.FileExists(tmpPath & "/MSVCRT.lib")) Then
- libPath = tmpPath
- If (fso.FileExists(libPath & "/wsock32.lib") = False) Then
- WScript.Echo "I couldn't seem to find wsock32.lib.. We kind of need this.."
- libPath = ""
- ElseIf (fso.FileExists(libPath & "/advapi32.lib") = False) Then
- WScript.Echo "I couldn't seem to find advapi32.lib.. We kind of need this.."
- libPath = ""
- ElseIf (fso.FileExists(libPath & "/uuid.lib") = False) Then
- WScript.Echo "I couldn't seem to find uuid.lib.. We kind of need this.."
- libPath = ""
- Else
- WScript.Echo "Okay, I found what I was looking for.."
- End If
- Else
- WScript.Echo "I couldn't find the default library in that folder."
- End If
-End If
-
-If (libPath <> "") Then
- Dim f, f2, i, verMaj, verMin, verPatch, verBuild
- Const ForReading = 1, ForWriting = 2
- WScript.Echo "Looks like you've got all the libraries I need.."
- Set f2 = fso.OpenTextFile("version.log", ForReading)
- Do While (i < 7)
- f2.SkipLine()
- i = i + 1
- Loop
- verMaj = Replace(Replace(Trim(f2.ReadLine), "VERSION_MAJOR=" & chr(34), ""), chr(34), "")
- verMin = Replace(Replace(Trim(f2.ReadLine), "VERSION_MINOR=" & chr(34), ""), chr(34), "")
- verPatch = Replace(Replace(Trim(f2.ReadLine), "VERSION_PATCH=" & chr(34), ""), chr(34), "")
- verBuild = Replace(Replace(Trim(f2.ReadLine), "VERSION_BUILD=" & chr(34), ""), chr(34), "")
- verStr = Replace(verStr, chr(34), "")
- f2.close
- Set f = fso.OpenTextFile("Makefile.inc.win32", ForWriting)
- f.WriteLine("USE_MYSQL=" & UseMySQL)
- If (UseMySQL = "1") Then
- f.WriteLine("MYSQL_LIB=" & chr(34) & "c:\\mysql\\lib\\opt" & chr(34))
- f.WriteLine("MYSQL_INC=" & chr(34) & "c:\\mysql\\include" & chr(34))
- End If
- f.WriteLine("DB_ENCRYPTION=" & UseDBEnc)
- If (CompilerVer = "VC6") Then
- f.WriteLine("VC6=/QIfist")
- End If
- if (libPath2 <> "") Then
- libPath = libPath2 & chr(34) & " /LIBPATH:" & chr(34) & libPath
- End If
- f.WriteLine("VERSION=" & verMaj & "." & verMin & "." & verPatch & "." & verBuild)
- f.WriteLine("LIBPATH=" & libPath)
- f.WriteLine("PROGRAM=anope.exe")
- f.WriteLine("DATDEST=data")
- f.WriteLine("CC=cl")
- f.WriteLine("RC=rc")
- f.WriteLine("MAKE=nmake -f Makefile.win32")
- f.WriteLine("BASE_CFLAGS=/O2 /MD")
- f.WriteLine("LIBS=wsock32.lib advapi32.lib /NODEFAULTLIB:libcmtd.lib")
- f.WriteLine("LFLAGS=/LIBPATH:" & chr(34) & "$(LIBPATH)" & chr(34))
- If (UseMySQL = "1") Then
- f.WriteLine("LIBS=$(LIBS) /LIBPATH:$(MYSQL_LIB)")
- f.WriteLine("MYSQL_LIB_PATH=/LIBPATH:$(MYSQL_LIB)")
- f.WriteLine("BASE_CFLAGS=$(BASE_CFLAGS) /I $(MYSQL_INC)")
- f.WriteLine("MYSQL_INC_PATH=/I $(MYSQL_INC)")
- f.WriteLine("RDB_C=rdb.c")
- f.WriteLine("RDB_O=rdb.obj")
- f.WriteLine("MYSQL_C=mysql.c")
- f.WriteLine("MYSQL_O=mysql.obj")
- f.WriteLine("BASE_CFLAGS=/D USE_MYSQL /D USE_RDB $(BASE_CFLAGS) /D HAVE_MYSQL_MYSQL_H")
- f.WriteLine("MYPASQL_BUILD=$(CC) /LD $(MYSQL_INC_PATH) src\mypasql.c /link $(MYSQL_LIB_PATH) $(LFLAGS) \")
- f.WriteLine("/DEF:src\mypasql.def libmysql.lib zlib.lib ws2_32.lib advapi32.lib /NODEFAULTLIB:LIBCMTD.lib")
- f.WriteLine("LIBS=$(LIBS) libmysql.lib zlib.lib")
- End If
- If (UseDBEnc = "1") Then
- f.WriteLine("BASE_CFLAGS=/D USE_ENCRYPTION /D ENCRYPT_MD5 $(BASE_CFLAGS)")
- End If
- f.WriteLine("MORE_CFLAGS = /I" & chr(34) & "../include" & chr(34))
- f.WriteLine("CFLAGS = /nologo $(VC6) $(CDEFS) $(BASE_CFLAGS) $(MORE_CFLAGS)")
- f.close()
- WScript.Echo "Configuration Complete!"
- WScript.Echo ""
- WScript.Echo "Type nmake -f Makefile.win32 to Compile Anope"
-Else
- WScript.Echo ""
- WScript.Echo "Sorry, but you didn't have all the required libraries installed."
- WScript.Echo ""
- WScript.Echo "See http://windows.anope.org for a list of downloads needed to install Anope"
- WScript.Echo ""
-End If
-
+' +' install.vbs - Windows Configuration +' +' (C) 2003-2005 Anope Team +' Contact us at info@anope.org +' +' This program is free but copyrighted software; see the file COPYING for +' details. +' +' Based on the original code of Epona by Lara. +' Based on the original code of Services by Andy Church. +' +' $Id$ +' + +' Declare global variables +Dim AnoVersion +Dim UseMySQL +Dim UseDBEnc +Dim CompilerVer +Dim fso +Dim DefaultDrive +Dim MySQLLibPath +Dim MySQLHeadPath +Dim LibPath +Dim LibPath2 +Dim IncDir +Dim IncDir2 + +' Set default values + + ' If you have installed your files onto a different drive letter + ' please specify that drive letter here. + DefaultDrive = "C" + +AnoVersion = "1.7.10" +UseMySQL = "0" +UseDBEnc = "0" +CompilerVer = "VC7" +Set fso = CreateObject("Scripting.FileSystemObject") +MySQLLibPath = DefaultDrive & ":\Program Files\mysql\MySQL Server 4.1\lib\opt" +MySQLHeadPath = DefaultDrive & ":\Program Files\mysql\MySQL Server 4.1\include" +LibPath = "" +LibPath2 = "" +IncDir = "" +IncDir2 = "" + +' Display Header +WScript.Echo "" +WScript.Echo " ___" +WScript.Echo " / _ \ http://www.anope.org" +WScript.Echo " | /_\ | _ __ _ _ _ _ ___" +WScript.Echo " | _ || '_ \/ _ \/ _ \ / _ \" +WScript.Echo " | | | || | | |_| |_| | __/" +WScript.Echo " |_| |_||_| |_\___/| _/ \___|" +WScript.Echo " | |" +WScript.Echo " |_| IRC Services" +WScript.Echo " v" & AnoVersion +WScript.Echo "" +WScript.Echo "" +WScript.Echo "This program will help you to compile your Services, and ask you" +WScript.Echo "questions regarding the compile-time settings of it during the" +WScript.Echo "process." +WScript.Echo "" +WScript.Echo "Anope is a set of Services for IRC networks that allows users to" +WScript.Echo "manage their nicks and channels in a secure and efficient way," +WScript.Echo "and administrators to manage their network with powerful tools." +WScript.Echo "" +WScript.Echo "Do not forget to read all the documents located in docs/," +WScript.Echo "especially the README and INSTALL files." +WScript.Echo "" +WScript.Echo "For all your Anope needs please visit our portal at" +WScript.Echo "http://www.anope.org/" +WScript.Echo "" +WScript.Echo "Press Enter to Continue..." +Wscript.StdIn.ReadLine + +' Enable MySQL Support? +Do While (UseMySQL <> "Y" AND UseMySQL <> "N" AND UseMySQL <> "YES" AND UseMySQL <> "NO") + WScript.Echo "Would you like to compile Anope with MySQL Support?" + WScript.Echo "(NOTE: You must have MySQL 3.23 or Later installed)" + WScript.Echo "" + WScript.Echo "Yes / No (Default)" + UseMySQL = UCase(Trim(WScript.StdIn.ReadLine)) + If (UseMySQL = "") Then + UseMySQL = "N" + End If + If (UseMySQL <> "Y" AND UseMySQL <> "N" AND UseMySQL <> "YES" AND UseMySQL <> "NO") Then + WScript.Echo "" + WScript.Echo "Invalid Selection!" + WScript.Echo "" + End If +Loop +WScript.Echo "" + +' If enabled, find the required files +If (UseMySQL = "Y" OR UseMySQL = "YES") Then + If (fso.FileExists(MySQLLibPath & "\libmysql.lib") = False) Then + Do While (fso.FileExists(MySQLLibPath & "\libmysql.lib") = False) + WScript.Echo "ERROR: Cannot find 'libmysql.lib' in " & MySQLLibPath + WScript.Echo "" + WScript.Echo "Please enter the path to 'libmysql.lib': " + WScript.Echo "(Please DO NOT include a trailing slash '\')" + MySQLLibPath = Trim(WScript.StdIn.ReadLine) + Loop + ElseIf (fso.FileExists(MySQLHeadPath & "\mysql.h") = False) Then + Do While (fso.FileExists(MySQLHeadPath & "\mysql.h") = False) + WScript.Echo "ERROR: Cannot find 'mysql.h' in " & MySQLHeadPath + WScript.Echo "" + WScript.Echo "Please enter the path to 'mysql.h': " + WScript.Echo "(Please DO NOT include a trailing slash '\')" + MySQLHeadPath = Trim(WScript.StdIn.ReadLine) + Loop + End If + WScript.Echo "All required files for MySQL Support have been located!" + WScript.Echo "MySQL Support Enabled.." + UseMySQL = "1" +Else + WScript.Echo "MySQL Support Disabled.." + UseMySQL = "0" +End If +WScript.Echo "" + +' Enable Database Encryption Support? +Do While (UseDBEnc <> "Y" AND UseDBEnc <> "N" AND UseDBEnc <> "YES" AND UseDBEnc <> "NO") + WScript.Echo "Would you like to enable Database Encryption?" + WScript.Echo "(NOTE: If you enable encryption, you will NOT be able to recover" + WScript.Echo "passwords at a later date. GETPASS and SENDPASS will also be useless)" + WScript.Echo "" + WScript.Echo "Yes / No (Default)" + UseDBEnc = UCase(Trim(WScript.StdIn.ReadLine)) + If (UseDBEnc = "") Then + UseDBEnc = "N" + End If + If (UseDBEnc <> "Y" AND UseDBEnc <> "N" AND UseDBEnc <> "YES" AND UseDBEnc <> "NO") Then + WScript.Echo "" + WScript.Echo "Invalid Selection!" + WScript.Echo "" + End If +Loop +WScript.Echo "" +If (UseDBEnc = "Y" OR UseDBEnc = "YES") Then + WScript.Echo "Database Encryption Enabled.." + UseDBEnc = "1" +Else + WScript.Echo "Database Encryption Disabled.." + UseDBEnc = "0" +End If +WScript.Echo "" + +' Check for required libraries and paths +WScript.Echo "I will now check you have all the things I need..." +WScript.Echo "" +If (fso.FolderExists(DefaultDrive & ":\Program Files\Microsoft Visual Studio .NET 2003\VC7\Lib")) Then + WScript.Echo "I found a copy of Microsoft Visual Studio .NET 2003.." + LibPath = DefaultDrive & ":\Program Files\Microsoft Visual Studio .NET 2003\VC7\Lib" + LibPath2 = DefaultDrive & ":\Program Files\Microsoft Visual Studio .NET 2003\Vc7\PlatformSDK\Lib" + If (fso.FileExists(LibPath & "/MSVCRT.lib") = False And fso.FileExists(LibPath2 & "/MSVCRT.lib") = False) Then + WScript.Echo "Hm. I can't seem to find the default library.. You probably only have the SDK installed.." + LibPath = "" + LibPath2 = "" + ElseIf (fso.FileExists(LibPath & "/wsock32.lib") = False And fso.FileExists(LibPath2 & "/wsock32.lib") = False) Then + WScript.Echo "I couldn't seem to find wsock32.lib.. You probably only have the SDK installed.." + LibPath = "" + LibPath2 = "" + ElseIf (fso.FileExists(LibPath & "/advapi32.lib") = False And fso.FileExists(LibPath2 & "/advapi32.lib") = False) Then + WScript.Echo "I couldn't seem to find advapi32.lib.. You probably only have the SDK installed.." + LibPath = "" + LibPath2 = "" + ElseIf (fso.FileExists(LibPath & "/uuid.lib") = False And fso.FileExists(LibPath2 & "/uuid.lib") = False) Then + WScript.Echo "I couldn't seem to find uuid.lib.. You probably only have the SDK installed.." + LibPath = "" + LibPath2 = "" + End If + IncDir = DefaultDrive & ":\Program Files\Microsoft Visual Studio .NET 2003\VC7\Include" + IncDir2 = DefaultDrive & ":\Program Files\Microsoft Visual Studio .NET 2003\Vc7\PlatformSDK\Include" +End If + +If (fso.FolderExists(DefaultDrive & ":\Program Files\Microsoft Visual Studio\VC98\Lib") And LibPath = "") Then + WScript.Echo "I found a copy of Microsoft Visual Studio 6.. It's old, but we can use it.." + LibPath = DefaultDrive & ":\Program Files\Microsoft Visual Studio\VC98\Lib" + CompilerVer = "VC6" + If (fso.FileExists(LibPath & "/MSVCRT.lib") = False) Then + WScript.Echo "Hm. I can't seem to find the default library.. Are you sure this is installed properly?" + LibPath = "" + ElseIf (fso.FileExists(LibPath & "/wsock32.lib") = False) Then + WScript.Echo "I couldn't seem to find wsock32.lib.. We kind of need this.." + LibPath = "" + ElseIf (fso.FileExists(LibPath & "/advapi32.lib") = False) Then + WScript.Echo "I couldn't seem to find advapi32.lib.. We kind of need this.." + LibPath = "" + ElseIf (fso.FileExists(LibPath & "/uuid.lib") = False) Then + WScript.Echo "I couldn't seem to find uuid.lib.. We kind of need this.." + LibPath = "" + End If + IncDir = DefaultDrive & ":\Program Files\Microsoft Visual Studio\VC98\Inlcude" +End If + +If (fso.FolderExists(DefaultDrive & ":\Program Files\Microsoft Platform SDK\Lib") And LibPath = "") Then + WScript.Echo "I found a copy of Microsoft Platform SDK.." + LibPath = DefaultDrive & ":\Program Files\Microsoft Platform SDK\Lib" + LibPath2 = DefaultDrive & ":\Program Files\Microsoft Visual Studio .NET 2003\VC7\Lib" + CompilerVer = "SDK" + If (fso.FileExists(LibPath & "/MSVCRT.lib") = False And fso.FileExists(LibPath2 & "/MSVCRT.lib") = False) Then + WScript.Echo "Hm. I can't seem to find the default library.. Are you sure this is installed properly?" + LibPath = "" + LibPath2 = "" + ElseIf (fso.FileExists(LibPath & "/wsock32.lib") = False And fso.FileExists(LibPath2 & "/wsock32.lib") = False) Then + WScript.Echo "I couldn't seem to find wsock32.lib.. We kind of need this.." + LibPath = "" + LibPath2 = "" + ElseIf (fso.FileExists(LibPath & "/advapi32.lib") = False And fso.FileExists(LibPath2 & "/advapi32.lib") = False) Then + WScript.Echo "I couldn't seem to find advapi32.lib.. We kind of need this.." + LibPath = "" + LibPath2 = "" + ElseIf (fso.FileExists(LibPath & "/uuid.lib") = False And fso.FileExists(LibPath2 & "/uuid.lib") = False) Then + WScript.Echo "I couldn't seem to find uuid.lib.. We kind of need this.." + LibPath = "" + LibPath2 = "" + End If + IncDir = DefaultDrive & ":\Program Files\Microsoft Visual C++ Toolkit 2003\include" + IncDir2 = "C:\Program Files\Microsoft Visual Studio .NET 2003\VC7\Include" +End If + +If (fso.FileExists(DefaultDrive & ":\Program Files\Microsoft Visual Studio .NET 2003\VC7\Bin\nmake.exe") = False AND fso.FileExists(DefaultDrive & ":\Program Files\Microsoft Visual Studio\VC98\Bin\nmake.exe") = False AND fso.FileExists(DefaultDrive & ":\nmake.exe") = False AND fso.FileExists(DefaultDrive & ":\Program Files\Microsoft Platform SDK\Bin\nmake.exe") = False) Then + WScript.Echo "" + WScript.Echo "I couldn't seem to find a copy of nmake.exe on your system.." + WScript.Echo "" + WScript.Echo "I can continue without it for now, but you'll need it when you want to compile." + WScript.Echo "I suggest downloading a copy from the URL below, and placing it in your C:\ drive." + WScript.Echo "" + WScript.Echo "http://download.microsoft.com/download/vc15/patch/1.52/w95/en-us/nmake15.exe" + WScript.Echo "" + WScript.Echo "You should place nmake.exe in " & DefaultDrive & ":\" + WScript.Echo "" +End If + +If (LibPath = "") Then + Dim tmpPath + WScript.Echo "I couldn't find any of the paths I was looking for.." + WScript.Echo "If you have installed the Visual C++ Libraries in a non-standard location, enter" + WScript.Echo "this location below, and I will try and look there.." + WScript.Echo "(NOTE: Do NOT enter a trailing slash)" + WScript.Echo "" + WScript.Echo "Path to Visual C++ Libraries: " + tmpPath = Trim(WScript.StdIn.ReadLine) + If (fso.FolderExists(tmpPath) AND fso.FileExists(tmpPath & "\MSVCRT.lib")) Then + LibPath = tmpPath + If (fso.FileExists(LibPath & "\wsock32.lib") = False) Then + WScript.Echo "I couldn't seem to find wsock32.lib.. We kind of need this.." + LibPath = "" + ElseIf (fso.FileExists(LibPath & "\advapi32.lib") = False) Then + WScript.Echo "I couldn't seem to find advapi32.lib.. We kind of need this.." + LibPath = "" + ElseIf (fso.FileExists(LibPath & "\uuid.lib") = False) Then + WScript.Echo "I couldn't seem to find uuid.lib.. We kind of need this.." + LibPath = "" + Else + WScript.Echo "Okay, I found what I was looking for.." + End If + Else + WScript.Echo "I couldn't find the default library in that folder." + End If +End If + +If (LibPath <> "") Then + Dim f, f2, i, verMaj, verMin, verPatch, verBuild + Const ForReading = 1, ForWriting = 2 + WScript.Echo "Looks like you've got all the libraries I need.." + If (fso.FileExists("version.log") = False) Then + WScript.Echo "I can't find 'version.log' in this directory." + WScript.Echo "Please run this script from a complete Anope source." + Else + Set f2 = fso.OpenTextFile("version.log", ForReading) + Do While (i < 7) + f2.SkipLine() + i = i + 1 + Loop + verMaj = Replace(Replace(Trim(f2.ReadLine), "VERSION_MAJOR=" & chr(34), ""), chr(34), "") + verMin = Replace(Replace(Trim(f2.ReadLine), "VERSION_MINOR=" & chr(34), ""), chr(34), "") + verPatch = Replace(Replace(Trim(f2.ReadLine), "VERSION_PATCH=" & chr(34), ""), chr(34), "") + verBuild = Replace(Replace(Trim(f2.ReadLine), "VERSION_BUILD=" & chr(34), ""), chr(34), "") + verStr = Replace(verStr, chr(34), "") + f2.close + Set f = fso.OpenTextFile("Makefile.inc.win32", ForWriting) + f.WriteLine("USE_MYSQL=" & UseMySQL) + If (UseMySQL = "1") Then + f.WriteLine("MYSQL_LIB=" & chr(34) & MySQLLibPath & chr(34)) + f.WriteLine("MYSQL_INC=" & chr(34) & MySQLHeadPath & chr(34)) + End If + f.WriteLine("DB_ENCRYPTION=" & UseDBEnc) + If (CompilerVer = "VC6") Then + f.WriteLine("VC6=/QIfist") + End If + if (LibPath2 <> "") Then + LibPath = LibPath2 & chr(34) & " /LIBPATH:" & chr(34) & LibPath + End If + f.WriteLine("VERSION=" & verMaj & "." & verMin & "." & verPatch & "." & verBuild) + f.WriteLine("LIBPATH=" & LibPath) + f.WriteLine("PROGRAM=anope.exe") + f.WriteLine("DATDEST=data") + f.WriteLine("CC=cl") + f.WriteLine("RC=rc") + f.WriteLine("MAKE=nmake -f Makefile.win32") + f.WriteLine("BASE_CFLAGS=/O2 /MD /I " & Chr(34) & IncDir & Chr(34)) + If IncDir2 <> "" Then + f.WriteLine("BASE_CFLAGS=$(BASE_CFLAGS) /I " & Chr(34) & IncDir2 & Chr(34)) + f.WriteLine("RC_FLAGS=/i " & Chr(34) & IncDir2 & Chr(34)) + End If + f.WriteLine("RC_FLAGS=$(RC_FLAGS) /i " & Chr(34) & IncDir & Chr(34)) + f.WriteLine("LIBS=wsock32.lib advapi32.lib /NODEFAULTLIB:libcmtd.lib") + f.WriteLine("LFLAGS=/LIBPATH:" & chr(34) & "$(LIBPATH)" & chr(34)) + If (UseMySQL = "1") Then + f.WriteLine("LIBS=$(LIBS) /LIBPATH:$(MYSQL_LIB)") + f.WriteLine("MYSQL_LIB_PATH=/LIBPATH:$(MYSQL_LIB)") + f.WriteLine("BASE_CFLAGS=$(BASE_CFLAGS) /I $(MYSQL_INC)") + f.WriteLine("MYSQL_INC_PATH=/I $(MYSQL_INC)") + f.WriteLine("RDB_C=rdb.c") + f.WriteLine("RDB_O=rdb.obj") + f.WriteLine("MYSQL_C=mysql.c") + f.WriteLine("MYSQL_O=mysql.obj") + f.WriteLine("BASE_CFLAGS=/D USE_MYSQL /D USE_RDB $(BASE_CFLAGS) /D HAVE_MYSQL_MYSQL_H") + f.WriteLine("MYPASQL_BUILD=$(CC) /LD $(MYSQL_INC_PATH) src\mypasql.c /link $(MYSQL_LIB_PATH) $(LFLAGS) \") + f.WriteLine("/DEF:src\mypasql.def libmysql.lib zlib.lib ws2_32.lib advapi32.lib /NODEFAULTLIB:LIBCMTD.lib") + f.WriteLine("LIBS=$(LIBS) libmysql.lib zlib.lib") + End If + If (UseDBEnc = "1") Then + f.WriteLine("BASE_CFLAGS=/D USE_ENCRYPTION /D ENCRYPT_MD5 $(BASE_CFLAGS)") + End If + f.WriteLine("MORE_CFLAGS = /I" & chr(34) & "../include" & chr(34)) + f.WriteLine("CFLAGS = /nologo $(VC6) $(CDEFS) $(BASE_CFLAGS) $(MORE_CFLAGS)") + f.close() + Set f = fso.CreateTextFile("make.bat") + f.WriteLine("@echo off") + Set WshShell = WScript.CreateObject("WScript.Shell") + Set WshSysEnv = WshShell.Environment("SYSTEM") + EnvLibPath = WshSysEnv("PATH") + If CompilerVer = "SDK" Then + If InStr(EnvLibPath, "C:\Program Files\Microsoft Visual C++ Toolkit 2003\bin") Then + f.WriteLine("Set PATH=C:\Program Files\Microsoft Visual C++ Toolkit 2003\bin;%PATH%") + f.WriteLine("Set INCLUDE=C:\Program Files\Microsoft Visual C++ Toolkit 2003\include;%INCLUDE%") + f.WriteLine("Set LIB=C:\Program Files\Microsoft Visual C++ Toolkit 2003\lib;%LIB%") + End If + ElseIf CompilerVer = "VC6" Then + If InStr(EnvLibPath, "C:\PROGRA~1\MICROS~3\VC98\LIB") Then + f.WriteLine("set VSCommonDir=C:\PROGRA~1\MICROS~3\Common") + f.WriteLine("set MSDevDir=C:\PROGRA~1\MICROS~3\Common\msdev98") + f.WriteLine("set MSVCDir=C:\PROGRA~1\MICROS~3\VC98") + f.WriteLine("set VcOsDir=WIN95") + f.WriteLine("if " & Chr(34) & "%OS%" & Chr(34) & " == " & Chr(34) & "Windows_NT" & Chr(34) & " set VcOsDir=WINNT") + f.WriteLine("if " & Chr(34) & "%OS%" & Chr(34) & " == " & Chr(34) & "Windows_NT" & Chr(34) & " set PATH=%MSDevDir%\BIN;%MSVCDir%\BIN;%VSCommonDir%\TOOLS\%VcOsDir%;%VSCommonDir%\TOOLS;%PATH%") + f.WriteLine("if " & Chr(34) & "%OS%" & Chr(34) & " == " & Chr(34) & "" & Chr(34) & " set PATH=" & Chr(34) & "%MSDevDir%\BIN" & Chr(34) & ";" & Chr(34) & "%MSVCDir%\BIN" & Chr(34) & ";" & Chr(34) & "%VSCommonDir%\TOOLS\%VcOsDir%" & Chr(34) & ";" & Chr(34) & "%VSCommonDir%\TOOLS" & Chr(34) & ";" & Chr(34) & "%windir%\SYSTEM" & Chr(34) & ";" & Chr(34) & "%PATH%" & Chr(34) & "") + f.WriteLine("set INCLUDE=%MSVCDir%\ATL\INCLUDE;%MSVCDir%\INCLUDE;%MSVCDir%\MFC\INCLUDE;%INCLUDE%") + f.WriteLine("set LIB=%MSVCDir%\LIB;%MSVCDir%\MFC\LIB;%LIB%") + f.WriteLine("set VcOsDir=") + f.WriteLine("set VSCommonDir=") + End If + Else + If InStr(EnvLibPath, "C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools") Then + f.WriteLine("@SET VSINSTALLDIR=C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE") + f.WriteLine("@SET VCINSTALLDIR=C:\Program Files\Microsoft Visual Studio .NET 2003") + f.WriteLine("@set VCINSTALLDIR=%VSINSTALLDIR%") + f.WriteLine("@set DevEnvDir=%VSINSTALLDIR%") + f.WriteLine("@set MSVCDir=%VCINSTALLDIR%\VC7") + f.WriteLine("@set PATH=%DevEnvDir%;%MSVCDir%\BIN;%VCINSTALLDIR%\Common7\Tools;%VCINSTALLDIR%\Common7\Tools\bin\prerelease;%VCINSTALLDIR%\Common7\Tools\bin;%FrameworkSDKDir%\bin;%FrameworkDir%\%FrameworkVersion%;%PATH%;") + f.WriteLine("@set INCLUDE=%MSVCDir%\ATLMFC\INCLUDE;%MSVCDir%\INCLUDE;%MSVCDir%\PlatformSDK\include\prerelease;%MSVCDir%\PlatformSDK\include;%FrameworkSDKDir%\include;%INCLUDE%") + f.WriteLine("@set LIB=%MSVCDir%\ATLMFC\LIB;%MSVCDir%\LIB;%MSVCDir%\PlatformSDK\lib\prerelease;%MSVCDir%\PlatformSDK\lib;%FrameworkSDKDir%\lib;%LIB%") + End If + End If + If (fso.FileExists("anope.exe")) Then + f.WriteLine("nmake -f Makefile.win32 spotless") + End If + f.WriteLine("nmake -f Makefile.win32") + f.close() + WScript.Echo "Configuration Complete!" + WScript.Echo "" + WScript.Echo "Type make to Compile Anope" + End If +Else + WScript.Echo "" + WScript.Echo "Sorry, but you didn't have all the required libraries installed." + WScript.Echo "" + WScript.Echo "See http://wiki.anope.org/Documentation:Windows for a list of downloads needed to install Anope" + WScript.Echo "" +End If + diff --git a/lang/Makefile.win32 b/lang/Makefile.win32 index 75347de0d..4791287e0 100644 --- a/lang/Makefile.win32 +++ b/lang/Makefile.win32 @@ -63,10 +63,10 @@ ru: ru.l langtool.exe langcomp.exe index langcomp $@.l langtool.exe: langtool.c - $(CC) langtool.c -o $@ + $(CC) $(CFLAGS) langtool.c -o $@ /link $(LFLAGS) langcomp.exe: langcomp.c - $(CC) langcomp.c -o $@ + $(CC) $(CFLAGS) langcomp.c -o $@ /link $(LFLAGS) language.h: langtool.exe index langtool language.h diff --git a/src/makefile.win32 b/src/makefile.win32 index 21a78661b..4ae70107e 100644 --- a/src/makefile.win32 +++ b/src/makefile.win32 @@ -49,7 +49,7 @@ install: -@copy bin\* ..\$(DATDEST)\bin win32.res: win32.rc - $(RC) /l 0x409 /fowin32.res win32.rc + $(RC) /l 0x409 $(RC_FLAGS) /fowin32.res win32.rc ########################################################################### diff --git a/version.log b/version.log index ebd385db6..70e4126dd 100644 --- a/version.log +++ b/version.log @@ -8,10 +8,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="10" -VERSION_BUILD="851" +VERSION_BUILD="852" # $Log$ # +# BUILD : 1.7.10 (852) +# BUGS : +# NOTES : Added the new windows installation files +# # BUILD : 1.7.10 (851) # BUGS : # NOTES : Fixed a few memleaks in os_info (thanks Certus) |