mfp             Wed Aug  3 10:30:03 2005 EDT

  Modified files:              
    /phpdoc/en/reference/sdo    reference.xml 
  Log:
  Rewrite installation instructions to cover Windows/Linux X Release/latestCVS.
  
http://cvs.php.net/diff.php/phpdoc/en/reference/sdo/reference.xml?r1=1.11&r2=1.12&ty=u
Index: phpdoc/en/reference/sdo/reference.xml
diff -u phpdoc/en/reference/sdo/reference.xml:1.11 
phpdoc/en/reference/sdo/reference.xml:1.12
--- phpdoc/en/reference/sdo/reference.xml:1.11  Fri Jul 29 12:58:23 2005
+++ phpdoc/en/reference/sdo/reference.xml       Wed Aug  3 10:29:59 2005
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
 <!-- Generated by xml_proto.php v2.1. Found in /scripts directory of phpdoc. 
-->
 <reference id="ref.sdo">
  <title>SDO Functions</title>
@@ -87,34 +87,141 @@
   <section id="sdo.installation">
    &reftitle.install;
    <para>
-    SDO extension can be installed using pear. However as it is
-    still in it's beta you need set <command>pear</command> option 
'preferred_state' to beta.
-    like <command> pear -D preferred_state=beta install sdo </command>. 
-    If you want to install this extension manually on Linux, you 
-    can do so by following steps described below.
-   </para>
-   <procedure id='sdo.installation.linux.steps'>
-    <title>Linux installation steps</title>
+   There are several options, depending on whether you are installing on
+   Windows or Linux, and depending on whether you are installing a released
+   version (a .tgz file from the PECL site) or the latest from CVS.
+   The Relational DAS also needs special attention as it is written in
+   PHP.
+  </para>
+  <para>
+   The instructions are likely to change as PHP 5.1 progresses in status 
+   from    beta to stable release. The instructions here were correct on 3rd
+   August    2005, when PHP 5.1.0b3 was the current beta release of 
+   PHP, and 0.5.0 was the current beta release of SDO.
+  </para>
+  <para> 
+   The options are summarised in the following table:
+   <informaltable>
+    <tgroup cols='3'>
+     <thead>
+      <row>
+       <entry>latest CVS/Release</entry>
+       <entry>Windows</entry>
+       <entry>Linux</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>
+        latest CVS
+       </entry>
+       <entry>
+        <itemizedlist>
+         <listitem>
+          <para>
+           You will find the latest DLLs for the SDO core and the 
+           XML DAS at the PHP snaps site. 
+           The "PECL extensions for the unstable win32 branch" link points
+           to the list of recently built DLLs. The latest sdo core is
+           <filename>php_sdo.dll</filename>
+           .
+           The latest XML DAS is 
+           <filename>php_sdo_das_xml.dll</filename>
+           .
+          </para>
+         </listitem>
+         <listitem>
+          <para>
+           Check out the Relational DAS from CVS to somewhere on the
+           PHP 
+           <link linkend="ini.include-path">include_path</link>
+           .
+          </para>
+         </listitem>
+        </itemizedlist>
+       </entry>
+       <entry>
+        <itemizedlist>
+         <listitem>
+          <para>
+           Check out the SDO core and the XML DAS from CVS 
+           and build according to the instructions 
+           immediately following for building on Linux.
+          </para>
+         </listitem>
+         <listitem>
+          <para>
+           Check out the Relational DAS from CVS to somewhere on the
+           PHP 
+           <link linkend="ini.include-path">include_path</link>
+           .
+          </para>
+         </listitem>
+        </itemizedlist>
+       </entry>
+      </row>
+      <row>
+       <entry>
+        Release
+       </entry>
+       <entry>
+        <itemizedlist>
+         <listitem>
+          <para>
+           There is currently no way provided for building the release 
+           version of the SDO core and XML DAS on a user's machine. 
+           You will only be able to pick up the latest DLLs from the 
+           snaps site (see previous row of this table).
+          </para>
+         </listitem>
+         <listitem>
+          <para>
+           The Relational DAS can be downloaded and installed with 
+          </para>
+          <para>
+           <command>
+           pear -B install sdo-0.5.0
+           </command>
+           .
+          </para>
+         </listitem>
+        </itemizedlist>
+       </entry>
+       <entry>
+        <itemizedlist>
+         <listitem>
+          <para>
+           You can download and install all three SDO components - the
+           SDO core, the XML DAS and the Relational DAS - with the 
+           command
+           <command>
+           pear install sdo-0.5.0
+           </command>
+           .
+           This will build the SDO and XML shared libraries as well as 
+           installing the PHP files that make the Relational DAS.
+          </para>
+         </listitem>
+        </itemizedlist>
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+   
+   <procedure id='sdo.build.linux.steps'>
+    <title>Building SDO on Linux</title>
     <para>
-     The following instructions describe how to install the 
-     SDO extension on Linux. Note, these steps will also install the
-     <link linkend="ref.sdo-das-xml">XML Data Access Service</link>
-     which is packaged as part of this extension.
+     This section describes how to build the SDO core and XML DAS on Linux.
+     Currently you would only need to know how to do this if you 
+     wish to build a recent version that you have checked out
+     of CVS. 
     </para>
     <step>
      <para>
-      Download the SDO extension from the pecl/sdo directory on CVS.
-     </para>
-    </step>
-    <step>
-     <para>
-      Untar the downloaded image in your favourite folder.
-     </para>
-    </step>
-    <step>
-     <para>
       Change to the main extension directory:
-      <command>cd sdo-&lt; version &gt;</command>
+      <command>cd &lt; wherever your sdo code is &gt;</command>
      </para>
     </step>
     <step>

Reply via email to