Changeset: 182a47fca820 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=182a47fca820
Modified Files:
NT/rules.msc
buildtools/doc/windowsbuild.rst
Branch: Mar2011
Log Message:
Cleanup: we don't need a PHP installation to build the PHP driver.
diffs (88 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -73,15 +73,6 @@
ODBC_LIBS = odbccp32.lib user32.lib
-!IFNDEF PHP_INSTDIR
-PHP_INSTDIR = C:\php-525
-!ENDIF
-!IFNDEF PHP_SRCDIR
-PHP_SRCDIR = $(PHP_INSTDIR)\php-5.2.5
-!ENDIF
-# for these, also see winconfig.py
-PHP_EXTENSIONDIR = lib\php5
-
!IFNDEF PYTHONBASE
PYTHONBASE=C:\Python27
!ENDIF
@@ -370,7 +361,6 @@
"LIBZLIB=$(LIBZLIB)" \
"PACKAGE=$(pkg)" \
"PERL_LIBDIR=$(PERL_LIBDIR)" \
- "PHP_EXTENSIONDIR=$(PHP_EXTENSIONDIR)" \
"PROFILING_FALSE=$(PROFILING_FALSE)" \
"PYTHON=$(PYTHON)" \
"PYTHON_LIBDIR=$(PYTHON_LIBDIR)" \
@@ -423,9 +413,6 @@
CXXFLAGS = $(CFLAGS) -EHsc
-PHP_INCS = "-I$(PHP_SRCDIR)" "-I$(PHP_SRCDIR)\main" "-I$(PHP_SRCDIR)\TSRM"
"-I$(PHP_SRCDIR)\Zend" -DPHP_WIN32 -DZEND_WIN32 -DZEND_DEBUG=0 -DZTS=1
-PHP_LIBS = "$(PHP_INSTDIR)\php5embed.lib"
-
CONFIG_H = monetdb_config.h
{$(SRCDIR)}.mx.h:
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -535,30 +535,15 @@
PHP
---
-PHP__ is only needed to create an interface that can be used from a
-PHP program to communicate with a MonetDB server.
+There is a PHP__ interface that can be used from a PHP program to
+communicate with a MonetDB server. This interface is written
+completely in PHP, so there is no compilation involved. This means
+that no installation of PHP is required for building, but only for
+testing.
-Download the Windows installer and source
-package of PHP 5 from http://www.php.net/.
-Install the binary package and extract the sources somewhere (e.g. as
-a subfolder of the binary installation).
-
-In order to get MonetDB to compile with these sources a few changes
-had to be made to the sources:
-
-- In the file ``Zend\zend.h``, move the line
- ::
-
- #include <stdio.h>
-
- down until just *after* the block where ``zend_config.h`` is
- included.
-- In the file ``main\php_network.h``, delete the line
- ::
-
- #include "arpa/inet.h"
-
-We have no support yet for Windows64.
+Download the Windows installer and source package of PHP 5 from
+http://www.php.net/. Install the binary package and extract the
+sources somewhere (e.g. as a subfolder of the binary installation).
__ http://www.php.net/
@@ -787,8 +772,6 @@
parameter may contain something like::
bits=32
- PHP_SRCDIR=C:\Program Files\PHP\php-5.3.3
- PHP_INSTDIR=C:\Program Files\PHP
LIBPERL=C:\Perl
LIBPCRE=C:\Program Files\PCRE
LIBICONV=C:\iconv-1.11.win32
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
