Bug #1269 - Fixed install.js for Windows 7 builds.

3 files changed, 41 insertions, 26 deletions

diff --git a/docs/WIN32.txt b/docs/WIN32.txt
index a81f1ab95..22f4a562d 100644
--- a/docs/WIN32.txt
+++ b/docs/WIN32.txt
@@ -20,35 +20,41 @@ Anope for Windows
         * Current Anope source:
             http://sourceforge.net/project/showfiles.php?group_id=94081
 
-        If you have Visual C++ 6, 7 (.NET 2002/2003) or 8 (2005) skip ahead to step 2, else you
+        If you have Visual C++ 6, 7 (.NET 2002/2003), 8 (2005) or 10 (2010) skip ahead to step 2, else you
         need to download the following free components from Microsoft. Once
-        downloaded, install these packages.
+        downloaded, install one of the following, for best results use MS VC 2010.
 
-		* Microsoft Visual C++ 2008 Express Edition:
+		* Microsoft Visual C++ 2010 Express
 			http://www.microsoft.com/express/vc/
 
 		or
 
-        * Microsoft Visual C++ 2005 Express Edition:
-            http://msdn.microsoft.com/vstudio/express/visualc/download/
+		* Microsoft Visual C++ 2008 Express Edition:
+			http://www.microsoft.com/visualstudio/en-us/products/2008-editions/express
+
+		or
+
+		* Microsoft Visual C++ 2005 Express Edition:
+			http://msdn.microsoft.com/vstudio/express/visualc/download/
             
-		then download and install:
+	if you installed Visual C++ 2010, it comes included with an SDK, so skip ahead to step 2, otherwise
+	install the following PlatformSDK:
 
-        * Microsoft Windows PlatformSDK: (Requires WGA validation)
-	    http://www.microsoft.com/downloads/details.aspx?FamilyId=0BAF2B35-C656-4969-ACE8-E4C0C0716ADB&displaylang=en
+		* Microsoft Windows PlatformSDK: (Requires WGA validation)
+			http://www.microsoft.com/downloads/details.aspx?FamilyId=0BAF2B35-C656-4969-ACE8-E4C0C0716ADB&displaylang=en
 
-	    (NOTE: Although this says for Windows Server 2003, it does infact work on all supported
-	    versions of Windows.)
+			(NOTE: Although this says for Windows Server 2003, it does infact work on all supported
+			versions of Windows.)
 	    
-	    When installing, you should select the Custom option, and ensure that the top option relating to 
-	    the registering of environment varibales, is enabled in addition to the default selections.
+			When installing, you should select the Custom option, and ensure that the top option relating to
+			the registering of environment variables, is enabled in addition to the default selections.
 
-	    If you do not do this, you may run into problems with the PSDK not being found properly during install.
+			If you do not do this, you may run into problems with the PSDK not being found properly during install.
 
-        * MySQL for Windows (only needed if building with MySQL enabled):
-            http://dev.mysql.com/
+		* MySQL for Windows (only needed if building with MySQL enabled):
+			http://dev.mysql.com/
 
-	    (NOTE: Anope can be compiled against MySQL Version 3.23 and above)
+			(NOTE: Anope can be compiled against MySQL Version 3.23 and above)
 
 
     2) Unpack the Anope tarball with your favorite uncompression program
diff --git a/install.js b/install.js
index 93e586ccb..bd02fc011 100644
--- a/install.js
+++ b/install.js
@@ -74,15 +74,19 @@ var buildPackages = [
                                                         'name' : 'Microsoft Visual Studio 2010 (64bit)',
                                                         'libpaths' : [
                                                                      'Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\lib',
-                                                                     'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Lib'
+                                                                     'Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib',
+                                                                     'Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib',
+                                                                     'Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0A\\Lib'
 								     ],
                                                         'incpaths': [
                                                                      'Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\include',
-                                                                     'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\include'
-                                                         ],
+                                                                     'Program Files\\Microsoft SDKs\\Windows\\v7.1\\Include',
+                                                                     'Program Files\\Microsoft SDKs\\Windows\\v7.0\\Include',
+                                                                     'Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0A\\Include'
+                                                                    ],
                                                          'nmake' : [
-                                                                     'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Bin',
-                                                         ],
+                                                                   'Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\bin',
+                                                                   ],
 							 'additional_switches' : [ '/w' ],
 							 'installedDrive' : 'C'
                                         },
@@ -90,14 +94,18 @@ var buildPackages = [
                                                         'name' : 'Microsoft Visual Studio 2010',
                                                         'libpaths' : [
                                                                      'Program Files\\Microsoft Visual Studio 10.0\\VC\\lib',
-                                                                     'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Lib'
+                                                                     'Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib',
+                                                                     'Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib',
+                                                                     'Program Files\\Microsoft SDKs\\Windows\\v7.0A\\Lib'
                                                                      ],
                                                         'incpaths' : [
                                                                      'Program Files\\Microsoft Visual Studio 10.0\\VC\\include',
-                                                                     'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Include'
+                                                                     'Program Files\\Microsoft SDKs\\Windows\\v7.1\\Include',
+                                                                     'Program Files\\Microsoft SDKs\\Windows\\v7.0\\Include',
+                                                                     'Program Files\\Microsoft SDKs\\Windows\\v7.0A\\Include'
                                                                      ],
                                                         'nmake' : [
-                                                                     'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Bin',
+                                                                  'Program Files\\Microsoft Visual Studio 10.0\\VC\\bin',
                                                                   ],
                                                         'additional_switches' : [ '/w' ],
                                                         'installedDrive' : 'C'
@@ -113,7 +121,7 @@ var buildPackages = [
                                                                      'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Include'
                                                                      ],
                                                         'nmake' : [
-														             'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Bin',
+                                                                  'Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Bin',
                                                                   ],
                                                         'additional_switches' : [ '/w' ],
                                                         'installedDrive' : 'C'
diff --git a/version.log b/version.log
index e80aaa2b3..dda1da865 100644
--- a/version.log
+++ b/version.log
@@ -8,9 +8,10 @@ VERSION_MAJOR="1"
 VERSION_MINOR="8"
 VERSION_PATCH="7"
 VERSION_EXTRA="-git"
-VERSION_BUILD="3075"
+VERSION_BUILD="3076"
 
 # $Log$ # Changes since 1.8.6 Release
+#Revision 3076 - Bug #1269 - Fixed install.js for Windows 7 builds.
 #Revision 3075 - Fixed a potential crash in the badwords kicker, and fixed matching BW_SINGLE with BSCaseSensitive enabled
 #Revision 3074 - Bug #1273 - Fixed removing vhosts on InspIRCd when m_cloaking is unloaded