From: helly Date: Sun, 14 Mar 2004 12:54:19 +0000 (+0000) Subject: Next step of autogen patch X-Git-Tag: 0.13.6~732 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49cceca325b0b63719cd7d27cf412beae2ad2cba;p=re2c Next step of autogen patch --- diff --git a/.cvsignore b/.cvsignore index 3b2c6cfc..45757e9c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -10,7 +10,6 @@ README aclocal.m4 Makefile Makefile.in -makerpm config.h.in config.status config.log @@ -19,15 +18,20 @@ config.guess config.h depcomp compile +makerpm missing mkinstalldirs +stamp-h stamp-h1 stamp-h.in parser.cc scanner.cc -version.h y.tab.c y.tab.h +version.h +*.tar.gz +*.tar.bz2 +*.zip *~ *.o *.spec diff --git a/Makefile.am b/Makefile.am index f5998f89..4a31c8cc 100755 --- a/Makefile.am +++ b/Makefile.am @@ -4,28 +4,32 @@ bin_PROGRAMS = re2c re2c_SOURCES = code.cc dfa.cc main.cc parser.cc actions.cc scanner.re substr.cc\ translate.cc scanner.cc include_HEADERS=basics.h dfa.h globals.h ins.h parser.h re.h scanner.h \ - substr.h token.h version.h -man_MANS = re2c.1 + substr.h token.h +man_MANS = re2c.1 CXXFLAGS = -O2 -Wall -I. -Wno-unused -Wno-parentheses -Wno-deprecated YFLAGS = -d RE2C = re2c -RE2CFLAGS = -CLEANFILES = y.tab.c y.tab.h parser.cc re2c.1 version.h .version \ -DISTCLEANFILES = makerpm re2c*.spec README scanner.cc re2c -EXTRA_DIST = $(man_MANS) README parser.y scanner.re +RE2CFLAGS = -s +CLEANFILES = parser.cc y.tab.c y.tab.h parser.cc re2c.1 .version \ +DISTCLEANFILES = makerpm re2c.spec README scanner.cc re2c +EXTRA_DIST = $(man_MANS) README parser.y scanner.re makerpm.in re2c.spec.in \ + README.in y.tab.h \ + examples/basemmap.c examples/c.re examples/cmmap.re \ + examples/cnokw.re examples/cunroll.re examples/modula.re \ + examples/sample.re examples/simple.re examples/rexx/README \ + examples/rexx/rexx.l examples/rexx/scanio.c doc/loplas.ps \ + doc/sample.bib website/index.html rpm-files: $(bin_PROGRAMS) $(EXTRA_DIST) -main.cc: version.h - -parser.cc: version.h parser.y +parser.cc: parser.y $(YACC) $(YFLAGS) parser.y mv -f y.tab.c parser.cc scanner.cc: scanner.re -@if test -x ./re2c; then \ - echo "re2c -s $< >$@"; \ - ./re2c -s $< >$@; \ + echo "re2c $(RE2CFLAGS) $< >$@"; \ + ./re2c $(RE2CFLAGS) $< >$@; \ else \ echo "cp -f bootstrap/$@ $@"; \ cp -f bootstrap/$@ $@; \ @@ -36,7 +40,3 @@ re2c.ps: .version: echo $(PACKAGE_VERSION) > .version - -version.h: - echo "#define RE2C_VERSION \"$(PACKAGE_VERSION)\"" > version.h - diff --git a/configure.in b/configure.in index 086bab1f..182a07f8 100644 --- a/configure.in +++ b/configure.in @@ -51,6 +51,6 @@ AC_CHECK_TYPE([ulong], [ AC_DEFINE([HAVE_ULONG], [1], [Define to 1 if you have ulong type definition]) ]) -AC_CONFIG_FILES([Makefile README makerpm re2c.1]) +AC_CONFIG_FILES([Makefile README makerpm re2c.1 re2c.spec]) AC_OUTPUT_COMMANDS([chmod +x makerpm]) AC_OUTPUT diff --git a/main.cc b/main.cc index d6af6aae..901e3454 100644 --- a/main.cc +++ b/main.cc @@ -12,7 +12,6 @@ #include "globals.h" #include "parser.h" #include "dfa.h" -#include "version.h" char *fileName; bool sFlag = false; diff --git a/makerpm.in b/makerpm.in index 40ef3796..b5a8ab3a 100644 --- a/makerpm.in +++ b/makerpm.in @@ -7,7 +7,6 @@ PREFIX="@PACKAGE_NAME@" VERSION="@PACKAGE_VERSION@" TARDIR="`basename \`pwd\``" RELEASE=${1:-1} -#VERSION=${2:-`echo $TARDIR | sed "s/$PREFIX-//g"`} echo "Usage:" echo "$0 " @@ -18,69 +17,8 @@ echo -n "Building RPM version $VERSION, release: $RELEASE " sleep 1 ; echo -n . ; sleep 1 ; echo -n . ; sleep 1 ; echo -n . echo -TAR=$PREFIX-$VERSION.tar.gz -SPEC=$PREFIX-$VERSION.spec - -# write out the .spec file -sed -e "s/RPMVERSION/$VERSION/g" \ - -e "s/RPMRELEASE/$RELEASE/g" \ - -e "s/RPMTARDIR/$TARDIR/g" \ - > $SPEC <<'EOF' -Summary: re2c - A tool for generating C-based recognizers from regular expressions -Name: re2c -Version: RPMVERSION -Release: RPMRELEASE -Group: Development -License: public domain -URL: http://sourceforge.net/projects/re2c/ -Source: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-root - -%description -re2c is a great tool for writing fast and flexible lexers. It has -served many people well for many years and it deserves to be -maintained more actively. re2c is on the order of 2-3 times faster -than a flex based scanner, and its input model is much more -flexible. - -%prep -%setup -q -n RPMTARDIR - -%build -./autogen.sh -./configure \ - --prefix=%{_prefix} \ - -make re2c -#regenerate file scanner.cc -rm -f scanner.cc -make scanner.cc -#regenerate re2c itself -rm -f re2c -make rpm-files - -%install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_bindir} -install -m 0755 re2c $RPM_BUILD_ROOT%{_bindir} - -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -install -m 0755 re2c.1 $RPM_BUILD_ROOT%{_mandir}/man1 - -%clean -rm -rf $RPM_BUILD_ROOT - -%changelog -* Sun Jan 04 2003 Marcus Boerger -- Initial version. - -%files -%defattr(-,root,root) -%{_bindir}/re2c -%{_mandir}/man1/re2c.1* - -%doc README examples doc/* -EOF +TAR=@PACKAGE_TARNAME@-$VERSION.tar.gz +SPEC=re2c.spec RPMBASE=/usr/src/redhat for i in /usr/src/redhat /usr/src/packages /usr/src/RPM; do @@ -94,10 +32,8 @@ RPMDIR=${RPMBASE}/RPMS SPECDIR=${RPMBASE}/SPECS SRCDIR=${RPMBASE}/SOURCES -( -#./cvsclean.sh -cd .. -tar czvf ${SRCDIR}/${TAR} $TARDIR ) +make dist +cp $TAR $SRCDIR echo "CP: (`pwd`) cp -a $SPEC $SPECDIR/${SPEC}" cp -a $SPEC $SPECDIR/${SPEC} diff --git a/parser.y b/parser.y index e838a230..0d075fb7 100644 --- a/parser.y +++ b/parser.y @@ -32,7 +32,6 @@ #include "globals.h" #include "parser.h" -#include "version.h" extern "C" { @@ -192,7 +191,7 @@ void line_source(unsigned int line, ostream& o) void parse(int i, ostream &o){ - o << "/* Generated by re2c " RE2C_VERSION " on "; + o << "/* Generated by re2c " PACKAGE_VERSION " on "; time_t now = time(&now); o.write(ctime(&now), 24); o << " */\n"; diff --git a/re2c.1.in b/re2c.1.in index 58058c0a..49b1c3bc 100644 --- a/re2c.1.in +++ b/re2c.1.in @@ -1,12 +1,15 @@ ./" ./" $Id$ ./" -.TH RE2C 1 "8 April 1994" "Version @PACKAGE_VERSION@" +.TH RE2C 1 "14 March 1994" "Version @PACKAGE_VERSION@" .ds re \fBre2c\fP .ds le \fBlex\fP .ds rx regular expression .ds lx \fIl\fP-expression \"$Log$ +\"Revision 1.3 2004/03/14 12:54:19 helly +\"Next step of autogen patch +\" \"Revision 1.2 2004/03/13 20:35:12 helly \"Updated configure stuff \" diff --git a/re2c.spec.in b/re2c.spec.in new file mode 100644 index 00000000..cc70b550 --- /dev/null +++ b/re2c.spec.in @@ -0,0 +1,49 @@ +Summary: re2c - A tool for generating C-based recognizers from regular expressions +Name: @PACKAGE_NAME@ +Version: @PACKAGE_VERSION@ +Release: 1 +Group: Development +License: public domain +URL: http://sourceforge.net/projects/re2c/ +Source: %{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +re2c is a great tool for writing fast and flexible lexers. It has +served many people well for many years and it deserves to be +maintained more actively. re2c is on the order of 2-3 times faster +than a flex based scanner, and its input model is much more +flexible. + +%prep +%setup -q -n @PACKAGE_NAME@-@PACKAGE_VERSION@ + +%build +./configure \ + --prefix=%{_prefix} +make re2c +#regenerate file scanner.cc +rm -f scanner.cc +make + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_bindir} +install -m 0755 re2c $RPM_BUILD_ROOT%{_bindir} + +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +install -m 0755 re2c.1 $RPM_BUILD_ROOT%{_mandir}/man1 + +%clean +rm -rf $RPM_BUILD_ROOT + +%changelog +* Sun Jan 04 2003 Marcus Boerger +- Initial version. + +%files +%defattr(-,root,root) +%{_bindir}/re2c +%{_mandir}/man1/re2c.1* + +%doc README examples doc/*