r4952 - in trunk: BOOK BOOK/basicnet/netprogs BOOK/introduction/welcome patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Thu Aug 18 21:55:43 PDT 2005


Author: randy
Date: 2005-08-18 22:55:42 -0600 (Thu, 18 Aug 2005)
New Revision: 4952

Added:
   trunk/patches/subversion-1.2.1-swig_1.3.25-1.patch
Modified:
   trunk/BOOK/basicnet/netprogs/subversion.xml
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Updated to Subversion-1.2.1

Modified: trunk/BOOK/basicnet/netprogs/subversion.xml
===================================================================
--- trunk/BOOK/basicnet/netprogs/subversion.xml	2005-08-19 02:11:55 UTC (rev 4951)
+++ trunk/BOOK/basicnet/netprogs/subversion.xml	2005-08-19 04:55:42 UTC (rev 4952)
@@ -5,11 +5,11 @@
   %general-entities;
 
   <!ENTITY subversion-download-http "http://subversion.tigris.org/tarballs/subversion-&subversion-version;.tar.bz2">
-  <!ENTITY subversion-download-ftp  " ">
-  <!ENTITY subversion-md5sum        "6e557ae65b6b8d7577cc7704ede85a23">
-  <!ENTITY subversion-size          "6.7 MB">
-  <!ENTITY subversion-buildsize     "182 MB (additional 577 MB to run all test suites)">
-  <!ENTITY subversion-time          "1.24 SBU (add 0.90 SBU for SWIG bindings and 6.45 SBU to run test suites)">
+  <!ENTITY subversion-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/subversion-&subversion-version;.tar.bz2">
+  <!ENTITY subversion-md5sum        "0b546195ca794c327c6830f2e88661f7">
+  <!ENTITY subversion-size          "7.2 MB">
+  <!ENTITY subversion-buildsize     "90 MB (additional 45 MB for all bindings and 488 MB to run all test suites)">
+  <!ENTITY subversion-time          "1.6 SBU (add 1.1 SBU for bindings and 22.2 SBU to run test suites)">
   <!ENTITY svn-neon-version         "0.24.7">
 ]>
 
@@ -36,8 +36,9 @@
     extends and enhances <application>CVS</application>' feature set,
     while maintaining a similar interface for those already familiar with
     <application>CVS</application>. These instructions install the client
-    and server software used to manipulate a <application>Subversion</application>
-    repository. Creation of a repository is covered at <xref linkend="svnserver"/>.</para>
+    and server software used to manipulate a
+    <application>Subversion</application> repository. Creation of a repository
+    is covered at <xref linkend="svnserver"/>.</para>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -61,6 +62,16 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch if using
+        <application>Swig</application>-1.3.25 and you wish
+        to build the <application>Perl</application> bindings: <ulink
+        url="&patch-root;/patches/subversion-&subversion-version;-swig_1.3.25-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Subversion Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -68,13 +79,13 @@
     <application>neon</application>)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="python"/> (required to run the full test suite),
+    <para><xref linkend="python"/> (required to run the test suite),
+    <xref linkend="db"/>,
     <xref linkend="apache"/>,
-    <xref linkend="openssh"/> (runtime only),
     <ulink url="http://www.webdav.org/neon/">neon-&svn-neon-version;</ulink>,
     <xref linkend="jdk"/> (to build the <application>JAVA</application>
     bindings),
