BUILD : 1.7.14 (1063) BUGS : 526 NOTES : Applied win32-maintenance patch by heinz

git-svn-id: svn://svn.anope.org/anope/trunk@1063 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@787 5417fbe8-f217-4b02-8779-1006273d7864

8 files changed, 335 insertions, 151 deletions

diff --git a/Changes b/Changes
index 161db3357..3f6da537e 100644
--- a/Changes
+++ b/Changes
@@ -33,6 +33,7 @@ Provided by Anope Dev. <dev@anope.org> - 2006
 06/18 F HOP cannot remove VOPs anymore to be consitent with adding.       [#525]
 06/18 F Moduledata was cleared before calling AnopeFini.                  [#523]
 06/20 F Make does not recompile everything even on no change anymore.     [ #00]
+06/20 F Versions in win32.rc are now updated correctly.                   [#526]
 
 Provided by ThaPrince <jon@vile.com> - 2006
 05/19 A Plexus 3 support.                                                 [ #00]
diff --git a/Makefile.win32 b/Makefile.win32
index fcfa08f9a..21e687ef7 100644
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -50,7 +50,11 @@ spotless:
         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
+        -@erase include\language.h include\version.h *.manifest *~ anope.exe version.sh.exe *.obj anopesmtp.exe
+	-@echo --
+	-@echo NOTICE:
+	-@echo   You will need to run cscript /nologo install.js again
+	-@echo --
 
 mypasql: 
         $(MYPASQL_BUILD)
@@ -91,7 +95,7 @@ include\language.h: lang\language.h
         
 include\version.h: version.sh.exe version.log include\services.h include\pseudo.h include\messages.h
         version.sh.exe
-                copy version.h include\version.h
+        move version.h include\version.h
 
 version.sh.exe:
         $(CC) $(BASE_CFLAGS) include\version.sh.c /link $(LFLAGS)
diff --git a/include/version.sh b/include/version.sh
index ce8e089fd..b83c58af9 100644
--- a/include/version.sh
+++ b/include/version.sh
@@ -69,7 +69,11 @@ cat >version.h <<EOF
 #endif
 
 #if defined(_WIN32)
-# define VER_OS "W"
+# if _MSC_VER >= 1400
+#  define VER_OS "W"
+# else
+#  define VER_OS "w"
+# endif
 #else
 # define VER_OS
 #endif
diff --git a/install.js b/install.js
index 7cb95980f..35d9c6d5b 100644
--- a/install.js
+++ b/install.js
@@ -14,6 +14,7 @@
 //
 
 var anopeVersion = "Unknown";
+var vMaj, vMin, vPat, vBuild, vExtra;
 var defaultDrive = "C";
 
 var installerResponses = new Array();
@@ -40,10 +41,36 @@ var installerQuestions = [
                                                                                                         WScript.Echo("\nERROR: Cannot find MySQL - See error messages above for details.\n");
                                                                                                         return false;
                                                                                                 }
+                                                                                                if (!moveMySQLDll()) {
+                                                                                                        WScript.Echo("\nNOTICE: The libmysql.dll file could not be moved into the current directory.");
+                                                                                                        WScript.Echo("You may receive errors about this file not being found when run.");
+                                                                                                        WScript.Echo("Just manually find this file and place it in this folder.\n");        
+                                                                                                }
                                                                                         }
                                                                                         installerResponses['MySQL DB Support'] = answer;
                                                                                         return true;
-                                                                                   }                                                                                        
+                                                                                   },
+                                                        'commit_config' : function() {
+                                                                                        if (installerResponses['MySQL DB Support'] == 'yes') {
+                                                                                                f.WriteLine("USE_MYSQL=1");
+                                                                                                f.WriteLine("MYSQL_LIB=\""+defaultDrive+":\\"+softwareVersions['MySQLDB'].libpaths[0]+"\"");
+                                                                                                f.WriteLine("MYSQL_INC=\""+defaultDrive+":\\"+softwareVersions['MySQLDB'].incpaths[0]+"\"");
+                                                                                                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) /DEF:src\mypasql.def libmysql.lib zlib.lib ws2_32.lib advapi32.lib /NODEFAULTLIB:LIBCMTD.lib");
+                                                                                                f.WriteLine("LIBS=$(LIBS) libmysql.lib zlib.lib");                                                                             
+                                                                                        }
+                                                                                        else {
+                                                                                                f.WriteLine("USE_MYSQL=0");
+                                                                                        }
+                                                        }                                                                                                                                        
                                                 },
                                                 
                                                 {
@@ -61,26 +88,38 @@ var installerQuestions = [
                                                         'store_answer' : function (answer) {
                                                                                         installerResponses['Encrypted Passwords'] = answer;
                                                                                         return true;
-                                                                                  }
+                                                                                  },
+                                                        'commit_config' : function() {
+                                                                                        if (installerResponses['Encrypted Passwords'] == 'yes') {
+                                                                                                f.WriteLine("DB_ENCRYPTION=1");
+                                                                                                f.WriteLine("BASE_CFLAGS=/D USE_ENCRYPTION /D ENCRYPT_MD5 $(BASE_CFLAGS)");
+                                                                                        }
+                                                                                        else {
+                                                                                                f.WriteLine("DB_ENCRYPTION=0");
+                                                                                        }    
+                                                        }
                                                 }                                           
                                                 
                                        ];
 
 var buildPackages = [
+
                                         {
-                                                        'name' : 'Microsoft Visual Studio 98',
+                                                        'name' : 'Microsoft Visual Studio 2005',
                                                         'libpaths' : [
-                                                                                'Program Files\\Microsoft Visual Studio\\VC98\\Lib'
+                                                                                'Program Files\\Microsoft Visual Studio 8\\VC\\Lib',
+                                                                                'Program Files\\Microsoft Platform SDK\\Lib'
                                                                          ],
                                                         'incpaths' : [
-                                                                                'Program Files\\Microsoft Visual Studio\\VC98\\Include'
+                                                                                'Program Files\\Microsoft Visual Studio 8\\VC\\Include',
+                                                                                'Program Files\\Microsoft Platform SDK\\Include'
                                                                          ],
                                                         'nmake' : [
-                                                                                'Program Files\\Microsoft Visual Studio\\VC98\\Bin',
+                                                                                'Program Files\\Microsoft Platform SDK\\Bin',
                                                                                 ''
                                                                         ],
                                                         'additional_switches' : [
-                                                                                                 '/QIfist'
+                                                                                                '/w'
                                                                                            ]
                                         },
                                         
@@ -100,29 +139,39 @@ var buildPackages = [
                                                                         ],                                                                    
                                                         'additional_switches' : false
                                         },
