Updated patch attached (fixes one incorrect section reference compared
to the previous patch.
Hi,
in contrast to the 1.9/1.10 INSTALL patches this one I corrected
existing mistakes/outdates and added a few missing parts.
Intentionally didn't change anything related to supported VS versions
or other things which might be considered inappropriate for 1.8.
[[[
Several small updates/corrections to the INSTALL file:
- case-correction for February
- replaced dead-link to Platform SDK for VC6 with link to still
available instructions
- replaced redirection URL zlib.org with direct URL zlib.net
- libmagic marked as optional dependency
- made URLs consistently use a trailing /
- corrected section numbering and referencing in several cases
- clarify that Python is required for Windows as well
- dropping explicit mentioning of Subversion version 1.8 (since the
documentation always applies to the current version)
- added missing prerequisite an install step instruction for SQLite
3.7.12
- added optional-markers to steps which are not required in all cases
- added missing required quotes around SDK-paths which contain spaces
* INSTALL
documentation updated
]]]
Regards,
Stefan
Index: INSTALL
===================================================================
--- INSTALL (revision 1691631)
+++ INSTALL (working copy)
@@ -145,7 +145,7 @@
Subversion contains optional support for storing passwords in
KWallet (KDE 4) or GNOME Keyring.
- * libmagic
+ * libmagic (OPTIONAL)
If the libmagic library is detected at compile time,
it will be used to determine mime-types of binary files
@@ -288,7 +288,7 @@
compression. Most Unix systems have libz pre-installed, but
if you need it, you can get it from
- http://www.zlib.net
+ http://www.zlib.net/
3. autoconf 2.59 or newer (Unix only)
@@ -353,7 +353,7 @@
This may now apply to Serf, or else gen-make.py should be
updated to remove such options.
- c. Using OpenSSL on the Apache server
+ b. Using OpenSSL on the Apache server
You can also add support for these features to an Apache httpd
server to be used for Subversion using the same support libraries.
@@ -446,9 +446,9 @@
10. Python 2.5 or newer (http://www.python.org/) (OPTIONAL)
If you want to run "make check" or build from the latest source
- under Unix as described in section II.B and III.D, install
- Python 2.5 or higher on your system. The majority of the test
- suite is written in Python, as is part of Subversion's build
+ under Unix/Windows as described in section II.B, II.E and III.D,
+ install Python 2.5 or higher on your system. The majority of the
+ test suite is written in Python, as is part of Subversion's build
system.
@@ -477,8 +477,8 @@
13. SQLite (REQUIRED)
- Subversion 1.8 requires SQLite version 3.7.12 or above. You can meet
- this dependency several ways:
+ Subversion requires SQLite version 3.7.12 or above. You can meet this
+ dependency several ways:
* Use an SQLite amalgamation file.
* Specify an SQLite installation to use.
* Let Subversion find an installed SQLite.
@@ -790,9 +790,9 @@
C++ Express 2005, 2008) but these instructions assume VS6.
* A recent Windows SDK. (Not needed with Visual Studio 2005 and later)
If you are using Visual Studio 6, you need the latest SDK which
- is compatible with VC6, which is the one from february 2003.
+ is compatible with VC6, which is the one from February 2003.
You can get it from MSDN:
- http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdk-full.htm
+
https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/e1147034-9b0b-4494-a5bc-6dfebb6b7eb1/download-and-install-microsoft-platform-sdk-febuary-2003-last-version-with-vc6-support?forum=windowssdk
* Python 2.5 or higher, downloaded from http://www.python.org/ which is
used to generate the project files.
* Perl 5.8 or higher from http://www.activestate.com/
@@ -805,8 +805,9 @@
and the Apache 2 source zip. If you are building from a Subversion
checkout and have not downloaded Apache 2, then get these 3 libraries
from http://www.apache.org/dist/apr/.
+ * SQLite 3.7.12 or higher from http://www.sqlite.org/download.html
* ZLib 1.2 or higher is required and is included in the Subversion
- dependencies zip file or can be obtained from http://www.zlib.org
+ dependencies zip file or can be obtained from http://www.zlib.net/
* Either a Subversion client binary from http://subversion.apache.org/ to
do the initial checkout of the Subversion source or the zip file
source distribution. See the section "Bootstrapping from a Zip or
@@ -835,7 +836,7 @@
components -- versions 4.3.27 and 4.4.20 are available from
http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=688
as db-4.3.27-win32.zip and db-4.4.20-win32.zip.
- For more information see Section I.5.
+ For more information see Section I.C.7.
* [Optional] Openssl 0.9.7f or higher can be obtained from
http://www.openssl.org/source/openssl-0.9.7f.tar.gz
* [Optional] A modified version of GNU libintl, called
@@ -856,7 +857,7 @@
The Serf library supports secure connections with OpenSSL and
on-the-wire compression with zlib. If you want to use the
secure connections feature, you should pass the option
- "--with-openssl" to the gen-make.py script. See Section I.11 for
+ "--with-openssl" to the gen-make.py script. See Section I.C.6 for
more details.
E.3 Preparation
@@ -897,14 +898,14 @@
* Install Perl (it should add itself to the path)
* Copy AWK (awk95.exe) to awk.exe (e.g. SVN\awk\awk.exe) and add
the directory containing it (e.g. SVN\awk) to the path.
- * Install Apache 2 using the msi file if you are going to test the
- server dso modules and are using Visual Studio 6. You must build
+ * [Optional] Install Apache 2 using the msi file if you are going to test
+ the server dso modules and are using Visual Studio 6. You must build
and install it from source if you are not using Visual Studio 6 and
want to build and/or test the server modules.
- * If you checked out Subversion from the repository then install the serf
- sources into SVN\src-trunk\serf.
- * If you want BDB backend support, extract the Berkeley DB files
- into SVN\src-trunk\db4-win32. It's a good idea to add
+ * [Optional] If you checked out Subversion from the repository then
+ install the serf sources into SVN\src-trunk\serf.
+ * [Optional] If you want BDB backend support, extract the Berkeley DB
+ files into SVN\src-trunk\db4-win32. It's a good idea to add
SVN\src-trunk\db4-win32\bin to your PATH, so that Subversion can find
the Berkeley DB DLLs.
@@ -919,8 +920,8 @@
SVN\src-trunk\db4-win32\lib. Again, the DLLs should be somewhere in
your path.
- * If you want to build the server modules, extract Apache source into
- SVN\httpd-2.x.x.
+ * [Optional] If you want to build the server modules, extract Apache
+ source into SVN\httpd-2.x.x.
* If you are building from a checkout of Subversion, and you are NOT
building Apache, then you will need the APR libraries. Depending
on how you got your version of APR, either:
@@ -932,14 +933,19 @@
SVN\apr-util, and SVN\apr-iconv respectively.
* Extract the ZLib sources into SVN\zlib if you are not using the zlib
included in the dependencies zip file.
- * If you want secure connection (https) client support, extract openssl
- into SVN\openssl-x.x.x
- * If you want localized message support, extract svn-win32-libintl.zip
- into SVN\svn-win32-libintl and extract gettext-x.x.x-bin.zip and
- gettext-x.x.x-dep.zip into SVN\gettext-x.x.x-bin.
+ * [Optional] If you want secure connection (https) client support,
+ extract openssl into SVN\openssl-x.x.x
+ * [Optional] If you want localized message support, extract
+ svn-win32-libintl.zip into SVN\svn-win32-libintl and extract
+ gettext-x.x.x-bin.zip and gettext-x.x.x-dep.zip into
+ SVN\gettext-x.x.x-bin.
Add SVN\gettext-x.x.x-bin\bin to your path.
* [Optional] Extract MASM32 (only the ML.EXE and ML.ERR files) into
SVN\asm (or extract nasm into SVN\asm) and put it in your path.
+ * Download the SQLite amalgemation from
+ http://www.sqlite.org/download.html
+ and extract it into SVN\sqlite-amalgemation.
+ See I.C.13 for alternatives to using the amalgemation package.
E.4 Building the Binaries
@@ -959,8 +965,8 @@
C:>set PYTHONDIR=C:\Python22
C:>set AWKDIR=C:\SVN\Awk
C:>set ASMDIR=C:\SVN\asm
- C:>set SDKINC=C:\Program Files\Microsoft SDK\include
- C:>set SDKLIB=C:\Program Files\Microsoft SDK\lib
+ C:>set SDKINC="C:\Program Files\Microsoft SDK\include"
+ C:>set SDKLIB="C:\Program Files\Microsoft SDK\lib"
C:>set GETTEXTBIN=C:\SVN\gettext-0.14.1-bin\bin
C:>PATH=%PATH%;%DRIVE%:\SVN\src-%DIR%\db4-win32;%ASMDIR%;
%PYTHONDIR%;%AWKDIR%;%GETTEXTBIN%
@@ -1006,7 +1012,7 @@
the APR libraries; the options are --with-apr, --with-apr-util and
--with-apr-iconv.
* If you would like a debug build substitute Debug for Release in
- the msdev commands.
+ the msdev/msdbuild commands.
* There have been rumors that Subversion on Win32 can be built
using the latest cygwin, you probably don't want the zip file source
distribution though. ymmv.
@@ -1213,7 +1219,7 @@
line. Make sure this is the same db as the one Subversion uses.
This note assumes you have installed Berkeley DB 4.2.52
at its default locations. For more info about the db requirement,
- see section I.5.
+ see section I.C.7.
You may also want to include other modules in your build. Add
--enable-ssl to turn on SSL support, and --enable-deflate to turn on
