From 84f9b731b6ebd07105400077eadaba129c33ddea Mon Sep 17 00:00:00 2001 From: Randy McMurchy Date: Tue, 17 Jul 2007 01:25:58 +0000 Subject: [PATCH] Updated to Subversion-1.4.4 git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@6907 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- basicnet/netprogs/subversion.xml | 196 ++++++++++++++++------------- general.ent | 4 +- introduction/welcome/changelog.xml | 9 ++ server/other/svnserver.xml | 4 +- 4 files changed, 120 insertions(+), 93 deletions(-) diff --git a/basicnet/netprogs/subversion.xml b/basicnet/netprogs/subversion.xml index 8c2f2af09b..c8ae4cf874 100644 --- a/basicnet/netprogs/subversion.xml +++ b/basicnet/netprogs/subversion.xml @@ -4,27 +4,16 @@ %general-entities; - - - - - - - - + - - + + - - + + - + + ]> @@ -90,49 +79,64 @@ Subversion Dependencies + Required + (for the + APR only) or + Apache Portable Runtime or + + Subversion dependencies (see the INSTALL file + for information on how to utilize this package) + + If you require the Berkeley DB back-end + hooks in Subversion to build or support BDB + based repositories, you must have Berkeley DB + linked into the APR-util library. There is + information in the instructions that shows the + required parameters to pass to the configure script when + building any of the APR-util packages. + Optional - - (required to run the test suite), + (required to run the test suite), - or - Apache Portable Runtime, - neon-&svn-neon-version;, - (to build the Java bindings), - JUnit - (required for running the Java bindings test suite and requires - ), - Dante - (alternate Java compiler), and - - Jikes (another alternate Java compiler) + (if you have Apache Portable + Runtime installed), + neon*, and + serf - Optional for the Bundled Version of - Neon - , - or , - , - or + * The configure script will warn that the + installed neon version is not supported if the + version is greater than &svn-neon-version;. You can circumvent this + warning by passing to the + configure command. Note that this may or may not work, + depending on the version of neon you have + installed, but neon-0.26.3 is known to + work. - Optional for the Bundled Version of - Apache Portable Runtime - and - - + Optional to Build the Java Bindings + or + Dante or + Jikes, + and (to test the Java bindings) - Optional to Build the - SWIG Bindings - SWIG, + Optional to Build the SWIG Bindings + SWIG**, , and - Note that the Python, + ** The configure script will issue warnings if + the installed version of SWIG is greater than + &svn-swig-version;, but will attempt to use it anyway if you build the + SWIG bindings. Versions of + SWIG up to 1.3.31 are known to work. + + User Notes: @@ -142,7 +146,7 @@ Installation of Subversion - + Install Subversion by running the following commands: -./configure --prefix=/usr \ - --without-berkeley-db \ - --with-installbuilddir=/usr/lib/apr-0 && +sed -i 's/@SVN_APR_INCLUDES@/& @CPPFLAGS@/' \ + subversion/bindings/swig/perl/native/Makefile.PL.in + +./configure --prefix=/usr && make - + If you have installed and you wish to + build the API documentation, issue: + doxygen doc/doxygen.conf. + + If you passed the parameter to configure and wish to build the Java bindings, issue @@ -194,9 +203,9 @@ make make javahl - If you passed the parameter to - configure and wish to build the - Perl, Python and/or + If you have the necessary dependencies installed and you wish to + build the Perl, + Python and/or Ruby bindings, issue any or all of the following commands: @@ -204,20 +213,17 @@ make make swig-py && make swig-rb - To test the results of the Subversion - build, issue: make check. This will take quite a long - time. + To test the results, issue: make check. - + To test the results of the Java bindings build, issue make check-javahl. Note you must have the - JUnit (version 3.8.x) testing framework - installed. + JUnit testing framework installed. To test the results of any or all of the SWIG bindings, you can use the following @@ -230,9 +236,6 @@ make check-swig-rb Now, as the root user: make install && -rm doc/{Makefile,doxygen.conf} && -find doc -type d -exec chmod 755 {} \; && -find doc -type f -exec chmod 644 {} \; && install -v -m755 -d /usr/share/doc/subversion-&subversion-version; && cp -v -R doc/* /usr/share/doc/subversion-&subversion-version; @@ -250,7 +253,7 @@ cp -v -R doc/* /usr/share/doc/subversion-&subversion-version; @@ -259,21 +262,33 @@ make install-swig-rb Command Explanations - --with-installbuilddir=/usr/lib/apr-0: - This parameter is used (and only has an effect if you used the source - provided version of Apache Portable Runtime) to force the installation - of some APR-related support programs to - /usr/lib/apr-0 instead of - /usr/build. + sed -i '...' .../Makefile.PL.in: This command + is used to fix a problem with compiling the Perl + bindings. It can be ommitted if you're not building the bindings. : This option should be used if you wish to use a system-installed version of neon. - : This switch enables - OpenSSL support in - neon (only required if you use the bundled - version of neon). + : + These options should be used if you wish to use the system-installed + version of the APR. Ensure you identify the + correct installation prefix. + + : This option should be + used to identify the system-installed version of the + apxs command installed during the + Apache HTTPD installation as + apxs might not be in an unprivileged user's + PATH and won't be properly discovered. + + --with-installbuilddir=/usr/lib/apr-0: + This parameter is used (and only has an effect if you used the + Subversion dependencies package) to force the + installation of some APR-related support programs to + /usr/lib/apr-0 instead of + /usr/build. @@ -321,16 +336,19 @@ make install-swig-rb Installed Directories - svn, svnadmin, svndumpfilter, svnlook, svnserve, svnversion, and - optionally, neon-config and apr-config - libsvn*.{so,a} and optionally, libneon.{so,a} and the mod_dav_svn.so, + svn, svnadmin, svndumpfilter, svnlook, svnserve, svnsync and + svnversion + libsvn*.{so,a} and optionally, a Java library, the mod_dav_svn.so, and mod_authz_svn.so Apache HTTP - DSO modules - /etc/subversion, /usr/include/neon (optional), /usr/include/subversion-1, + DSO modules and various Perl, + Python and Ruby + modules + /usr/include/subversion-1, /usr/lib/perl5/site_perl/&lfs-perl-version;/i686-linux/auto/SVN (optional), /usr/lib/perl5/site_perl/&lfs-perl-version;/i686-linux/SVN (optional), - /usr/lib/svn-javahl (optional), /usr/lib/svn-python (optional), - /usr/share/doc/neon-&svn-neon-version; (optional), and + /usr/lib/ruby/site_ruby/x.x/i686-linux/svn, + /usr/lib/svn-javahl (optional), + /usr/lib/svn-python (optional) and /usr/share/doc/subversion-&subversion-version; diff --git a/general.ent b/general.ent index 5333b49259..af994339a6 100644 --- a/general.ent +++ b/general.ent @@ -3,7 +3,7 @@ $LastChangedBy$ $Date$ --> - + @@ -326,7 +326,7 @@ $Date$ - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 7104f8fbd2..dc3752c1d6 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -41,6 +41,15 @@ --> + + July 17th, 2007 + + + [randy] - Updated to Subversion-1.4.4. + + + + July 16th, 2007 diff --git a/server/other/svnserver.xml b/server/other/svnserver.xml index 4ddc06edbd..145c7c4c08 100644 --- a/server/other/svnserver.xml +++ b/server/other/svnserver.xml @@ -21,7 +21,7 @@ This section will describe how to set up, administer and secure a Subversion server. - + Subversion Server Dependencies