Merge lp:~zorba-coders/zorba/bug1026192 into lp:zorba

Proposed by Rodolfo Ochoa on 2012-07-27
Status: Merged
Approved by: Chris Hillery on 2012-07-27
Approved revision: 10956
Merged at revision: 10958
Proposed branch: lp:~zorba-coders/zorba/bug1026192
Merge into: lp:zorba
Diff against target: 82 lines (+20/-12)
1 file modified
doc/zorba/php_windows.dox (+20/-12)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug1026192
Reviewer Review Type Date Requested Status
Cezar Andrei 2012-07-27 Approve on 2012-07-27
Chris Hillery 2012-07-27 Approve on 2012-07-27
Review via email: mp+116998@code.launchpad.net

Commit message

Documentation fixed for Zorba binary package with PHP.

Description of the change

Documentation fixed for Zorba binary package with PHP.

To post a comment you must log in.
Chris Hillery (ceejatec) :
review: Approve
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug1026192-2012-07-27T21-18-58.122Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/zorba/php_windows.dox'
2--- doc/zorba/php_windows.dox 2012-07-24 08:48:48 +0000
3+++ doc/zorba/php_windows.dox 2012-07-27 04:25:22 +0000
4@@ -4,13 +4,14 @@
5
6 \section apache_httpd_install Install Apache HTTP Server
7
8-Download and install Apache Server from <a href="http://httpd.apache.org/download.cgi">http://httpd.apache.org/download.cgi</a> for VC6. For apache compiled with VC9 download it from <a href="http://apachelounge.com/">http://apachelounge.com/</a>.
9+Download and install Apache Server from <a href="http://httpd.apache.org/download.cgi">http://httpd.apache.org/download.cgi</a>.
10+You can also get Apache compiled and optimized with Visual Studio VC9 and other modules (like PHP5 module) from <a href="http://apachelounge.com/">Apache Lounge</a>.
11
12 \section php5_install Install PHP5
13
14 Download and install PHP5 from <a href="http://windows.php.net/download/">http://windows.php.net/download/</a>. Remember to download and install according your VC version.
15
16-PHP will automatically install itself in to your apache server.
17+PHP will automatically install itself in to your apache server. If you got Apache from Apache Lounge you may need their PHP module version.
18
19 You can verify your install by adding a file in your htdocs directory with the following code:
20
21@@ -23,18 +24,21 @@
22
23 \section zorba_install Install Zorba
24
25-Get Zorba sources and follow \ref build.
26+You can install the latest version of Zorba by <a href="">downloading the most recent binaries</a>, additionaly you can also compile Zorba from source by following \ref build.
27
28 \section compile_zorba_php Compiling the Zorba PHP Extension
29
30-In order to compile the PHP Wrapper you need first to follow the steps to compile Zorba, but before compiling, you need to add three variables to the CMAKE command line:
31+If you are compiling Zorba, you will need also to compile the PHP Wrapper, to do this you besides the \ref build you need to add these three variables to your CMAKE command line:
32
33 \code
34--D PHP5_BINARY_DIR=... Specify the directory where php.exe is located, i.e. "C:\php"
35-
36--D PHP5_INCLUDE_DIR=... Specify the directory where the php source is located, i.e. "C:\php-5.3.5"
37-
38--D PHP5_LIBRARY=... Specify with normal slash the path where the php5ts.lib is located, this file is usually located in dev directory from the binary php installation, i.e. "C:/php/dev/php5ts.lib"
39+-D PHP5_BINARY_DIR=[PHP INSTALL]
40+[PHP INSTALL] is the directory where php.exe is located, i.e. "C:\php"
41+
42+-D PHP5_INCLUDE_DIR=[PHP INCLUDE DIR]
43+[PHP INCLUDE DIR] is the directory where the php source is located, i.e. "C:\php-5.3.5"
44+
45+-D PHP5_LIBRARY=[PHP LIBRARY]
46+[PHP LIBRARY] is the path where the php5ts.lib is located, this file is usually located in dev directory from the binary php installation, i.e. "C:/php/dev/php5ts.lib"
47 \endcode
48
49 After adding those lines CMAKE will add automatically the PHP Wrapper project and you will be able to get zorba_api.dll, which is the extension you can use in your php binary installation.
50@@ -51,7 +55,11 @@
51
52 \section php_enable_zorba_extension Enable Zorba extension in PHP
53
54-Copy Zorba extension zorba_api.dll file into your php extensions directory, i.e.
55+Copy Zorba extension zorba_api.dll file into your php extensions directory, this extension is located on:
56+Zorba compiled from sources: [ZORBA BUILD DIRECTORY]\swig\php\[DEBUG/RELEASE IF VISUAL STUDIO]
57+Zorba installed binaries: [ZORBA INSTALL DIRECTORY]\share\php\
58+
59+this file must be copied to your extensions directory that may be:
60 \code
61 C:\php\ext\
62 \endcode
63@@ -62,9 +70,10 @@
64
65 <code><strong>php.ini</strong>
66 extension=zorba_api.dll
67-In your Zorba directory, locate the file zorba_api_wrapper.php and copy it to an include directory from where php can find it from your setting include_path, i.e.
68 </code>
69
70+In your Zorba directory, locate the files zorba_api_wrapper.php and XQueryProcessor.php, copy them it to your include directory from where php can find it, this location is set on your php.ini file with the name <cope>include_path</code>, i.e.
71+
72 <code><strong>php.ini</strong>
73 ; Windows: "\path1;\path2"
74 include_path = ".;C:\php\include"
75@@ -109,7 +118,6 @@
76 </html>
77 \endcode
78
79-
80 Point your browser to http://localhost/test.php and see the result.
81
82 \section further_reading Further reading

Subscribers

People subscribed via source and target branches