aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2007-02-08 18:25:45 +0000
committerUlf Lamping <ulf.lamping@web.de>2007-02-08 18:25:45 +0000
commit90a418243c2046c0785a43964de7faaab83cfd70 (patch)
treea73fc5a08efd4f825159d50058eaba0637f67b8b
parent74322911219429bc6e5a6b17a4bee2fa87e7df65 (diff)
Python V2.5 is the latest stable version. Add a comment to config.nmake (but keep the 2.4 alive for now) and update version strings in the devel guide.
If the buildbot will be updated, we could also activate the new version in config.nmake. svn path=/trunk/; revision=20750
-rw-r--r--config.nmake3
-rw-r--r--docbook/wsdg_src/WSDG_chapter_quick_setup.xml2
-rw-r--r--docbook/wsdg_src/WSDG_chapter_tools.xml6
3 files changed, 7 insertions, 4 deletions
diff --git a/config.nmake b/config.nmake
index 4cfd5c9a39..02ab669ee9 100644
--- a/config.nmake
+++ b/config.nmake
@@ -327,9 +327,12 @@ POD2MAN=$(SH) pod2man
POD2HTML=$(SH) pod2html
# command for native windows python (recommended)
+# both V2.4 and V2.5 should work
PYTHON="C:/python24/python.exe"
+#PYTHON="C:/python25/python.exe"
# add native python to the path (not needed if cygwin's python is used)
PATH=c:\python24;$(PATH)
+#PATH=c:\python25;$(PATH)
# command for python (cygwin's python package, not recommended)
#PYTHON=env python
diff --git a/docbook/wsdg_src/WSDG_chapter_quick_setup.xml b/docbook/wsdg_src/WSDG_chapter_quick_setup.xml
index 4c52908f68..3d9a11c408 100644
--- a/docbook/wsdg_src/WSDG_chapter_quick_setup.xml
+++ b/docbook/wsdg_src/WSDG_chapter_quick_setup.xml
@@ -119,7 +119,7 @@
<title>Install Python</title>
<para>Get the python installer from:
<ulink url="http://python.org/download/" />and install python
- into the default location (currently: C:/Python24).</para>
+ into the default location (currently: C:/Python25).</para>
<para>Why this is recommended: Cygwin's python package
doesn't work on some machines, so the Win32 native package is
recommended.</para>
diff --git a/docbook/wsdg_src/WSDG_chapter_tools.xml b/docbook/wsdg_src/WSDG_chapter_tools.xml
index 9fe69d54c4..432166f691 100644
--- a/docbook/wsdg_src/WSDG_chapter_tools.xml
+++ b/docbook/wsdg_src/WSDG_chapter_tools.xml
@@ -1087,17 +1087,17 @@ Copyright (C) 2005 Free Software Foundation, Inc.]]>
<ulink url="http://python.org/download/" />to download the
latest stable release. You can download a setup there, which
will install the python system typically into
- <filename>C:\Python24</filename>or similiar.</para>
+ <filename>C:\Python25</filename>or similiar.</para>
<para>After correct installation, typing inside the command
line (cmd.exe) - this must be entered in the Python
directory, the installer won't set the PATH:</para>
<para>
- <prompt>C:\Python24&gt;</prompt>
+ <prompt>C:\Python25&gt;</prompt>
<userinput>python -V</userinput>
</para>
<para>should result in something like:
<programlisting>
- <![CDATA[Python 2.4.4]]>
+ <![CDATA[Python 2.5]]>
</programlisting>However, the version string may vary.</para>
</section>
</section>