-                                        
+
                                         {
-                                                        'name' : 'Microsoft Visual Studio 2005',
+                                                        'name' : 'Microsoft Visual Studio 98',
                                                         'libpaths' : [
-                                                                                'Program Files\\Microsoft Visual Studio 8\\VC\\Lib',
-                                                                                'Program Files\\Microsoft Platform SDK\\Lib'
+                                                                                'Program Files\\Microsoft Visual Studio\\VC98\\Lib'
                                                                          ],
                                                         'incpaths' : [
-                                                                                'Program Files\\Microsoft Visual Studio 8\\VC\\Include',
-                                                                                'Program Files\\Microsoft Platform SDK\\Include'
+                                                                                'Program Files\\Microsoft Visual Studio\\VC98\\Include'
                                                                          ],
                                                         'nmake' : [
-                                                                                'Program Files\\Microsoft Platform SDK\\Bin',
+                                                                                'Program Files\\Microsoft Visual Studio\\VC98\\Bin',
                                                                                 ''
                                                                         ],
                                                         'additional_switches' : [
-                                                                                                '/w'
+                                                                                                 '/QIfist'
                                                                                            ]
                                         }
+                                        
                                 ];                  
                                                               
                                 
         var mysqlVersions = [
+								{
+									  'name' : 'MySQL 5.1',
+									  'libpaths' : [
+													  'Program Files\\MySQL\\MySQL Server 5.1\\Lib\\opt'
+											],
+									  'incpaths' : [
+													  'Program Files\\MySQL\\MySQL Server 5.1\\Include'
+											],
+									  'dllfile' : 'Program Files\\MySQL\\MySQL Server 5.1\\bin\\libmyql.dll'
+								},
+
                                                 {
                                                         'name' : 'MySQL 5.0',
                                                         'libpaths' : [
@@ -131,7 +180,7 @@ var buildPackages = [
                                                         'incpaths' : [
                                                                                 'Program Files\\MySQL\\MySQL Server 5.0\\Include'
                                                                         ],
-                                                        'additional_switches' : false
+                                                        'dllfile' : 'Program Files\\MySQL\\MySQL Server 5.0\\Bin\\libmysql.dll'                                                                        
                                                 },
                                                 
                                                 {
@@ -142,7 +191,7 @@ var buildPackages = [
                                                         'incpaths' : [
                                                                                 'Program Files\\MySQL\\MySQL Server 4.1\\Include'
                                                                         ],
-                                                        'additional_switches' : false
+                                                        'dllfile' : 'Program Files\\MySQL\\MySQL Server 4.1\\Bin\\libmysql.dll'                                                                        
                                                 },        
                                                 
                                                 {
@@ -153,7 +202,7 @@ var buildPackages = [
                                                         'incpaths' : [
                                                                                 'Program Files\\MySQL\\MySQL Server 4.0\\Include'
                                                                         ],
-                                                        'additional_switches' : false
+                                                        'dllfile' : 'Program Files\\MySQL\\MySQL Server 4.0\\Bin\\libmysql.dll'                                                                        
                                                 },                                                                                                                                                                           
                                                         
                                                 {
@@ -164,7 +213,7 @@ var buildPackages = [
                                                         'incpaths' : [
                                                                                 'mysql\\include'
                                                                         ],
-                                                        'additional_switches' : false
+                                                        'dllfile' : 'mysql\\Bin\\libmysql.dll'                                                                        
                                                 }
 
                                 ];                  
@@ -258,6 +307,7 @@ var buildPackages = [
                                 WScript.Echo("\t"+x+" Version:\t\t"+thisVer.name);
                         }        
                 }
+		    WScript.Echo("\tAnope Version:\t\t\t"+anopeVersion);
                 WScript.Echo("\nTo continue, please press Enter...");
                 InstallerInput();    
        
@@ -294,44 +344,24 @@ var buildPackages = [
                 f.WriteLine("BASE_CFLAGS=$(VC6) /O2 /MD $(INCFLAGS)");
                 f.WriteLine("RC_FLAGS="+path_line_rc);
                 f.WriteLine("LIBS=wsock32.lib advapi32.lib /NODEFAULTLIB:libcmtd.lib");
-                f.WriteLine("LFLAGS=$(LIBPATH)");
-                
-                if (installerResponses['MySQL DB Support'] == 'yes') {
-                        f.WriteLine("USE_MYSQL=1");
-                        f.WriteLine("MYSQL_LIB=\""+defaultDrive+":\\"+softwareVersions['MySQLDB'].libpaths[0]+"\"");
-                        f.WriteLine("MYSQL_INC=\""+defaultDrive+":\\"+softwareVersions['MySQLDB'].incpaths[0]+"\"");
-                        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) /DEF:src\mypasql.def libmysql.lib zlib.lib ws2_32.lib advapi32.lib /NODEFAULTLIB:LIBCMTD.lib");
-                        f.WriteLine("LIBS=$(LIBS) libmysql.lib zlib.lib");                
-                }
-                else {
-                        f.WriteLine("USE_MYSQL=0");
-                }        
-                
-                if (installerResponses['Encrypted Passwords'] == 'yes') {
-                        f.WriteLine("DB_ENCRYPTION=1");
-                        f.WriteLine("BASE_CFLAGS=/D USE_ENCRYPTION /D ENCRYPT_MD5 $(BASE_CFLAGS)");
-                }
-                else {
-                        f.WriteLine("DB_ENCRYPTION=0");
-                }        
+                f.WriteLine("LFLAGS=$(LIBPATH)");               
+                   
+                for (x in installerQuestions) {
+                        var thisQuestion = installerQuestions[x];
+                        thisQuestion.commit_config();
+                } 
                         
                 f.WriteLine("MORE_CFLAGS = /I\"../include\"");
                 f.WriteLine("CFLAGS = /nologo $(CDEFS) $(BASE_CFLAGS) $(MORE_CFLAGS)");
                 f.close();
                 
-                WScript.Echo("Configuration Complete!");
-                WScript.Echo("-------------------------------\n");
+                generateRC();
+                
+                WScript.Echo("\nConfiguration Complete!");
+                WScript.Echo("-----------------------\n");
                 WScript.Echo("Anope has been configured to your system. To compile, simply type:");
                 WScript.Echo("nmake -f Makefile.win32\n");
+		    WScript.Echo("If you update Anope, you should run this script again to ensure\nall available options are set.\n");
           
         }                        
         // Fin.
@@ -344,9 +374,7 @@ var buildPackages = [
                 if (!fso.FileExists('version.log')) {
                         anopeVersion = 'Unknown';
                         return;
-                }
-                
-                var vMaj, vMin, vPat, vBuild, vExtra;
+                }                               
                 
                 var versionLog = fso.OpenTextFile("version.log");
                 while (!versionLog.atEndOfStream) {
@@ -407,6 +435,19 @@ var buildPackages = [
                 return false;
         }
         
+        function moveMySQLDll() {
+                if (!fso.FileExists(defaultDrive + ":\\" + softwareVersions['MySQLDB'].dllfile)) {
+                        WScript.Echo("DEBUG: The libmysql.dll could not be found at '"+defaultDrive+":\\"+softwareVersions['MySQLDB'].dllfile);
+                        return false;
+                }
+                fso.CopyFile(defaultDrive+":\\"+softwareVersions['MySQLDB'].dllfile, "libmysql.dll");
+                if (!fso.FileExists("libmysql.dll")) {
+                        WScript.Echo("DEBUG: The libmyql.dll file could not be copied to the working directory");
+                        return false;
+                }
+                return true;
+        }
+        
         function findCompiler() {
                 WScript.Echo("\nLooking for a suitable compiler...\n");
                 var noPSDK = false;                
@@ -466,5 +507,44 @@ var buildPackages = [
                 }
                 return false;                                
         }
-                                                                                                                         
-                                        
+        
+        function generateRC() {
+                var version_matches = [
+                                                                {
+                                                                        'find' : /VERSION_COMMA/g,
+                                                                        'replacement' : vMaj+","+vMin+","+vPat+","+vBuild
+                                                                },
+                                                                
+                                                                {
+                                                                        'find' : /VERSION_FULL/g,
+                                                                        'replacement' : anopeVersion
+                                                                },
+                                                                
+                                                                {
+                                                                        'find' : /VERSION_DOTTED/g,
+                                                                        'replacement' : vMaj+"."+vMin+"."+vPat+"."+vBuild
+                                                                }
+                                                        ];
+                                                        
+                var template = fso.OpenTextFile("src/win32.rc.template", 1);
+                var output = fso.OpenTextFile("src/win32.rc", 2, true);
+                if (!template) {
+                        WScript.Echo("ERROR: Unable to generate win32.rc file - Couldn't open source file..");
+                }
+                if (!output) {
+                        WScript.Echo("ERROR: Unable to generate win32.rc file - Couldn't open output file..");
+                }
+                var templateText = template.ReadAll();
+                template.close();
+                
+                for (x in version_matches) {
+                        var thisVerStr = version_matches[x];
+                        while (templateText.match(thisVerStr.find)) {
+                                templateText = templateText.replace(thisVerStr.find, thisVerStr.replacement);
+                        }
+                }
+                
+                output.WriteLine(templateText);
+                output.close();
+        }
+                                                                                                                                                                
diff --git a/src/makefile.win32 b/src/makefile.win32
index 31c90346f..45aefa1a8 100644
--- a/src/makefile.win32
+++ b/src/makefile.win32
@@ -41,7 +41,7 @@ $(PROGRAM): $(OBJS) win32.res
         $(CC) $(OBJS) win32.res /link /out:$(PROGRAM) /implib:anope.lib $(LIBS) $(LFLAGS) $(MLIBS) $(ELIBS)
 
 spotless:
-        -@erase *.obj *.exe *.exp *.lib tools\*.exe *.res
+        -@erase *.obj *.exe *.exp *.lib tools\*.exe *.res win32.rc *.manifest
         
 install:
         -@copy anope.exe ..\anope.exe        
diff --git a/src/win32.rc b/src/win32.rc
deleted file mode 100644
index cb6c249ef..000000000
--- a/src/win32.rc
+++ /dev/null
@@ -1,91 +0,0 @@
-///Microsoft Developer Studio generated resource script.

-//

-#include "../include/resource.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#define APSTUDIO_HIDDEN_SYMBOLS

-#include "windows.h"

-#undef APSTUDIO_HIDDEN_SYMBOLS

-#include "../include/resource.h"

-

-/////////////////////////////////////////////////////////////////////////////

-#undef APSTUDIO_READONLY_SYMBOLS

-

-/////////////////////////////////////////////////////////////////////////////

-// English (U.S.) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-#endif //_WIN32

-

-#ifndef _MAC

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Version

-//

-

-VER_ANOPE VERSIONINFO

- FILEVERSION 1,7,10,829

- PRODUCTVERSION 1,7,10,829

- FILEFLAGSMASK 0x17L10

-#ifdef _DEBUG

- FILEFLAGS 0x1L

-#else

- FILEFLAGS 0x0L

-#endif

- FILEOS 0x4L

- FILETYPE 0x1L

- FILESUBTYPE 0x0L

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "040904b0"

-        BEGIN

-            VALUE "CompanyName", "Anope Team"

-            VALUE "FileDescription", "Anope IRC Services"

-            VALUE "FileVersion", "1.7.10-dev"

-            VALUE "InternalName", "Anope"

-            VALUE "LegalCopyright", "Copyright (C) 2005 Anope Team"

-            VALUE "OriginalFilename", "anope.exe"

-            VALUE "ProductName", "Anope"

-            VALUE "ProductVersion", "1.7.10.829"

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x409, 1200

-    END

-END

-

-#endif    // !_MAC

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Icon

-//

-

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

-ICON_APP                ICON                    "anope-icon.ico"

-#endif    // English (U.S.) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-

-#ifndef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-

-

-/////////////////////////////////////////////////////////////////////////////

-#endif    // not APSTUDIO_INVOKED

-

diff --git a/src/win32.rc.template b/src/win32.rc.template
new file mode 100644
index 000000000..b8f88969f
--- /dev/null
+++ b/src/win32.rc.template
@@ -0,0 +1,182 @@
+///Microsoft Developer Studio generated resource script.
+//
+#include "../include/resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+#include "../include/resource.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifndef _MAC
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VER_ANOPE VERSIONINFO
+ FILEVERSION VERSION_COMMA
+ PRODUCTVERSION VERSION_COMMA
+ FILEFLAGSMASK 0x17L10
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "Anope Team"
+            VALUE "FileDescription", "Anope IRC Services"
+            VALUE "FileVersion", "VERSION_FULL"
+            VALUE "InternalName", "Anope"
+            VALUE "LegalCopyright", "Copyright (C) 2005 Anope Team"
+            VALUE "OriginalFilename", "anope.exe"
+            VALUE "ProductName", "Anope"
+            VALUE "ProductVersion", "VERSION_DOTTED"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // !_MAC
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+ICON_APP                ICON                    "anope-icon.ico"
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
+///Microsoft Developer Studio generated resource script.
+//
+#include "../include/resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+#include "../include/resource.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifndef _MAC
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VER_ANOPE VERSIONINFO
+ FILEVERSION VERSION_COMMA
+ PRODUCTVERSION VERSION_COMMA
+ FILEFLAGSMASK 0x17L10
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "Anope Team"
+            VALUE "FileDescription", "Anope IRC Services"
+            VALUE "FileVersion", "VERSION_FULL"
+            VALUE "InternalName", "Anope"
+            VALUE "LegalCopyright", "Copyright (C) 2005 Anope Team"
+            VALUE "OriginalFilename", "anope.exe"
+            VALUE "ProductName", "Anope"
+            VALUE "ProductVersion", "VERSION_DOTTED"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // !_MAC
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+ICON_APP                ICON                    "anope-icon.ico"
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/version.log b/version.log
index 0bcc5b9e0..e43774704 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="14"
 VERSION_EXTRA=""
-VERSION_BUILD="1062"
+VERSION_BUILD="1063"
 
 # $Log$
 #
+# BUILD : 1.7.14 (1063)
+# BUGS  : 526
+# NOTES : Applied win32-maintenance patch by heinz
+#
 # BUILD : 1.7.14 (1062)
 # BUGS  : 
 # NOTES : Fixed the makefiles to not recompile the core if nothing changed, and to not always re-link all modules if not needed