yetangitu/recoll
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

submit to automake really wanting wasaparse.hpp not .h

Browse source
This commit is contained in:
Jean-Francois Dockes 2015-08-10 10:11:08 +02:00
parent ec8709af9b
commit 95e13d8cd5
5 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.hgignore
View file

@ -86,7 +86,7 @@ src/query/position.hh
src/query/recollq src/query/recollq
src/query/stack.hh src/query/stack.hh
src/query/wasaparse.cpp src/query/wasaparse.cpp
src/query/wasaparse.h src/query/wasaparse.hpp
src/sampleconf/rclmon.sh src/sampleconf/rclmon.sh
src/sampleconf/recoll.conf src/sampleconf/recoll.conf
src/utils/alldeps src/utils/alldeps

7
src/Makefile.am
View file

@ -73,7 +73,6 @@ common/textsplit.cpp \
common/textsplit.h \ common/textsplit.h \
common/unacpp.cpp \ common/unacpp.cpp \
common/unacpp.h \ common/unacpp.h \
common/unordered_defs.h \
common/uproplist.h \ common/uproplist.h \
index/beaglequeue.cpp \ index/beaglequeue.cpp \
index/beaglequeue.h \ index/beaglequeue.h \
@ -318,7 +317,6 @@ kde/kioslave/kio_recoll/recollf.protocol \
kde/kioslave/kio_recoll/recollnolist.protocol \ kde/kioslave/kio_recoll/recollnolist.protocol \
kde/kioslave/kio_recoll/recoll.protocol \ kde/kioslave/kio_recoll/recoll.protocol \
\ \
query/wasaparse.cpp query/wasaparse.hpp query/y.tab.h \
query/location.hh query/position.hh query/stack.hh \ query/location.hh query/position.hh query/stack.hh \
\ \
qtgui/advsearch.ui \ qtgui/advsearch.ui \
@ -561,3 +559,8 @@ doc/user/usermanual.html:
dist_man1_MANS = doc/man/recoll.1 doc/man/recollq.1 doc/man/recollindex.1 dist_man1_MANS = doc/man/recoll.1 doc/man/recollq.1 doc/man/recollindex.1
dist_man5_MANS = doc/man/recoll.conf.5 dist_man5_MANS = doc/man/recoll.conf.5
dist-hook:
if test ! -z "`hg status`";then echo Local directory is modified ; \
exit 1; fi
hg tag -f -m "Release $(VERSION) tagged" RECOLL-$(VERSION)

5
src/query/wasaparse.ypp
View file

@ -1,5 +1,6 @@
%{ %{
#define YYDEBUG 1 #define YYDEBUG 1
#include "autoconfig.h"
#include <stdio.h> #include <stdio.h>
@ -8,7 +9,7 @@
#include "searchdata.h" #include "searchdata.h"
#include "wasaparserdriver.h" #include "wasaparserdriver.h"
#include "wasaparse.h" #include "wasaparse.hpp"
using namespace std; using namespace std;
@ -27,7 +28,7 @@ static void qualify(Rcl::SearchDataClauseDist *, const string &);
static void addSubQuery(WasaParserDriver *d, static void addSubQuery(WasaParserDriver *d,
Rcl::SearchData *sd, Rcl::SearchData *sq) Rcl::SearchData *sd, Rcl::SearchData *sq)
{ {
sd->addClause(new Rcl::SearchDataClauseSub(RefCntr<Rcl::SearchData>(sq))); sd->addClause(new Rcl::SearchDataClauseSub(STD_SHARED_PTR<Rcl::SearchData>(sq)));
} }
%} %}

2
src/query/wasaparseaux.cpp
View file

@ -26,7 +26,7 @@
#define YYDEBUG 1 #define YYDEBUG 1
// bison-generated file // bison-generated file
#include "wasaparse.h" #include "wasaparse.hpp"
using namespace std; using namespace std;
using namespace Rcl; using namespace Rcl;

9
src/ylwrap
View file

@ -42,13 +42,16 @@ for f in location.hh position.hh stack.hh; do
cmp -s "${tmpdir}"/$f "${inputdir}"/$f || cp -p "${tmpdir}"/$f "${inputdir}" cmp -s "${tmpdir}"/$f "${inputdir}"/$f || cp -p "${tmpdir}"/$f "${inputdir}"
done done
# Note that we'd prefer to use wasaparse.h instead of wasaparse.hpp,
# but automake generates a dist list with wasaparse.hpp, so no choice.
# Fix the include line in y.tab.c (it wants to include y.tab.h, but we already # Fix the include line in y.tab.c (it wants to include y.tab.h, but we already
# include it as wasaparse.h # include it as wasaparse.hpp
(cd "${tmpdir}"; \ (cd "${tmpdir}"; \
sed -e 's/#include "y.tab.h"//' < y.tab.c > toto; \ sed -e 's/#include "y.tab.h"//' < y.tab.c > toto; \
mv -f toto y.tab.c) mv -f toto y.tab.c)
cmp -s "${tmpdir}"/y.tab.c "${inputdir}"/wasaparse.cpp || \ cmp -s "${tmpdir}"/y.tab.c "${inputdir}"/wasaparse.cpp || \
cp -p "${tmpdir}"/y.tab.c "${inputdir}"/wasaparse.cpp cp -p "${tmpdir}"/y.tab.c "${inputdir}"/wasaparse.cpp
cmp -s "${tmpdir}"/y.tab.h "${inputdir}"/wasaparse.h || \ cmp -s "${tmpdir}"/y.tab.h "${inputdir}"/wasaparse.hpp || \
cp -p "${tmpdir}"/y.tab.h "${inputdir}"/wasaparse.h cp -p "${tmpdir}"/y.tab.h "${inputdir}"/wasaparse.hpp