Commit ee6ad848 authored by rousse_l's avatar rousse_l
Browse files

from Julien Roussel <spip@lrde.epita.fr>

	cxx-typecheck does compile and distcheck !

	* test/literals/test: Adjust.
	* src/typecheck/Makefile.am, src/strategotypedcxx/Makefile.am: Adjust.
	* src/syn/Makefile.am: Adjust. Do not use sdf-option anymore.
parent 3df95b4f
2004-05-07 Julien Roussel <spip@lrde.epita.fr>
cxx-typecheck does compile and distcheck !
* test/literals/test: Adjust.
* src/typecheck/Makefile.am, src/strategotypedcxx/Makefile.am: Adjust.
* src/syn/Makefile.am: Adjust. Do not use sdf-option anymore.
2004-05-04 Nicolas Pouillard <ertai@lrde.epita.fr> 2004-05-04 Nicolas Pouillard <ertai@lrde.epita.fr>
* configure.ac: Bug fix, boxed2sdf no more in boxedsdf. * configure.ac: Bug fix, boxed2sdf no more in boxedsdf.
......
...@@ -2,7 +2,7 @@ include $(top_srcdir)/config/Makefile.xt ...@@ -2,7 +2,7 @@ include $(top_srcdir)/config/Makefile.xt
PGEN_FLAGS = -m $* PGEN_FLAGS = -m $*
SDFINCLUDES = -I $(top_srcdir)/src/sdf \ SDFINCLUDES = -I $(top_builddir)/src/sdf \
-I $(CXX_GRAMMAR)/share/sdf/cxx-grammar -I $(CXX_GRAMMAR)/share/sdf/cxx-grammar
pkgdata_DATA = StrategoTypedCxx.def StrategoTypedCxx.tbl pkgdata_DATA = StrategoTypedCxx.def StrategoTypedCxx.tbl
......
...@@ -28,10 +28,10 @@ TypedCxx.pp: TypedCxx.ppdef.af ...@@ -28,10 +28,10 @@ TypedCxx.pp: TypedCxx.ppdef.af
TypedCxx.ppdef.af: $(SDFS) TypedCxx.sdf TypedCxx.ppdef.af: $(SDFS) TypedCxx.sdf
$(ESDF)/bin/pack-esdf -s BoxedSdf2 -of ast \ $(ESDF)/bin/pack-esdf -s BoxedSdf2 -of ast \
-I $(BOXEDSDF)/share/boxedsdf \
-I $(CXX_GRAMMAR)/share/sdf/cxx-grammar \ -I $(CXX_GRAMMAR)/share/sdf/cxx-grammar \
-I $(top_srcdir)/src/syn \ -I $(top_srcdir)/src/syn \
-i $(top_srcdir)/src/syn/TypedCxx.sdf \ -i $(top_srcdir)/src/syn/TypedCxx.sdf \
| $(SDF_OPTION)/bin/sdf-option \
| $(SDF_TOOLS)/bin/sdf-cons -o $@ | $(SDF_TOOLS)/bin/sdf-cons -o $@
CLEANFILES = TypedCxx.def TypedCxx.tbl TypedCxx.pp TypedCxx.pp.af TypedCxx.ppdef TypedCxx.ppdef.af CLEANFILES = TypedCxx.def TypedCxx.tbl TypedCxx.pp TypedCxx.pp.af TypedCxx.ppdef TypedCxx.ppdef.af
...@@ -3,10 +3,11 @@ include $(top_srcdir)/config/Makefile.xt ...@@ -3,10 +3,11 @@ include $(top_srcdir)/config/Makefile.xt
SCFLAGS = --main io-$* --verbose 0 $(XTCFLAGS) SCFLAGS = --main io-$* --verbose 0 $(XTCFLAGS)
STRINCLUDES = -I $(CXX_GRAMMAR)/share/cxx-grammar \ STRINCLUDES = -I $(CXX_GRAMMAR)/share/cxx-grammar \
-I $(top_srcdir)/src/strategotypedcxx \ -I $(top_builddir)/src/strategotypedcxx \
-I $(top_srcdir)/src/sig -I $(top_builddir)/src/sig \
-I $(srcdir)
bin_PROGRAMS = cxx-typecheck bin_PROGRAMS = cxx-typecheck
SRCS = cxx-typecheck.str Constant.str SRCS = cxx-typecheck.str Constant.str
EXTRA_DIST = $(SRCS) EXTRA_DIST = $(SRCS) Constant.meta
nodist_cxx_typecheck_SOURCES = cxx-typecheck.c nodist_cxx_typecheck_SOURCES = cxx-typecheck.c
CLEANFILES = cxx-typecheck.{c.dep,c} Constant.{c.dep,c} CLEANFILES = cxx-typecheck.{c.dep,c} Constant.{c.dep,c}
#! /bin/sh #! /bin/sh
if ! make SRC="$0.cc" parse-typedcxx &> /dev/null; then if ! make SRC="$SRCDIR/$0.cc" parse-typedcxx &> /dev/null; then
echo "$0.cc: parse-typedcxx failed" >> log echo "$0.cc: parse-typedcxx failed" >> log
cat typedcxx-out >> log cat typedcxx-out >> log
rm -f typedcxx-out rm -f typedcxx-out
...@@ -15,7 +15,7 @@ if ! ../../src/typecheck/cxx-typecheck -i typedcxx-out -o cxx-out; then ...@@ -15,7 +15,7 @@ if ! ../../src/typecheck/cxx-typecheck -i typedcxx-out -o cxx-out; then
fi fi
rm -f typedcxx-out rm -f typedcxx-out
if ! make SRC="$0.typed.cc" parse-typedcxx &> /dev/null; then if ! make SRC="$SRCDIR/$0.typed.cc" parse-typedcxx &> /dev/null; then
echo "$0.typed.cc: parse-typedcxx failed" >> log echo "$0.typed.cc: parse-typedcxx failed" >> log
cat typedcxx-out >> log cat typedcxx-out >> log
rm -f typedcxx-out rm -f typedcxx-out
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment