Changeset: b7ceed372f9d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b7ceed372f9d Modified Files: clients/ChangeLog.Aug2011 clients/perl/Cimpl/Makefile.ag clients/perl/Cimpl/MapiLib.pm.i clients/perl/Cimpl/example.pl clients/perl/Makefile.ag clients/perl/MonetDB-CLI-MapiLib/Makefile.ag clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/MANIFEST clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/MANIFEST.SKIP clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/Makefile.PL clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/Makefile.ag clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/MapiLib.pm clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/README clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/t/00use.t clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/t/02cxn.t clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/t/75mil.t clients/perl/MonetDB-CLI-MapiLib/MonetDB/Makefile.ag clients/perl/MonetDB-CLI-MapiXS/MANIFEST clients/perl/MonetDB-CLI-MapiXS/MANIFEST.SKIP clients/perl/MonetDB-CLI-MapiXS/Makefile.PL clients/perl/MonetDB-CLI-MapiXS/MapiXS.h clients/perl/MonetDB-CLI-MapiXS/MapiXS.pm clients/perl/MonetDB-CLI-MapiXS/MapiXS.xs clients/perl/MonetDB-CLI-MapiXS/README clients/perl/MonetDB-CLI-MapiXS/t/00use.t clients/perl/MonetDB-CLI-MapiXS/t/02cxn.t clients/perl/MonetDB-CLI-MapiXS/t/75mil.t clients/perl/MonetDB-CLI-MapiXS/t/85ref.t clients/perl/MonetDB-CLI-MapiXS/typemap Branch: Aug2011 Log Message:
perl: remove obsolete implementations Remove Cimpl because it is SWIG-based Remove MonetDB-CLI-MapiLib because it is based on Cimpl Remove MonetDB-CLI-XS because it was never finished/implemented diffs (truncated from 1765 to 300 lines): diff --git a/clients/ChangeLog.Aug2011 b/clients/ChangeLog.Aug2011 --- a/clients/ChangeLog.Aug2011 +++ b/clients/ChangeLog.Aug2011 @@ -2,6 +2,7 @@ # This file is updated with Maddlog * Sun Jul 24 2011 Fabian Groffen <[email protected]> +- Removed perl/Cimpl, MonetDB-CLI-MapiLib and MonetDB-CLI-MapiXS - Switched implementation of MonetDB::CLI::MapiPP to Mapi.pm, and made it the default MonetDB::CLI provider. diff --git a/clients/perl/Cimpl/Makefile.ag b/clients/perl/Cimpl/Makefile.ag deleted file mode 100644 --- a/clients/perl/Cimpl/Makefile.ag +++ /dev/null @@ -1,55 +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. - -SWIGFLAGS = -I$(srcdir)/../../mapilib $(PERL_INCS) -INCLUDES = ../../mapilib ../../../common/options $(PERL_INCS) - -# Both GNU's gcc and Intel's icc do not like to compile -# swig-generated code with our strict X_CFLAGS. -# Instead of disabling 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 possible. See -# configure.ag for details. -CFLAGS = $(GCC_SWIG_CFLAGS) $(ICC_SWIG_CFLAGS) -D_GNU_SOURCE -# -# However, at least with gcc 4.2.2 and swig 1.3.31 on Gentoo 1.12.9, -# we still get -# MapiLib.pm.c: In function 'boot_MapiLib': -# MapiLib.pm.c:6157: warning: passing argument 2 of '_swig_create_magic' discards qualifiers from pointer target type -# Hence, we have to disable (override) our X_CFLAGS completely: -X_CFLAGS = - -# Likewise, we need to disable W_CFLAGS=-WX (i.e., treating warnings -# as errors) for swig-generated code on Windows -W_CFLAGS = - -lib_MapiLib = { - PREFIX = - NAME = MapiLib - SOURCES = MapiLib.pm.i - LIBS = ../../mapilib/libmapi $(PERL_LIBS) $(MATH_LIBS) - DIR = $(prefix)/$(PERL_LIBDIR) - # we need this flag to allow for a name that does not start with "lib" - LDFLAGS = -module -} - -headers_pm = { - HEADERS = pm - SOURCES = MapiLib.pm.i - TARGETS = MapiLib.pm - DIR = $(prefix)/$(PERL_LIBDIR) -} diff --git a/clients/perl/Cimpl/MapiLib.pm.i b/clients/perl/Cimpl/MapiLib.pm.i deleted file mode 100644 --- a/clients/perl/Cimpl/MapiLib.pm.i +++ /dev/null @@ -1,108 +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. - -%module MapiLib -%include "typemaps.i" -%include "exception.i" - -%{ -#include "monetdb_config.h" -#include "mapi.h" -%} - -// don't care for the guard symbol -%ignore _MAPI_H_INCLUDED; - -// unimplementable in Perl -%ignore mapi_bind; -%ignore mapi_bind_var; -%ignore mapi_bind_numeric; -%ignore mapi_clear_bindings; -%ignore mapi_param; -%ignore mapi_param_type; -%ignore mapi_param_numeric; -%ignore mapi_param_string; -%ignore mapi_clear_params; -%ignore mapi_store_field; -%ignore mapi_quote; -%ignore mapi_unquote; - -%apply (char *STRING, int LENGTH) {(const char *cmd, size_t size)}; - -// This tells SWIG to treat char ** as a special case -%typemap(in) char ** { - AV *tempav; - I32 len; int i; - SV **tv; - if (!SvROK($input)) - croak("$input is not a reference."); - if (SvTYPE(SvRV($input)) != SVt_PVAV) - croak("$input is not an array."); - tempav = (AV*)SvRV($input); - len = av_len(tempav); - $1 = (char **) malloc((len+2)*sizeof(char *)); - for (i = 0; i <= len; i++) { - tv = av_fetch(tempav, i, 0); - $1[i] = (char *) SvPV(*tv,PL_na); - } - $1[i] = 0; - -}; - -// This cleans up our char ** array after the function call -%typemap(freearg) char ** { - free($1); -} - -// Creates a new Perl array and places a char ** into it -%typemap(out) char ** { - AV *myav; - SV **svs; - int i = 0,len = 0; - - /* Figure out how many elements we have */ - while ($1[len]) len++; - svs = (SV **) malloc(len*sizeof(SV *)); - for (i = 0; i < len ; i++) { - svs[i] = sv_newmortal(); - sv_setpv((SV*)svs[i],$1[i]); - }; - myav = av_make(len,svs); - free(svs); - $result = newRV((SV*)myav); - sv_2mortal($result); -} - -%typemap(memberin) char [ANY] { strncpy($1,$input,$dim0); } - -// options string arg, i.e. arg can be a string or NULL. -// %typemap(in,parse="z") char *OPTSTRING ""; - -// %apply char *OPTSTRING {char *lang}; -// %apply char *OPTSTRING {char *password}; -// %apply char *OPTSTRING {char *username}; -// %apply char *OPTSTRING {char *host}; -// %apply char *OPTSTRING {char *cmd}; - -// TODO: -// %typemap(out) char * { } - -%typemap(in) PerlIO * { - $1 = IoIFP(sv_2io($input)); -} - -%include "mapi.h" diff --git a/clients/perl/Cimpl/example.pl b/clients/perl/Cimpl/example.pl deleted file mode 100755 --- a/clients/perl/Cimpl/example.pl +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/perl -w - -# 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. - -use MapiLib; -use strict; - -my $dbh; - -$dbh = MapiLib::mapi_connect("localhost", 50000, "monetdb", "monetdb", "sql"); - -die MapiLib::mapi_error_str($dbh) if MapiLib::mapi_error($dbh); - -my $sth = MapiLib::mapi_query($dbh, "SELECT name FROM tables"); - -die MapiLib::mapi_error_str($dbh) if MapiLib::mapi_error($dbh); - -print MapiLib::mapi_get_name($sth, 0) . "\n------------\n"; - -while (MapiLib::mapi_fetch_row($sth)) { - print MapiLib::mapi_fetch_field($sth, 0) . "\n"; -} diff --git a/clients/perl/Makefile.ag b/clients/perl/Makefile.ag --- a/clients/perl/Makefile.ag +++ b/clients/perl/Makefile.ag @@ -17,10 +17,9 @@ MTSAFE -SUBDIRS = HAVE_PERL?MonetDB-CLI-MapiPP HAVE_PERL_DEVEL?MonetDB-CLI-MapiLib HAVE_PERL?MonetDB-CLI HAVE_PERL?DBD HAVE_PERL_SWIG?Cimpl HAVE_PERL?Tests +SUBDIRS = MonetDB-CLI-MapiPP MonetDB-CLI DBD Tests headers_perl = { - COND = HAVE_PERL HEADERS = pm DIR = $(prefix)/$(PERL_LIBDIR) SOURCES = Mapi.pm diff --git a/clients/perl/MonetDB-CLI-MapiLib/Makefile.ag b/clients/perl/MonetDB-CLI-MapiLib/Makefile.ag deleted file mode 100644 --- a/clients/perl/MonetDB-CLI-MapiLib/Makefile.ag +++ /dev/null @@ -1,18 +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. - -SUBDIRS = MonetDB diff --git a/clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/MANIFEST b/clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/MANIFEST deleted file mode 100644 --- a/clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/MANIFEST +++ /dev/null @@ -1,9 +0,0 @@ -Changes -MANIFEST -MANIFEST.SKIP -Makefile.PL -README -MapiLib.pm -t/00use.t -t/02cxn.t -t/75mil.t diff --git a/clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/MANIFEST.SKIP b/clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/MANIFEST.SKIP deleted file mode 100644 --- a/clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/MANIFEST.SKIP +++ /dev/null @@ -1,6 +0,0 @@ -^Makefile$ -^Makefile\.ag$ -^Makefile\.old$ -^pm_to_blib$ -\.properties$ -^blib/ diff --git a/clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/Makefile.PL b/clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/Makefile.PL deleted file mode 100644 --- a/clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/Makefile.PL +++ /dev/null @@ -1,9 +0,0 @@ -use ExtUtils::MakeMaker; - -WriteMakefile -( - NAME => 'MonetDB::CLI::MapiLib' -, VERSION_FROM => 'MapiLib.pm' _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
