Changeset: 887e3e0bfc0b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=887e3e0bfc0b
Modified Files:
MonetDB.spec
NT/rules.msc
clients/perl/Cimpl/Makefile.ag
clients/perl/Cimpl/MapiLib.pm.i
clients/perl/Cimpl/example.pl
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
configure.ag
Branch: default
Log Message:
Merge with Aug2011 branch.
diffs (truncated from 2889 to 300 lines):
diff --git a/HowToStart.rst b/HowToStart.rst
--- a/HowToStart.rst
+++ b/HowToStart.rst
@@ -93,7 +93,6 @@
configuration and if they are missing, the feature is just
missing:
- - swig
- perl
- php
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -43,13 +43,11 @@
BuildRequires: openssl-devel
BuildRequires: pcre-devel >= 4.5
BuildRequires: perl
-BuildRequires: perl-devel
BuildRequires: python
# BuildRequires: raptor-devel >= 1.4.16
BuildRequires: readline-devel
BuildRequires: ruby
BuildRequires: rubygems
-BuildRequires: swig
BuildRequires: unixODBC-devel
BuildRequires: zlib-devel
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -673,7 +673,7 @@
#undef fstat
#endif
#define fstat _fstat64
-#ifndef S_ISREG /* swig-generated source file doesn't include us first
*/
+#ifndef S_ISREG /* in case this file wasn't included first */
#define S_ISREG(mode) (((mode) & _S_IFMT) == _S_IFREG)
#endif
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -173,7 +173,6 @@
# install python, flex and bison on your systems
PYTHON = python
YACC = bison -b y -y
-SWIG = swig
ARCHIVER = lib
GENDLL =
@@ -277,15 +276,9 @@
!IFDEF HAVE_PCRE
HAVE_PCRE_FALSE=^#
!ENDIF
-!IFDEF HAVE_PERL_DEVEL
-HAVE_PERL_DEVEL_FALSE=^#
-!ENDIF
!IFDEF HAVE_PERL
HAVE_PERL_FALSE=^#
!ENDIF
-!IFDEF HAVE_PERL_SWIG
-HAVE_PERL_SWIG_FALSE=^#
-!ENDIF
!IFDEF HAVE_PHP
HAVE_PHP_FALSE=^#
!ENDIF
@@ -318,9 +311,7 @@
"HAVE_OPENSSL_FALSE=$(HAVE_OPENSSL_FALSE)" \
"HAVE_ODBC_FALSE=$(HAVE_ODBC_FALSE)" \
"HAVE_PCRE_FALSE=$(HAVE_PCRE_FALSE)" \
- "HAVE_PERL_DEVEL_FALSE=$(HAVE_PERL_DEVEL_FALSE)" \
"HAVE_PERL_FALSE=$(HAVE_PERL_FALSE)" \
- "HAVE_PERL_SWIG_FALSE=$(HAVE_PERL_SWIG_FALSE)" \
"HAVE_PHP_FALSE=$(HAVE_PHP_FALSE)" \
"HAVE_PYTHON_FALSE=$(HAVE_PYTHON_FALSE)" \
"HAVE_RAPTOR_FALSE=$(HAVE_RAPTOR_FALSE)" \
diff --git a/buildtools/Mx/Code.c b/buildtools/Mx/Code.c
--- a/buildtools/Mx/Code.c
+++ b/buildtools/Mx/Code.c
@@ -91,7 +91,6 @@
case DTD:
case XSL:
case Config:
- case Swig:
case CCyacc:
case CClex:
if (!extract(d->d_dir))
@@ -368,7 +367,6 @@
case XML:
case DTD:
case XSL:
- case Swig:
case Cyacc:
case Clex:
case CCyacc:
diff --git a/buildtools/Mx/Def.c b/buildtools/Mx/Def.c
--- a/buildtools/Mx/Def.c
+++ b/buildtools/Mx/Def.c
@@ -314,7 +314,6 @@
case DTD:
case XSL:
case Config:
- case Swig:
case CCyacc:
case CClex:
if (allTrue()) {
diff --git a/buildtools/Mx/Form.c b/buildtools/Mx/Form.c
--- a/buildtools/Mx/Form.c
+++ b/buildtools/Mx/Form.c
@@ -227,9 +227,6 @@
case Config:
PrCodeDisplay(d, "cfg");
break;
- case Swig:
- PrCodeDisplay(d, "i");
- break;
case CCyacc:
PrCodeDisplay(d, "yy");
break;
diff --git a/buildtools/Mx/Mx.c b/buildtools/Mx/Mx.c
--- a/buildtools/Mx/Mx.c
+++ b/buildtools/Mx/Mx.c
@@ -198,7 +198,6 @@
{"dtd", DTD, "dtd",},
{"xsl", XSL, "xsl",},
{"cfg", Config, "cfg",},
- {"swig", Swig, "i",},
{"Y", CCyacc, "yy",},
{"L", CClex, "ll",},
{"{", InHide, "",},
diff --git a/buildtools/Mx/Mx.h b/buildtools/Mx/Mx.h
--- a/buildtools/Mx/Mx.h
+++ b/buildtools/Mx/Mx.h
@@ -64,7 +64,7 @@
Pspec, Pimpl, Cdef, Csrc, ODLspec, SQL,
OQLspec, Cyacc, Clex, Prolog, Haskell, MALcode,
Qnap, HTML, Java,
- ProC, Shell, fGrammar, Macro, XML, DTD, XSL, Config, Swig,
+ ProC, Shell, fGrammar, Macro, XML, DTD, XSL, Config,
CCyacc, CClex
} CmdCode;
diff --git a/buildtools/autogen/autogen/codegen.py
b/buildtools/autogen/autogen/codegen.py
--- a/buildtools/autogen/autogen/codegen.py
+++ b/buildtools/autogen/autogen/codegen.py
@@ -32,7 +32,6 @@
mx2y = re.compile("^@y[ \t\r\n]+", re.MULTILINE)
mx2l = re.compile("^@l[ \t\r\n]+", re.MULTILINE)
mx2cfg = re.compile("^@cfg[ \t\r\n]+", re.MULTILINE)
-mx2swig = re.compile("^@swig[ \t\r\n]+", re.MULTILINE)
mx2sql = re.compile("^@sql[ \t\r\n]+", re.MULTILINE)
mx2java = re.compile("^@java[ \t\r\n]+", re.MULTILINE)
mx2xsl = re.compile("^@xsl[ \t\r\n]+", re.MULTILINE)
@@ -50,7 +49,6 @@
(mx2l, '.l'),
(mx2cfg, '.cfg'),
(mx2sql, '.sql'),
- (mx2swig, '.i'),
(mx2java, '.java'),
(mx2xsl, '.xsl'),
(mx2sh, ''), ],
@@ -66,7 +64,6 @@
(mx2l, '.l'),
(mx2cfg, '.cfg'),
(mx2sql, '.sql'),
- (mx2swig, '.i'),
(mx2java, '.java'),
(mx2xsl, '.xsl'),
(mx2sh, ''), ]
@@ -86,8 +83,6 @@
'brg': [ '.c' ],
't': [ '.c' ],
'c': [ '.o' ],
- 'pm.i': [ '.pm.c', '.pm' ],
- 'pm.c': [ '.pm.o' ],
# 'java': [ '.class' ],
'mx.in': [ '.mx' ],
#'tex': [ '.html', '.dvi', '.pdf' ],
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -377,11 +377,6 @@
if dext in ("c", "yy.c", "tab.c"):
fd.write('\t$(CC) $(CFLAGS) $(%s_CFLAGS) $(GENDLL) -DLIB%s
-Fo"%s" -c "%s"\n' %
(split_filename(msc_basename(src))[0], name, t, src))
- if ext == 'pm' and deplist[0].endswith('.pm.i'):
- fd.write('\t$(SWIG) -perl $(SWIGFLAGS) -outdir . -o dummy.c "%s"\n' %
src)
- fd.write('\t$(DEL) dummy.c\n')
- if ext == 'pm.c' and deplist[0].endswith('.pm.i'):
- fd.write('\t$(SWIG) -perl $(SWIGFLAGS) -outdir . -o "$@" "%s"\n' % src)
if ext == 'res':
fd.write("\t$(RC) -fo%s %s\n" % (t, src))
diff --git a/buildtools/conf/rules.mk b/buildtools/conf/rules.mk
--- a/buildtools/conf/rules.mk
+++ b/buildtools/conf/rules.mk
@@ -65,24 +65,6 @@
$(MX) $(MXFLAGS) -l -x sh $<
chmod a+x $@
-# The following rules generate two files using swig, the .xx.c and the
-# .xx file. There may be a race condition here when using a parallel
-# make. We try to alleviate the problem by sending the .xx.c output
-# to a dummy file in the second rule.
-# We also make sure that "$(CONFIG_H)" is included first, also with
-# swig-generated files. This is crucial to prevent inconsistent
-# (re-)definitions of macros.
-%.pm.c: %.pm.i
- $(SWIG) -perl5 $(SWIGFLAGS) -outdir . -o $@ $<
- $(MV) $@ $@.tmp
- echo '#include <'"$(CONFIG_H)"'>' > $@
- grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' $@.tmp >> $@
- $(RM) $@.tmp
-
-%.pm: %.pm.i
- $(SWIG) -perl5 $(SWIGFLAGS) -outdir . -o dummy.c $<
- $(RM) dummy.c
-
%.tex: %.mx
$(MX) -1 -H$(HIDE) -t $<
@@ -119,7 +101,3 @@
$(CP) $< $@
SUFFIXES-local: $(BUILT_SOURCES)
-
-distdir: check_dist
-check_dist:
- @if [ "$(SWIG)" = "no" ]; then echo "Cannot create distribution because
one of the necessary programs or libraries is missing"; echo "swig =
$(SWIG)"; exit 1; fi
diff --git a/buildtools/doc/HowToRelease.rst b/buildtools/doc/HowToRelease.rst
--- a/buildtools/doc/HowToRelease.rst
+++ b/buildtools/doc/HowToRelease.rst
@@ -112,13 +112,11 @@
Use these ``nmake`` options for a 32 bit compile: ``NDEBUG=1
HAVE_JAVA=1 HAVE_JAVAJDBC=1 HAVE_PYTHON=1 HAVE_PHP=1 HAVE_PCRE=1
- HAVE_MONETDB5=1 HAVE_PERL=1 HAVE_PERL_SWIG=1 HAVE_PERL_DEVEL=1
- HAVE_LIBXML2=1 HAVE_MONETDB5_XML=1``
+ HAVE_MONETDB5=1 HAVE_PERL=1 HAVE_LIBXML2=1 HAVE_MONETDB5_XML=1``
Use these ``nmake`` options for a 64 bit compile: ``bits=64 NDEBUG=1
HAVE_MONETDB5=1 HAVE_JAVA=1 HAVE_JAVAJDBC=1 HAVE_PYTHON=1 HAVE_PCRE=1
- HAVE_PERL=1 HAVE_PERL_SWIG=1 HAVE_PERL_DEVEL=1 HAVE_LIBXML2=1
- HAVE_MONETDB5_XML=1``
+ HAVE_PERL=1 HAVE_LIBXML2=1 HAVE_MONETDB5_XML=1``
- Create PGP signatures and SHA1 checksums::
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -536,9 +536,7 @@
We have used ActiveState__'s ActivePerl__ distribution (release
5.12.1.1201). Just install the 32 or 64 bit version and compile the
-clients component with the additional ``nmake`` flags ``HAVE_PERL=1
-HAVE_PERL_DEVEL=1 HAVE_PERL_SWIG=1`` (the latter flag only if SWIG_ is
-also installed).
+clients component with the additional ``nmake`` flags ``HAVE_PERL=1``.
__ http://www.perl.org/
__ http://www.activestate.com/
@@ -559,18 +557,6 @@
__ http://www.php.net/
-.. _SWIG:
-
-SWIG (Simplified Wrapper and Interface Generator)
--------------------------------------------------
-
-We use SWIG__ to build interface files for Perl. You can download
-SWIG from http://www.swig.org/download.html. Get the latest swigwin
-ZIP file and extract it somewhere. It contains the ``swig.exe``
-binary.
-
-__ http://www.swig.org/
-
Java
----
@@ -704,8 +690,6 @@
set Path=%JAVA_HOME%\bin;%ProgramFiles%\Java\jre1.5.0_16\bin;%Path%
rem Apache Ant is optional, but required for Java compilation
set Path=%ProgramFiles%\apache-ant-1.7.1\bin;%Path%
- rem SWIG is optional
- set Path=%ProgramFiles%\swigwin-1.3.36;%Path%
For testing purposes it may be handy to add some more folders to the
``Path``. This includes the ``bin`` and ``lib`` folders of the
@@ -757,10 +741,6 @@
- ``HAVE_RAPTOR=1`` - the raptor library is available;
- ``HAVE_OPENSSL=1`` - the OpenSSL library is available;
- ``HAVE_PERL=1`` - Perl is available;
-- ``HAVE_PERL_DEVEL=1`` - Perl development is possible (include files
- and libraries are available--also need ``HAVE_PERL=1``);
-- ``HAVE_PERL_SWIG=1`` - Perl development is possible and SWIG is
- available (also need ``HAVE_PERL=1``);
- ``HAVE_PHP=1`` - PHP is available.
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
