Changeset: 2c2cccc845e1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2c2cccc845e1
Modified Files:
NT/monetdb_config.h.in
buildtools/Mx/Code.c
buildtools/Mx/Def.c
buildtools/Mx/Form.c
buildtools/Mx/Mx.c
buildtools/Mx/Mx.h
buildtools/autogen/autogen/codegen.py
buildtools/autogen/autogen/msc.py
buildtools/conf/rules.mk
template/conf/Tests/monetdb-template-conds.stable.out.32bit
template/conf/Tests/monetdb-template-conds.stable.out.64bit
template/conf/Tests/monetdb-template-conds.stable.out.Debian4.0.32bit
template/conf/Tests/monetdb-template-conds.stable.out.SunOS5.11.32bit
template/conf/monetdb-template-config.in
Branch: Aug2011
Log Message:
SWIG is not used anymore.
Apparently it is hard to use grep. ;-)
diffs (212 lines):
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/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) $@ [email protected]
- echo '#include <'"$(CONFIG_H)"'>' > $@
- grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' [email protected] >> $@
- $(RM) [email protected]
-
-%.pm: %.pm.i
- $(SWIG) -perl5 $(SWIGFLAGS) -outdir . -o dummy.c $<
- $(RM) dummy.c
-
%.tex: %.mx
$(MX) -1 -H$(HIDE) -t $<
diff --git a/template/conf/Tests/monetdb-template-conds.stable.out.32bit
b/template/conf/Tests/monetdb-template-conds.stable.out.32bit
--- a/template/conf/Tests/monetdb-template-conds.stable.out.32bit
+++ b/template/conf/Tests/monetdb-template-conds.stable.out.32bit
@@ -21,7 +21,6 @@
HAVE_PCRE=#
HAVE_PERL_DEVEL=#
HAVE_PERL=#
-HAVE_PERL_SWIG=#
HAVE_PYTHON=#
HAVE_RUBYGEM=#
LINK_STATIC=
diff --git a/template/conf/Tests/monetdb-template-conds.stable.out.64bit
b/template/conf/Tests/monetdb-template-conds.stable.out.64bit
--- a/template/conf/Tests/monetdb-template-conds.stable.out.64bit
+++ b/template/conf/Tests/monetdb-template-conds.stable.out.64bit
@@ -21,7 +21,6 @@
HAVE_PCRE=#
HAVE_PERL_DEVEL=#
HAVE_PERL=#
-HAVE_PERL_SWIG=#
HAVE_PYTHON=#
HAVE_RUBYGEM=#
LINK_STATIC=
diff --git
a/template/conf/Tests/monetdb-template-conds.stable.out.Debian4.0.32bit
b/template/conf/Tests/monetdb-template-conds.stable.out.Debian4.0.32bit
--- a/template/conf/Tests/monetdb-template-conds.stable.out.Debian4.0.32bit
+++ b/template/conf/Tests/monetdb-template-conds.stable.out.Debian4.0.32bit
@@ -21,7 +21,6 @@
HAVE_PCRE=#
HAVE_PERL_DEVEL=#
HAVE_PERL=#
-HAVE_PERL_SWIG=#
HAVE_PYTHON=#
HAVE_RUBYGEM=#
LINK_STATIC=
diff --git
a/template/conf/Tests/monetdb-template-conds.stable.out.SunOS5.11.32bit
b/template/conf/Tests/monetdb-template-conds.stable.out.SunOS5.11.32bit
--- a/template/conf/Tests/monetdb-template-conds.stable.out.SunOS5.11.32bit
+++ b/template/conf/Tests/monetdb-template-conds.stable.out.SunOS5.11.32bit
@@ -21,7 +21,6 @@
HAVE_PCRE=
HAVE_PERL_DEVEL=#
HAVE_PERL=#
-HAVE_PERL_SWIG=#
HAVE_PYTHON=#
HAVE_RUBYGEM=#
LINK_STATIC=
diff --git a/template/conf/monetdb-template-config.in
b/template/conf/monetdb-template-config.in
--- a/template/conf/monetdb-template-config.in
+++ b/template/conf/monetdb-template-config.in
@@ -95,7 +95,6 @@
echo HAVE_PCRE=@HAVE_PCRE_FALSE@
echo HAVE_PERL_DEVEL=@HAVE_PERL_DEVEL_FALSE@
echo HAVE_PERL=@HAVE_PERL_FALSE@
- echo HAVE_PERL_SWIG=@HAVE_PERL_SWIG_FALSE@
echo HAVE_PYTHON=@HAVE_PYTHON_FALSE@
echo HAVE_RUBYGEM=@HAVE_RUBYGEM_FALSE@
echo LINK_STATIC=@LINK_STATIC_FALSE@
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
