Changeset: 41cfe1835833 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=41cfe1835833 Modified Files: clients/php/Cimpl/CHANGELOG clients/php/Cimpl/CREDITS clients/php/Cimpl/Makefile.ag clients/php/Cimpl/Makefile.standalone clients/php/Cimpl/README clients/php/Cimpl/config.m4 clients/php/Cimpl/examples/Makefile.ag clients/php/Cimpl/examples/monetdb_query_demo.php clients/php/Cimpl/examples/php.ini.in clients/php/Cimpl/examples/phpdbwrapper/config.php.sample clients/php/Cimpl/examples/phpdbwrapper/database.php clients/php/Cimpl/extractdoc.sh clients/php/Cimpl/php_monetdb.c clients/php/Cimpl/php_monetdb.h clients/php/Makefile.ag clients/php/phpdoc/monetdb/configure-old.xml clients/php/phpdoc/monetdb/configure.xml clients/php/phpdoc/monetdb/constants.xml clients/php/phpdoc/monetdb/functions.xml clients/php/phpdoc/monetdb/functions/monetdb-affected-rows.xml clients/php/phpdoc/monetdb/functions/monetdb-close.xml clients/php/phpdoc/monetdb/functions/monetdb-connect.xml clients/php/phpdoc/monetdb/functions/monetdb-data-seek.xml clients/php/phpdoc/monetdb/functions/monetdb-errno.xml clients/php/phpdoc/monetdb/functions/monetdb-error.xml clients/php/phpdoc/monetdb/functions/monetdb-escape-string.xml clients/php/phpdoc/monetdb/functions/monetdb-fetch-array.xml clients/php/phpdoc/monetdb/functions/monetdb-fetch-assoc.xml clients/php/phpdoc/monetdb/functions/monetdb-fetch-object.xml clients/php/phpdoc/monetdb/functions/monetdb-fetch-row.xml clients/php/phpdoc/monetdb/functions/monetdb-field-len.xml clients/php/phpdoc/monetdb/functions/monetdb-field-name.xml clients/php/phpdoc/monetdb/functions/monetdb-field-table.xml clients/php/phpdoc/monetdb/functions/monetdb-field-type.xml clients/php/phpdoc/monetdb/functions/monetdb-free-result.xml clients/php/phpdoc/monetdb/functions/monetdb-info.xml clients/php/phpdoc/monetdb/functions/monetdb-next-result.xml clients/php/phpdoc/monetdb/functions/monetdb-num-fields.xml clients/php/phpdoc/monetdb/functions/monetdb-num-rows.xml clients/php/phpdoc/monetdb/functions/monetdb-ping.xml clients/php/phpdoc/monetdb/functions/monetdb-query.xml clients/php/phpdoc/monetdb/ini.xml clients/php/phpdoc/monetdb/reference.xml Branch: default Log Message:
clients/php/Cimpl, clients/php/phpdoc: remove this stuff is old, broken, unmaintained, and outdated should have been removed long ago diffs (truncated from 8179 to 300 lines): diff -r 5b49b9602c43 -r 41cfe1835833 clients/php/Cimpl/CHANGELOG --- a/clients/php/Cimpl/CHANGELOG Sat Jan 15 21:55:38 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -2006-06-01 (fabian): - - Complete rewrite from scratch based on PostgreSQL's module. Works - quite nice and doesn't segfault after each page-view any more. - PHP5 only now. -2004-06-21 (arjan): - - PEAR wrapper; examples in separate dir -2004-06-01 (arjan): - - Bug fixes; it is already quite usable. -2004-03-26 (marcin): - - Initial version after complete rewrite of Mandfred's code. diff -r 5b49b9602c43 -r 41cfe1835833 clients/php/Cimpl/CREDITS --- a/clients/php/Cimpl/CREDITS Sat Jan 15 21:55:38 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -monetdb -Fabian Groffen <[email protected]> -Marcin Zukowski <[email protected]> -Arjan Scherpenisse <[email protected]> (misc. contributions) -Manfred Stienstra <[email protected]> (original version) diff -r 5b49b9602c43 -r 41cfe1835833 clients/php/Cimpl/Makefile.ag --- a/clients/php/Cimpl/Makefile.ag Sat Jan 15 21:55:38 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -# The contents of this file are subject to the MonetDB Public License -# Version 1.1 (the "License"); you may not use this file except in -# compliance with the License. You may obtain a copy of the License at -# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html -# -# Software distributed under the License is distributed on an "AS IS" -# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -# License for the specific language governing rights and limitations -# under the License. -# -# The Original Code is the MonetDB Database System. -# -# The Initial Developer of the Original Code is CWI. -# Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -# Copyright August 2008-2011 MonetDB B.V. -# All Rights Reserved. - -MTSAFE - -SWIGFLAGS = -I../../mapilib -INCLUDES = ../../mapilib $(MONETDB_INCS) $(PHP_INCS) - -# Both GNU's gcc and Intel's icc do not like to compile swig-generated code -# with our strict X_CFLAGS. -# Instead of diabling the strict X_CFLAGS completely, -# we use GCC_SWIG_CFLAGS and ICC_SWIG_CFLAGS, respectively, -# to disable only the problematic warnings/errors as locally as possbile. -# See buildtools/conf/MonetDB.m4 for details. -#CFLAGS = $(GCC_SWIG_CFLAGS) $(ICC_SWIG_CFLAGS) -DCOMPILE_DL_MONETDB=1 -D_GNU_SOURCE -# -# However, there are situations where user-chosen CFLAGS and/or X_CFLAGS -# are beyond our control. Hence, for the sake of a smooth compilation, we -# have to take the freedom to overrule the user's deliberate choice for -# X_CFLAGS by locally disabling them indifferently. -X_CFLAGS = -DCOMPILE_DL_MONETDB=1 -D_GNU_SOURCE - -SUBDIRS = examples - -lib_monetdb = { - PREFIX = - NAME = monetdb - SOURCES = php_monetdb.h php_monetdb.c - LIBS = ../../mapilib/libmapi $(MONETDB_LIBS) -lmutils -lstream $(PHP_LIBS) $(openssl_LIBS) $(SOCKET_LIBS) - DIR = $(prefix)/$(PHP_EXTENSIONDIR) - # we need this flag to allow for a name that does not start with "lib" - LDFLAGS = -module - -} diff -r 5b49b9602c43 -r 41cfe1835833 clients/php/Cimpl/Makefile.standalone --- a/clients/php/Cimpl/Makefile.standalone Sat Jan 15 21:55:38 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -all: - gcc -fpic -DCOMPILE_DL_MONETDB=1 `php-config --includes` `monetdb-config --cflags` -g -c -o monetdb.o php_monetdb.c -Wall - gcc -shared `monetdb-config --libs` -lMapi -rdynamic -g -o monetdb.so monetdb.o -Wall - -install: - cp monetdb.so `php-config --extension-dir` - @echo "The module has been installed in `php-config --extension-dir`." diff -r 5b49b9602c43 -r 41cfe1835833 clients/php/Cimpl/README --- a/clients/php/Cimpl/README Sat Jan 15 21:55:38 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ - *** NOTE *** -This module is deprecated and no longer maintained! - ************ - - - - - -MonetDB extension module for PHP5. - -To build this module, you have two options. - -1) Compile this module as a standalone module, which will build a shared object (.so) -2) Compile this module within the PHP source tree. - - -1) Standalone compilation - -Use the provided 'Makefile.standalone' file. The PHP development files -have to be installed (php-dev), and the php-config script needs to be -in your path. - - make -f Makefile.standalone - make -f Makefile.standalone install - -2) Compilation within the source tree - -This module can be compiled within PHP build structure. you need to -either copy it from within MonetDB directory into PHP source tree or -make a symlink into it, e.g.: - - ln -s $MONETDB_ROOT/src/mapi/clients/php/Cimpl $PHP_SRC/ext/monetdb - -Then, regenerate PHP's configure script for the module to show up: - - cd $PHP_SRC - rm configure; ./buildconf --force - -To compile it, you need to have MONETDB_PREFIX declared in your -environment, and then configure and install php e.g.: - configure --with-monetdb=shared - make - make install - -Possibly in the (near) future it will be possible to compile it independently, -within MonetDB compiling/testing facilities. - -examples/monetdb_query_demo.php is a demonstration of current features -available in this module. diff -r 5b49b9602c43 -r 41cfe1835833 clients/php/Cimpl/config.m4 --- a/clients/php/Cimpl/config.m4 Sat Jan 15 21:55:38 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -dnl The contents of this file are subject to the MonetDB Public License -dnl Version 1.1 (the "License"); you may not use this file except in -dnl compliance with the License. You may obtain a copy of the License at -dnl http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html -dnl -dnl Software distributed under the License is distributed on an "AS IS" -dnl basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -dnl License for the specific language governing rights and limitations -dnl under the License. -dnl -dnl The Original Code is the MonetDB Database System. -dnl -dnl The Initial Developer of the Original Code is CWI. -dnl Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -dnl Copyright August 2008-2011 MonetDB B.V. -dnl All Rights Reserved. - -dnl $Id$ -dnl config.m4 for extension monetdb - -dnl Comments in this file start with the string 'dnl'. -dnl Remove where necessary. This file will not work -dnl without editing. - -dnl If your extension references something external, use with: - -PHP_ARG_WITH(monetdb, for monetdb support, -dnl Make sure that the comment is aligned: -[ --with-monetdb[=DIR] Include monetdb support]) - -dnl Otherwise use enable: - -dnl PHP_ARG_ENABLE(monetdb, whether to enable monetdb support, -dnl Make sure that the comment is aligned: -dnl [ --enable-monetdb=DIR Enable monetdb support]) - -if test "$PHP_MONETDB" != "no"; then - dnl Write more examples of tests here... - - dnl # --with-monetdb -> check with-path - SEARCH_PATH="/usr/local /usr /opt" - SEARCH_FOR="include/MonetDB/C/Mapi.h" - if test -r $PHP_MONETDB/; then # path given as parameter - MONETDB_PREFIX=$PHP_MONETDB - else # search default path list - AC_MSG_CHECKING([for monetdb/Mapi files in default path]) - for i in $SEARCH_PATH ; do - if test -r $i/$SEARCH_FOR; then - MONETDB_PREFIX=$i - AC_MSG_RESULT(found in $i) - fi - done - fi - - if test -z "$MONETDB_PREFIX"; then - AC_MSG_RESULT([not found]) - AC_MSG_ERROR([Please reinstall the MonetDB distribution]) - fi - - # --with-monetdb -> add include path - PHP_ADD_INCLUDE($MONETDB_PREFIX/include/MonetDB/C) - - # --with-monetdb -> check for lib and symbol presence - LIBNAME=Mapi # you may want to change this - LIBSYMBOL=mapi_error_str # you most likely want to change this - - PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL, - [ - PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $MONETDB_PREFIX/lib, MONETDB_SHARED_LIBADD) - AC_DEFINE(HAVE_MONETDBLIB,1,[ ]) - ],[ - echo "-L$MONETDB_PREFIX/lib" - AC_MSG_ERROR([wrong monetdb/Mapi version or lib not found]) - ],[ - -L$MONETDB_PREFIX/lib - ]) - - PHP_SUBST(MONETDB_SHARED_LIBADD) - - PHP_NEW_EXTENSION(monetdb, php_monetdb.c, $ext_shared) -fi diff -r 5b49b9602c43 -r 41cfe1835833 clients/php/Cimpl/examples/Makefile.ag --- a/clients/php/Cimpl/examples/Makefile.ag Sat Jan 15 21:55:38 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -# The contents of this file are subject to the MonetDB Public License -# Version 1.1 (the "License"); you may not use this file except in -# compliance with the License. You may obtain a copy of the License at -# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html -# -# Software distributed under the License is distributed on an "AS IS" -# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -# License for the specific language governing rights and limitations -# under the License. -# -# The Original Code is the MonetDB Database System. -# -# The Initial Developer of the Original Code is CWI. -# Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -# Copyright August 2008-2011 MonetDB B.V. -# All Rights Reserved. - -MTSAFE - -EXTRA_DIST_DIR = phpdbwrapper - -headers_php = { - HEADERS = php - DIR = datadir/MonetDB/php - SOURCES = monetdb_query_demo.php -} - -headers_ini = { - HEADERS = ini - DIR = datadir/MonetDB/php - SOURCES = php.ini.in -} diff -r 5b49b9602c43 -r 41cfe1835833 clients/php/Cimpl/examples/monetdb_query_demo.php --- a/clients/php/Cimpl/examples/monetdb_query_demo.php Sat Jan 15 21:55:38 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,90 +0,0 @@ -<?php -# The contents of this file are subject to the MonetDB Public License -# Version 1.1 (the "License"); you may not use this file except in -# compliance with the License. You may obtain a copy of the License at -# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html -# -# Software distributed under the License is distributed on an "AS IS" -# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -# License for the specific language governing rights and limitations -# under the License. -# -# The Original Code is the MonetDB Database System. -# -# The Initial Developer of the Original Code is CWI. -# Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -# Copyright August 2008-2011 MonetDB B.V. -# All Rights Reserved. -?> - -<?php -# @author Fabian Groffen <[email protected]> -?> - -<html> - <head> - <title>MonetDB/SQL PHP demo</title> - </head> - - <body> -<?php -if (!extension_loaded('monetdb')) { - $prefix = (PHP_SHLIB_SUFFIX == 'dll') ? 'php_' : ''; - // note: PHP5 says it deprecates this, but I can't find - // how to make PHP5 happy... - dl($prefix.'monetdb.'.PHP_SHLIB_SUFFIX) or - die("Unable to load monetdb module!"); _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
