From 7e8e4bf5b95bce7f67d9af78b6b77c7485079e66 Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Wed, 10 Nov 2010 03:00:01 +0000
Subject: [PATCH] Update build instructions and build scripts for Python 2.7.

---
 docs/win32-installer-zenmap-buildguide.txt | 28 +++++++---------------
 mswin32/nsis/Nmap.nsi                      |  6 ++---
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/docs/win32-installer-zenmap-buildguide.txt b/docs/win32-installer-zenmap-buildguide.txt
index 431c7c651..0375494c6 100644
--- a/docs/win32-installer-zenmap-buildguide.txt
+++ b/docs/win32-installer-zenmap-buildguide.txt
@@ -11,36 +11,26 @@ known-good versions.
 
 GTK+ All-in-one bundle
   o http://www.gtk.org/download-windows.html
-  o Tested: gtk+=bundle_2.14.7-20090119_win32.zip
-  o Also tried the more recent gtk+-bundle_2.16.6-20091013_win32.zip,
-    but while that worked on Windows 7, I got DLL errors when I tried
-    to run Zenmap on Windows XP.  It basically failed to load:
-    Traceback (most recent call last):
-    File "zenmap", line 89, in <module>
-    File "zenmapGUI\App.pyo", line 113, in <module>
-    File "gtk\__init__.pyo", line 48, in <module>
-    File "gtk\_gtk.pyo", line 12, in <module>
-    File "gtk\_gtk.pyo", line 10, in __load
-    ImportError: DLL load failed: The specified procedure could not be found.
+  o Tested: gtk+-bundle_2.22.0-20101016_win32.zip
 Python
   o http://www.python.org/download
-  o Tested: python-2.6.4.msi
+  o Tested: python-2.7.msi
 PyGTK
   o http://ftp.gnome.org/pub/gnome/binaries/win32/pygtk
-  o Tested: pygtk-2.12.1-3.win32-py2.6.exe
+  o Tested: pygtk-2.22.0.win32-py2.7.exe
 PyCairo
   o http://ftp.gnome.org/pub/gnome/binaries/win32/pycairo
-  o Tested: pycairo-1.4.12-2.win32-py2.6.exe
+  o Tested: pycairo-1.8.10.win32-py2.7.exe
 PyGObject
   o http://ftp.gnome.org/pub/gnome/binaries/win32/pygobject
-  o pygobject-2.14.2-2.win32-py2.6.exe
-Py2exe (0.6.9) - http://www.sourceforge.net/projects/py2exe
-  o py2exe-0.6.9.win32-py2.6.exe
-Be sure to grab the PyGTK, PyCairo, etc. for Python 2.6!
+  o pygobject-2.26.0.win32-py2.7.exe
+Py2exe (0.6.9) - http://www.sourceforge.net/projects/py2exe/files/
+  o py2exe-0.6.9.win32-py2.7.exe
+Be sure to grab the PyGTK, PyCairo, etc. for Python 2.7!
 
 The GTK all-in-one bundle is a zip file.  Unzip it into the directory
 c:\GTK.  The other components have installers-using the default
-install directories is important, especially for Python (C:\Python26)
+install directories is important, especially for Python (C:\Python27)
 and GTK (C:\GTK).  See Section IV if you must change the directories.
 
 You may need to set your Windows $PATH so that it can find the GTK
diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi
index 207221aaa..e7a926084 100644
--- a/mswin32/nsis/Nmap.nsi
+++ b/mswin32/nsis/Nmap.nsi
@@ -277,7 +277,7 @@ Section "Zenmap (GUI Frontend)" SecZenmap
   File ..\nmap-${VERSION}\zenmap.exe
   File ..\nmap-${VERSION}\ZENMAP_README
   File ..\nmap-${VERSION}\COPYING_HIGWIDGETS
-  File ..\nmap-${VERSION}\python26.dll
+  File ..\nmap-${VERSION}\python27.dll
   File /r ..\nmap-${VERSION}\share
   File /r ..\nmap-${VERSION}\py2exe
   StrCpy $zenmapset "true"
@@ -295,7 +295,7 @@ Section "Ndiff (Scan comparison tool)" SecNdiff
   SetOverwrite on 
   File ..\nmap-${VERSION}\ndiff.exe
   File ..\nmap-${VERSION}\NDIFF_README
-  File ..\nmap-${VERSION}\python26.dll
+  File ..\nmap-${VERSION}\python27.dll
   File /r ..\nmap-${VERSION}\py2exe
 SectionEnd
 
@@ -415,7 +415,7 @@ Section "Uninstall"
   Delete "$INSTDIR\winpcap-nmap*.exe"
   Delete "$INSTDIR\zenmap.exe"
   Delete "$INSTDIR\ndiff.exe"
-  Delete "$INSTDIR\python26.dll"
+  Delete "$INSTDIR\python27.dll"
   Delete "$INSTDIR\NDIFF_README"
   Delete "$INSTDIR\ZENMAP_README"
   Delete "$INSTDIR\COPYING_HIGWIDGETS"