Changeset: 9f229b7a0086 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f229b7a0086
Modified Files:
.hgignore
NT/rules.msc
buildtools/autogen/autogen/am.py
buildtools/autogen/autogen/codegen.py
buildtools/autogen/autogen/filesplit.py
buildtools/autogen/autogen/msc.py
buildtools/conf/rules.mk
Branch: Nov2019
Log Message:
Removed old cruft.
diffs (173 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -49,7 +49,6 @@ sql/backends/monet5/UDF/capi/cheader.tex
.#*
# files generated by compilers
-lex.yy.c
*.tab.c
*.tab.h
.libs
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -187,7 +187,6 @@ libpy3_CFLAGS = -DHAVE_LIBPY3 "-I$(PYTHO
# here we let %Path% determine which version we get
PYTHON = python
YACC = bison
-LEX = flex
ARCHIVER = lib /nologo
GENDLL =
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
@@ -19,7 +19,7 @@ from filesplit import split_filename, rs
# 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', 'pm.i', 'syms', 't', 'y']
+buildtools_ext = ['syms', 'y']
am_assign = "+="
@@ -563,7 +563,7 @@ def am_binary(fd, var, binmap, am):
if ext in scripts_ext:
if target not in SCRIPTS:
SCRIPTS.append(target)
- elif ext in ('o', 'glue.o', 'tab.o', 'yy.o'):
+ elif ext in ('o', 'tab.o'):
dist, src = am_find_srcs(target, binmap['DEPS'], am, cond)
if src in binmap['SOURCES']:
dist = True
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
@@ -21,25 +21,15 @@ from filesplit import split_filename
# direct rules
code_gen = {'y': [ '.tab.c', '.tab.h' ],
'tab.c': [ '.tab.o' ],
- 'l': [ '.yy.c', '.yy.h' ],
- 'yy.c': [ '.yy.o' ],
'mt': [ '.symbols.h', '.c' ],
- 'brg': [ '.c' ],
't': [ '.c' ],
'c': [ '.o' ],
- 'cpp': [ '.o' ],
-# 'java': [ '.class' ],
- #'tex': [ '.html', '.dvi', '.pdf' ],
- #'dvi': [ '.ps' ],
- #'fig': [ '.eps' ],
- #'feps': [ '.eps' ],
'in': [ '' ],
'1.in': [ '.1' ], # TODO: add more manpage sections as needed
'cfg.in': [ '.cfg' ],
'java.in': [ '.java' ],
'mal.in': [ '.mal' ],
'py.in': [ '.py' ],
- 'pl.in': [ '.pl' ],
'bat.in': [ '.bat' ],
'mt.sed': [ '.mt' ],
'c.sed': [ '.c' ],
@@ -69,15 +59,8 @@ t_inc = re.compile(t_inc, re.MULTILINE)
scan_map = {
'c': [ c_inc, None, '' ],
- 'cpp': [ c_inc, None, '' ],
'h': [ c_inc, None, '' ],
'y': [ c_inc, None, '' ],
- 'l': [ c_inc, None, '' ],
- 'mt': [ c_inc, None, '' ],
- 'brg': [ c_inc, None, '' ],
- 't': [ t_inc, None, '' ],
- 'xsl': [ xsl_inc, None, '' ],
- 'tex': [ tex_inc, None, '' ],
}
def readfile(f):
diff --git a/buildtools/autogen/autogen/filesplit.py
b/buildtools/autogen/autogen/filesplit.py
--- a/buildtools/autogen/autogen/filesplit.py
+++ b/buildtools/autogen/autogen/filesplit.py
@@ -13,7 +13,7 @@ def rsplit_filename(f):
return f[:s], f[s+1:]
return base, ext
-automake_ext = ['', 'c', 'cpp', 'def', 'h', 'lo', 'o', 'pm.c', 'tab.c',
'tab.h', 'yy.c', 'pm.i']
+automake_ext = set(['', 'c', 'def', 'h', 'lo', 'o', 'tab.c', 'tab.h'])
automake_extra_extensions = set([rsplit_filename(x)[1] for x in automake_ext
if '.' in x])
extra_extensions = ['in', 'bat', 'sed']
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
@@ -332,16 +332,13 @@ def msc_dep(fd, tar, deplist, msc):
x, de = split_filename(deplist[0])
of = b + '.' + de
fd.write('\t$(YACC) $(YFLAGS) $(AM_YFLAGS) "%s"\n' % of)
- elif ext == "yy.c":
- fd.write(getsrc)
- fd.write('\t$(LEX) $(LFLAGS) $(AM_LFLAGS) "%s.l"\n' % b)
- elif ext in ("obj", "tab.obj", "yy.obj"):
+ elif ext in ("obj", "tab.obj"):
target, name = msc_find_target(tar, msc)
if name[0] == '_':
name = name[1:]
if target == "LIB":
d, dext = split_filename(deplist[0])
- if dext in ("c", "cpp", "yy.c", "tab.c"):
+ if dext in ("c", "tab.c"):
fd.write('\t$(CC) /EHsc $(CFLAGS) $(%s_CFLAGS) $(GENDLL)
-D_CRT_SECURE_NO_WARNINGS -DLIB%s "-Fo%s" -c "%s"\n' %
(split_filename(msc_basename(src))[0], name, t, src))
elif ext == 'res':
@@ -569,8 +566,6 @@ def msc_binary(fd, var, binmap, msc):
srcs = srcs + " " + t + ".obj"
elif ext == "tab.o":
srcs = srcs + " " + t + ".tab.obj"
- elif ext == "yy.o":
- srcs = srcs + " " + t + ".yy.obj"
elif ext == 'def':
srcs = srcs + ' ' + target
elif ext == 'res':
@@ -665,8 +660,6 @@ def msc_bins(fd, var, binsmap, msc):
srcs = srcs + " " + t + ".obj"
elif ext == "tab.o":
srcs = srcs + " " + t + ".tab.obj"
- elif ext == "yy.o":
- srcs = srcs + " " + t + ".yy.obj"
elif ext == 'res':
srcs = srcs + " " + t + ".res"
elif ext in hdrs_ext:
@@ -809,10 +802,6 @@ def msc_library(fd, var, libmap, msc):
srcs = srcs + " " + t + ".obj"
elif ext == "tab.o":
srcs = srcs + " " + t + ".tab.obj"
- elif ext == "yy.o":
- srcs = srcs + " " + t + ".yy.obj"
- elif ext == "pm.o":
- srcs = srcs + " " + t + ".pm.obj"
elif ext == 'res':
srcs = srcs + " " + t + ".res"
elif ext in hdrs_ext:
diff --git a/buildtools/conf/rules.mk b/buildtools/conf/rules.mk
--- a/buildtools/conf/rules.mk
+++ b/buildtools/conf/rules.mk
@@ -23,18 +23,6 @@ MV=mv
[ ! -f y.tab.c ] || $(RM) y.tab.c
$(RM) waiting
-%.yy.c: %.l
- touch waiting.$$$$ && until ln waiting.$$$$ waiting 2>/dev/null; do
sleep 1; done && rm waiting.$$$$
- $(LEX) $(LFLAGS) $(AM_LFLAGS) $< || { $(RM) waiting ; exit 1 ; }
- [ -f $*.yy.h ] && $(RM) $*.yy.h
- $(RM) waiting
-
-%.yy.h: %.l
- touch waiting.$$$$ && until ln waiting.$$$$ waiting 2>/dev/null; do
sleep 1; done && rm waiting.$$$$
- $(LEX) $(LFLAGS) $(AM_LFLAGS) $< || { $(RM) waiting ; exit 1 ; }
- [ -f $*.yy.c ] && $(RM) $*.yy.c
- $(RM) waiting
-
%.def: %.syms
case `(uname -s) 2> /dev/null || echo unknown` in CYGWIN*) cat $<;; *)
sed '/DllMain/d;s/=.*//' $<;; esac > $@
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
