Changeset: 40cbca3cb16f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=40cbca3cb16f
Modified Files:
Branch: default
Log Message:
Merge with Mar2011 branch.
diffs (199 lines):
diff --git a/buildtools/Mx/Code.c b/buildtools/Mx/Code.c
--- a/buildtools/Mx/Code.c
+++ b/buildtools/Mx/Code.c
@@ -90,7 +90,6 @@
case Java:
case fGrammar:
case Macro:
- case Tcl:
case XML:
case DTD:
case XSL:
@@ -390,7 +389,6 @@
case fGrammar:
ofile_printf("\n/* %s:%d */\n", mx_file, mx_line);
break;
- case Tcl:
case Config:
ofile_printf("\n# %s:%d \n", mx_file, mx_line);
break;
diff --git a/buildtools/Mx/Def.c b/buildtools/Mx/Def.c
--- a/buildtools/Mx/Def.c
+++ b/buildtools/Mx/Def.c
@@ -309,7 +309,6 @@
case OQLspec:
case SQL:
case Java:
- case Tcl:
case Qnap:
case ProC:
case Shell:
diff --git a/buildtools/Mx/Form.c b/buildtools/Mx/Form.c
--- a/buildtools/Mx/Form.c
+++ b/buildtools/Mx/Form.c
@@ -203,9 +203,6 @@
case Qnap:
PrCodeDisplay(d, "qnp");
break;
- case Tcl:
- PrCodeDisplay(d, "tcl");
- break;
case Java:
PrCodeDisplay(d, "java");
break;
diff --git a/buildtools/Mx/Mx.c b/buildtools/Mx/Mx.c
--- a/buildtools/Mx/Mx.c
+++ b/buildtools/Mx/Mx.c
@@ -202,7 +202,6 @@
{"mil", MILcode, "mil",},
{"w", HTML, "www",},
{"java", Java, "java",},
- {"tcl", Tcl, "tcl",},
{"Qnap", Qnap, "qnp",},
{"pc", ProC, "pc",},
{"sh", Shell, "",},
@@ -266,7 +265,6 @@
{ MILcode, NULL, "#", NULL},
{ HTML, "<!--", NULL, "-->"},
{ Java, NULL, "//", NULL},
- { Tcl, NULL, "#", NULL},
{ Shell, NULL, "#", NULL},
{ CCyacc, "/*", " *", " */"},
{ CClex, "/*", " *", " */"},
diff --git a/buildtools/Mx/Mx.h b/buildtools/Mx/Mx.h
--- a/buildtools/Mx/Mx.h
+++ b/buildtools/Mx/Mx.h
@@ -70,7 +70,7 @@
Pspec, Pimpl, Cdef, Csrc, CCsrc, ODLspec, SQL,
OQLspec, Cyacc, Clex, Prolog, Haskell, Monet, MALcode, MILcode,
Qnap, HTML, Java,
- Tcl, ProC, Shell, fGrammar, Macro, XML, DTD, XSL, Config, Swig,
+ ProC, Shell, fGrammar, Macro, XML, DTD, XSL, Config, Swig,
CCyacc, CClex
} CmdCode;
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -29,8 +29,7 @@
# buildtools/conf. The generated sources should therefore be included
# in the tar ball and not be removed with `make distclean' when
# running "in" said tar ball.
-buildtools_ext = ['brg', 'l', 'm', 'mx', 'php.i', 'pm.i', 'py.i',
- 'ruby.i', 'syms', 't', 'tcl.i', 'y']
+buildtools_ext = ['brg', 'l', 'm', 'mx', 'pm.i', 'syms', 't', 'y']
am_assign = "+="
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
@@ -39,7 +39,6 @@
mx2odl = re.compile("^@odl[ \t\r\n]+", re.MULTILINE)
mx2fgr = re.compile("^@fgr[ \t\r\n]+", re.MULTILINE)
mx2cfg = re.compile("^@cfg[ \t\r\n]+", re.MULTILINE)
-mx2tcl = re.compile("^@tcl[ \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)
@@ -63,7 +62,6 @@
(mx2odl, '.odl'),
(mx2cfg, '.cfg'),
(mx2fgr, '.fgr'),
- (mx2tcl, '.tcl'),
(mx2sql, '.sql'),
(mx2swig, '.i'),
(mx2java, '.java'),
@@ -86,7 +84,6 @@
(mx2odl, '.odl'),
(mx2fgr, '.fgr'),
(mx2cfg, '.cfg'),
- (mx2tcl, '.tcl'),
(mx2sql, '.sql'),
(mx2swig, '.i'),
(mx2java, '.java'),
@@ -113,12 +110,6 @@
't': [ '.c' ],
'c': [ '.o' ],
'cc': [ '.o' ], # C++
- 'ruby.i': [ '.ruby.c' ],
- 'ruby.c': [ '.ruby.o' ],
- 'tcl.i': [ '.tcl.c', '.tcl' ],
- 'php.i': [ '.php.c', '.php' ],
- 'py.i': [ '.py.c', '.py' ],
- 'py.c': [ '.py.o' ],
'pm.i': [ '.pm.c', '.pm' ],
'pm.c': [ '.pm.o' ],
'glue.c': [ '.glue.o' ],
diff --git a/buildtools/conf/fixlicense.py b/buildtools/conf/fixlicense.py
--- a/buildtools/conf/fixlicense.py
+++ b/buildtools/conf/fixlicense.py
@@ -150,7 +150,6 @@
'.sh': ('', '', '# ', ''),
'.sql': ('', '', '-- ', ''),
'.t': ('', '', '# ', ''),
- '.tcl': ('', '', '# ', ''),
'.xml': ('<!--', '-->', '', ''),
'.xq': ('(:', ':)', '', ''),
'.xs': ('/*', ' */', ' * ', ''),
diff --git a/buildtools/conf/rules.mk b/buildtools/conf/rules.mk
--- a/buildtools/conf/rules.mk
+++ b/buildtools/conf/rules.mk
@@ -173,39 +173,6 @@
# 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.
-%.tcl.c: %.tcl.i
- $(SWIG) -tcl $(SWIGFLAGS) -outdir . -o $@ $<
- $(MV) $@ $@.tmp
- echo '#include <'"$(CONFIG_H)"'>' > $@
- grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' $@.tmp >> $@
- $(RM) $@.tmp
-
-%.tcl: %.tcl.i
- $(SWIG) -tcl $(SWIGFLAGS) -outdir . -o dummy.c $<
- $(RM) dummy.c
-
-%.php.c: %.php.i
- $(SWIG) -php $(SWIGFLAGS) -outdir . -o $@ $<
- $(MV) $@ $@.tmp
- echo '#include <'"$(CONFIG_H)"'>' > $@
- grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' $@.tmp >> $@
- $(RM) $@.tmp
-
-%.php: %.php.i
- $(SWIG) -php $(SWIGFLAGS) -outdir . -o dummy.c $<
- $(RM) dummy.c
-
-%.py.c: %.py.i
- $(SWIG) -python $(SWIGFLAGS) -outdir . -o $@ $<
- $(MV) $@ $@.tmp
- echo '#include <'"$(CONFIG_H)"'>' > $@
- grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' $@.tmp >> $@
- $(RM) $@.tmp
-
-%.py: %.py.i
- $(SWIG) -python $(SWIGFLAGS) -outdir . -o dummy.c $<
- $(RM) dummy.c
-
%.pm.c: %.pm.i
$(SWIG) -perl5 $(SWIGFLAGS) -outdir . -o $@ $<
$(MV) $@ $@.tmp
@@ -217,17 +184,6 @@
$(SWIG) -perl5 $(SWIGFLAGS) -outdir . -o dummy.c $<
$(RM) dummy.c
-%.ruby.c: %.ruby.i
- $(SWIG) -ruby $(SWIGFLAGS) -outdir . -o $@ $<
- $(MV) $@ $@.tmp
- echo '#include <'"$(CONFIG_H)"'>' > $@
- grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' $@.tmp >> $@
- $(RM) $@.tmp
-
-%.ruby: %.ruby.i
- $(SWIG) -ruby $(SWIGFLAGS) -outdir . -o dummy.c $<
- $(RM) dummy.c
-
%.tex: %.mx
$(MX) -1 -H$(HIDE) -t $<
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