-    <ulink url="http://www.junit.org/">JUnit</ulink> (for running the
+    <ulink url="http://www.junit.org/">JUnit</ulink> (required for running the
     <application>JAVA</application> bindings test suite and requires
     <xref linkend="unzip"/>),
     <ulink url="http://www.inet.no/dante/">Dante</ulink> (alternate
@@ -97,8 +108,10 @@
 
     <bridgehead renderas="sect4">Optional to Build the
     <application>SWIG</application> Bindings</bridgehead>
-    <para><ulink url="http://www.swig.org">SWIG</ulink> and
-    <xref linkend="python"/></para>
+    <para><ulink url="http://www.swig.org">SWIG</ulink>,
+    <xref linkend="python"/> and
+    <xref linkend="ruby"/> (<application>Ruby</application> bindings require
+    <application>Swig-1.3.24</application>)</para>
 
   </sect2>
 
@@ -129,8 +142,7 @@
 
 <screen><userinput>make javahl</userinput></screen>
 
-    <para>If you passed the <option>--with-swig</option> and
-    <option>--enable-swig-bindings</option> parameters to
+    <para>If you passed the <option>--with-swig</option> parameter to
     <command>configure</command> and wish to build the
     <application>SWIG</application> <application>Perl</application> and
     <application>Python</application> <application>Subversion</application>
@@ -139,13 +151,27 @@
 <screen><userinput>make swig-pl &&
 make swig-py</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>The <application>Ruby</application> bindings are a recent
+    development, and are only partially implemented. The
+    <application>Ruby</application> bindings API may change incompatibly as
+    development proceeds. They currently require
+    <application>SWIG</application> 1.3.24 exactly – neither later nor
+    earlier will work.</para>
 
+    <para>To test the results of the <application>Subversion</application>
+    build, issue: <command>make check</command>.</para>
+
+    <para>To test the results of the bindings builds, issue either or both
+    of: <command>make check-javahl</command> and
+    <command>make check-swig-pl</command>.</para>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role='root'><userinput>make install &&
 install -v -d -m755 /usr/share/doc/subversion-&subversion-version; &&
-cp -v -R doc/* /usr/share/doc/subversion-&subversion-version;</userinput></screen>
+cp -v -R doc/* /usr/share/doc/subversion-&subversion-version; &&
+rm -v /usr/share/doc/subversion-&subversion-version;/{Makefile,doxygen.conf} \
+    /usr/share/doc/subversion-&subversion-version;/translations/norwegian_nb/Makefile</userinput></screen>
 
     <para>If you built the <application>JAVA</application>
     <application>Subversion</application> bindings, issue the following command

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-08-19 02:11:55 UTC (rev 4951)
+++ trunk/BOOK/general.ent	2005-08-19 04:55:42 UTC (rev 4952)
@@ -247,7 +247,7 @@
 <!ENTITY portmap-version              "5beta">
 <!ENTITY rsync-version                "2.6.5">
 <!ENTITY samba3-version               "3.0.14a">
-<!ENTITY subversion-version           "1.1.4">
+<!ENTITY subversion-version           "1.2.1">
 <!ENTITY tcpwrappers-version          "7.6">
 <!ENTITY wget-version                 "1.10">
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-08-19 02:11:55 UTC (rev 4951)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-08-19 04:55:42 UTC (rev 4952)
@@ -44,8 +44,11 @@
       <para>August 19th, 2005</para>
       <itemizedlist>
         <listitem>
-          <para>[bdubbs] - Updated to koffice-1.4.1.</para>
+          <para>[randy] - Updated to Subversion-1.2.1</para>
         </listitem>
+        <listitem>
+          <para>[bdubbs] - Updated to KOffice-1.4.1.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Added: trunk/patches/subversion-1.2.1-swig_1.3.25-1.patch
===================================================================
--- trunk/patches/subversion-1.2.1-swig_1.3.25-1.patch	2005-08-19 02:11:55 UTC (rev 4951)
+++ trunk/patches/subversion-1.2.1-swig_1.3.25-1.patch	2005-08-19 04:55:42 UTC (rev 4952)
@@ -0,0 +1,32 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2005-08-18
+Initial Package Version: 1.2.1
+Upstream Status:         Not submitted (idea for the patch was discovered from a
+                         mailing list message on the subversion mailing list)
+Origin:                  Max Bowsher
+                         http://svn.haxx.se/users/archive-2005-07/0136.shtml
+Description:             Fixes build issue using swig-1.3.25
+
+$LastChangedBy$
+$Date$
+
+
+diff -Naur subversion-1.2.1-orig/subversion/bindings/swig/core.i subversion-1.2.1/subversion/bindings/swig/core.i
+--- subversion-1.2.1-orig/subversion/bindings/swig/core.i	2005-07-01 17:25:14.000000000 +0000
++++ subversion-1.2.1/subversion/bindings/swig/core.i	2005-08-18 23:14:12.000000000 +0000
+@@ -425,13 +425,13 @@
+ 
+ static apr_pool_t *current_pool = 0;
+ 
+-SWIGEXPORT(apr_pool_t *)
++SWIGEXPORT apr_pool_t *
+ svn_swig_pl_get_current_pool (void)
+ {
+   return current_pool;
+ }
+ 
+-SWIGEXPORT(void)
++SWIGEXPORT void
+ svn_swig_pl_set_current_pool (apr_pool_t *pool)
+ {
+   current_pool = pool;


Property changes on: trunk/patches/subversion-1.2.1-swig_1.3.25-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list