tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix tarfile build script

Browse Source
This commit is contained in:
Jean-Francois Dockes 2012-12-29 15:21:16 +01:00
parent ff263394ae
commit ad665629fd
7 changed files with 91 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
.hgignore
View File

@ -20,43 +20,43 @@ src/desktop/unity-lens-recoll/data/recoll.lens
src/desktop/unity-lens-recoll/data/unity-lens-recoll.service src/desktop/unity-lens-recoll/data/unity-lens-recoll.service
src/doc/user/HTML.manifest src/doc/user/HTML.manifest
src/doc/user/index.html src/doc/user/index.html
src/doc/user/rcl.indexing.config.html src/doc/user/RCL.INDEXING.CONFIG.html
src/doc/user/rcl.indexing.html src/doc/user/RCL.INDEXING.html
src/doc/user/rcl.indexing.monitor.html src/doc/user/RCL.INDEXING.MONITOR.html
src/doc/user/rcl.indexing.periodic.html src/doc/user/RCL.INDEXING.PERIODIC.html
src/doc/user/rcl.indexing.storage.html src/doc/user/RCL.INDEXING.STORAGE.html
src/doc/user/rcl.indexing.webqueue.html src/doc/user/RCL.INDEXING.WEBQUEUE.html
src/doc/user/rcl.install.building.html src/doc/user/RCL.INSTALL.BUILDING.html
src/doc/user/rcl.install.config.html src/doc/user/RCL.INSTALL.CONFIG.html
src/doc/user/rcl.install.external.html src/doc/user/RCL.INSTALL.EXTERNAL.html
src/doc/user/rcl.install.html src/doc/user/RCL.INSTALL.html
src/doc/user/rcl.introduction.html src/doc/user/RCL.INTRODUCTION.html
src/doc/user/rcl.introduction.recoll.html src/doc/user/RCL.INTRODUCTION.RECOLL.html
src/doc/user/rcl.introduction.search.html src/doc/user/RCL.INTRODUCTION.SEARCH.html
src/doc/user/rcl.kicker-applet.html src/doc/user/RCL.KICKER-APPLET.html
src/doc/user/rcl.program.api.html src/doc/user/RCL.PROGRAM.API.html
src/doc/user/rcl.program.fields.html src/doc/user/RCL.PROGRAM.FIELDS.html
src/doc/user/rcl.program.html src/doc/user/RCL.PROGRAM.html
src/doc/user/rcl.search.anchorwild.html src/doc/user/RCL.SEARCH.ANCHORWILD.html
src/doc/user/rcl.search.casediac.html src/doc/user/RCL.SEARCH.CASEDIAC.html
src/doc/user/rcl.search.commandline.html src/doc/user/RCL.SEARCH.COMMANDLINE.html
src/doc/user/rcl.search.complex.html src/doc/user/RCL.SEARCH.COMPLEX.html
src/doc/user/rcl.search.custom.html src/doc/user/RCL.SEARCH.CUSTOM.html
src/doc/user/rcl.search.desktop.html src/doc/user/RCL.SEARCH.DESKTOP.html
src/doc/user/rcl.search.history.html src/doc/user/RCL.SEARCH.HISTORY.html
src/doc/user/rcl.search.html src/doc/user/RCL.SEARCH.html
src/doc/user/rcl.search.kio.html src/doc/user/RCL.SEARCH.KIO.html
src/doc/user/rcl.search.lang.html src/doc/user/RCL.SEARCH.LANG.html
src/doc/user/rcl.search.multidb.html src/doc/user/RCL.SEARCH.MULTIDB.html
src/doc/user/rcl.search.preview.html src/doc/user/RCL.SEARCH.PREVIEW.html
src/doc/user/rcl.search.reslist.html src/doc/user/RCL.SEARCH.RESLIST.html
src/doc/user/rcl.search.sort.html src/doc/user/RCL.SEARCH.SORT.html
src/doc/user/rcl.search.termexplorer.html src/doc/user/RCL.SEARCH.TERMEXPLORER.html
src/doc/user/rcl.search.tips.html src/doc/user/RCL.SEARCH.TIPS.html
src/doc/user/rcl.search.wildcards.html src/doc/user/RCL.SEARCH.WILDCARDS.html
src/doc/user/rcl.searchkcl.html src/doc/user/RCL.SEARCHKCL.html
src/doc/user/rcl.searchkio.html src/doc/user/RCL.SEARCHKIO.html
src/doc/user/rcl.searchkio.searchabledocs.html src/doc/user/RCL.SEARCHKIO.SEARCHABLEDOCS.html
src/doc/user/usermanual-xml.html src/doc/user/usermanual-xml.html
src/doc/user/usermanual.aux src/doc/user/usermanual.aux
src/doc/user/usermanual.html src/doc/user/usermanual.html

4
src/Makefile.in
View File

@ -49,6 +49,7 @@ clean:
rm -rf qtgui/.moc qtgui/.ui qtgui/confgui/.moc qtgui/confgui/.ui rm -rf qtgui/.moc qtgui/.ui qtgui/confgui/.moc qtgui/confgui/.ui
rm -rf qtgui/.obj qtgui/.moc qtgui/.ui rm -rf qtgui/.obj qtgui/.moc qtgui/.ui
rm -rf python/recoll/build rm -rf python/recoll/build
rm -rf php/recoll/build php/recoll/include php/recoll/modules
rm -rf $(QTGUI)/recoll.app rm -rf $(QTGUI)/recoll.app
# Note: we don't remove the top Makefile, to keep the "clean" targets # Note: we don't remove the top Makefile, to keep the "clean" targets
@ -62,7 +63,8 @@ distclean: clean
recollinstall \ recollinstall \
lib/*.dep common/autoconfig.h lib/*.dep common/autoconfig.h
rm -f common/rclversion.h rm -f common/rclversion.h
rm -f index/alldeps lib/alldeps query/alldeps bincimapmime/alldeps rm -f index/alldeps lib/alldeps query/alldeps \
bincimapmime/alldeps common/alldeps internfile/alldeps utils/alldeps
rm -rf autom4te.cache rm -rf autom4te.cache
maintainer-clean: distclean maintainer-clean: distclean

2
src/doc/user/Makefile Normal file
View File

@ -0,0 +1,2 @@
usermanual.html: usermanual.sgml
sh xmlmake.sh

2
src/lib/Makefile
View File

@ -180,7 +180,7 @@ iofactory.o : ../bincimapmime/iofactory.cc $(depth)/mk/localdefs
$(CXX) $(ALL_CXXFLAGS) -c ../bincimapmime/iofactory.cc $(CXX) $(ALL_CXXFLAGS) -c ../bincimapmime/iofactory.cc
depend: $(DEPS) depend: $(DEPS)
clean: clean:
rm -f $(OBJS) $(LIBS) $(DEPS) *.stamp rm -f $(OBJS) $(LIBS) $(DEPS) librecoll.so *.stamp
for i in *.dep;do test -f $$i && cp /dev/null $$i;done for i in *.dep;do test -f $$i && cp /dev/null $$i;done
distclean: clean distclean: clean
rm -f *.dep rm -f *.dep

2
src/lib/mkMake
View File

@ -153,7 +153,7 @@ done
cat >> $mk <<EOF cat >> $mk <<EOF
depend: \$(DEPS) depend: \$(DEPS)
clean: clean:
rm -f \$(OBJS) \$(LIBS) \$(DEPS) *.stamp rm -f \$(OBJS) \$(LIBS) \$(DEPS) librecoll.so *.stamp
for i in *.dep;do test -f \$\$i && cp /dev/null \$\$i;done for i in *.dep;do test -f \$\$i && cp /dev/null \$\$i;done
distclean: clean distclean: clean
rm -f *.dep rm -f *.dep

20
src/makesrcdist.sh
View File

@ -29,7 +29,7 @@ tagtop() {
#set -x #set -x
TAR=/usr/bin/tar TAR=${TAR-/bin/tar}
#VCCMD=svn #VCCMD=svn
#SVNREPOS=svn+ssh://y/home/subversion/recoll/ #SVNREPOS=svn+ssh://y/home/subversion/recoll/
@ -123,10 +123,10 @@ EOF
echo "Dumping html documentation to text files" echo "Dumping html documentation to text files"
links -dump ${RECOLLDOC}/usermanual.html >> README links -dump ${RECOLLDOC}/usermanual.html >> README
links -dump ${RECOLLDOC}/rcl.install.html >> INSTALL links -dump ${RECOLLDOC}/RCL.INSTALL.html >> INSTALL
links -dump ${RECOLLDOC}/rcl.install.external.html >> INSTALL links -dump ${RECOLLDOC}/RCL.INSTALL.EXTERNAL.html >> INSTALL
links -dump ${RECOLLDOC}/rcl.install.building.html >> INSTALL links -dump ${RECOLLDOC}/RCL.INSTALL.BUILDING.html >> INSTALL
links -dump ${RECOLLDOC}/rcl.install.config.html >> INSTALL links -dump ${RECOLLDOC}/RCL.INSTALL.CONFIG.html >> INSTALL
$VCCMD commit -m "release $version" README INSTALL $VCCMD commit -m "release $version" README INSTALL
@ -143,13 +143,6 @@ if test $snap = "yes" ; then
echo $version > $topdir/VERSION echo $version > $topdir/VERSION
fi fi
# Fix the single/multiple page link in the header (we dont deliver the
# multi-page version and the file name is wrong anyway
sed -e '/\.\/index\.html/d' -e '/\.\/book\.html/d' \
< $topdir/doc/user/usermanual.html > $topdir/doc/user/u1.html
diff $topdir/doc/user/u1.html $topdir/doc/user/usermanual.html
mv -f $topdir/doc/user/u1.html $topdir/doc/user/usermanual.html
# Can't now put ./Makefile in excludefile, gets ignored everywhere. So delete # Can't now put ./Makefile in excludefile, gets ignored everywhere. So delete
# the top Makefile here (its' output by configure on the target system): # the top Makefile here (its' output by configure on the target system):
rm -f $topdir/Makefile rm -f $topdir/Makefile
@ -161,8 +154,11 @@ out=$releasename.tar.gz
echo "$targetdir/$out created" echo "$targetdir/$out created"
# Check manifest against current reference # Check manifest against current reference
(
export LANG=C
tar tzf $targetdir/$out | sort | cut -d / -f 2- | \ tar tzf $targetdir/$out | sort | cut -d / -f 2- | \
diff mk/manifest.txt - || fatal "Please fix file list mk/manifest.txt" diff mk/manifest.txt - || fatal "Please fix file list mk/manifest.txt"
)
# We tag .. as there is the 'packaging/' directory in there # We tag .. as there is the 'packaging/' directory in there
[ $dotag = "yes" ] && tagtop $TAG [ $dotag = "yes" ] && tagtop $TAG

66
src/mk/manifest.txt
View File

@ -100,41 +100,40 @@ doc/prog/Makefile
doc/prog/filters.txt doc/prog/filters.txt
doc/prog/top.txt doc/prog/top.txt
doc/user/ doc/user/
doc/user/HTML.manifest
doc/user/Makefile doc/user/Makefile
doc/user/Makefile.fbsd
doc/user/RCL.INDEXING.CONFIG.html
doc/user/RCL.INDEXING.MONITOR.html
doc/user/RCL.INDEXING.PERIODIC.html
doc/user/RCL.INDEXING.STORAGE.html
doc/user/RCL.INDEXING.WEBQUEUE.html
doc/user/RCL.INDEXING.html
doc/user/RCL.INSTALL.BUILDING.html
doc/user/RCL.INSTALL.CONFIG.html
doc/user/RCL.INSTALL.EXTERNAL.html
doc/user/RCL.INSTALL.html
doc/user/RCL.INTRODUCTION.RECOLL.html
doc/user/RCL.INTRODUCTION.SEARCH.html
doc/user/RCL.INTRODUCTION.html
doc/user/RCL.PROGRAM.API.html
doc/user/RCL.PROGRAM.FIELDS.html
doc/user/RCL.PROGRAM.html
doc/user/RCL.SEARCH.ANCHORWILD.html
doc/user/RCL.SEARCH.CASEDIAC.html
doc/user/RCL.SEARCH.COMMANDLINE.html
doc/user/RCL.SEARCH.DESKTOP.html
doc/user/RCL.SEARCH.KIO.html
doc/user/RCL.SEARCH.LANG.html
doc/user/RCL.SEARCH.html
doc/user/bldloop doc/user/bldloop
doc/user/docbook-xsl.css doc/user/docbook-xsl.css
doc/user/docbook.css doc/user/docbook.css
doc/user/index.html doc/user/index.html
doc/user/rcl.indexing.beaglequeue.html
doc/user/rcl.indexing.config.html
doc/user/rcl.indexing.html
doc/user/rcl.indexing.monitor.html
doc/user/rcl.indexing.periodic.html
doc/user/rcl.indexing.storage.html
doc/user/rcl.install.building.html
doc/user/rcl.install.config.html
doc/user/rcl.install.external.html
doc/user/rcl.install.html
doc/user/rcl.introduction.html
doc/user/rcl.introduction.recoll.html
doc/user/rcl.introduction.search.html
doc/user/rcl.program.api.html
doc/user/rcl.program.fields.html
doc/user/rcl.program.html
doc/user/rcl.search.anchorwild.html
doc/user/rcl.search.casediac.html
doc/user/rcl.search.commandline.html
doc/user/rcl.search.desktop.html
doc/user/rcl.search.html
doc/user/rcl.search.kio.html
doc/user/rcl.search.lang.html
doc/user/rcl.search.multidb.html
doc/user/usermanual-italian.html doc/user/usermanual-italian.html
doc/user/usermanual-xml.html
doc/user/usermanual.html doc/user/usermanual.html
doc/user/usermanual.html-text
doc/user/usermanual.sgml doc/user/usermanual.sgml
doc/user/usermanual.txt doc/user/usermanual.xml
doc/user/xmlmake.sh doc/user/xmlmake.sh
filters/ filters/
filters/injectcommon.sh filters/injectcommon.sh
@ -268,6 +267,7 @@ mk/Linux
mk/OpenBSD mk/OpenBSD
mk/SunOS mk/SunOS
mk/commondefs mk/commondefs
mk/commontargets
mk/localdefs.in mk/localdefs.in
php/ php/
php/00README.txt php/00README.txt
@ -282,11 +282,20 @@ python/
python/README.txt python/README.txt
python/recoll/ python/recoll/
python/recoll/Makefile python/recoll/Makefile
python/recoll/pyrclextract.cpp
python/recoll/pyrecoll.cpp python/recoll/pyrecoll.cpp
python/recoll/pyrecoll.h
python/recoll/recoll/
python/recoll/recoll/__init__.py
python/recoll/setup.py.in python/recoll/setup.py.in
python/samples/ python/samples/
python/samples/rcldlkp.py python/samples/rcldlkp.py
python/samples/rclmbox.py python/samples/rclmbox.py
python/samples/recollgui/
python/samples/recollgui/Makefile
python/samples/recollgui/qrecoll.py
python/samples/recollgui/rclmain.py
python/samples/recollgui/rclmain.ui
python/samples/recollq.py python/samples/recollq.py
python/samples/recollqsd.py python/samples/recollqsd.py
qtgui/ qtgui/
@ -450,6 +459,8 @@ query/wasatorcl.h
query/xadump.cpp query/xadump.cpp
rcldb/ rcldb/
rcldb/Makefile rcldb/Makefile
rcldb/daterange.cpp
rcldb/daterange.h
rcldb/expansiondbs.cpp rcldb/expansiondbs.cpp
rcldb/expansiondbs.h rcldb/expansiondbs.h
rcldb/rclabstract.cpp rcldb/rclabstract.cpp
@ -463,6 +474,7 @@ rcldb/rclquery.h
rcldb/rclquery_p.h rcldb/rclquery_p.h
rcldb/searchdata.cpp rcldb/searchdata.cpp
rcldb/searchdata.h rcldb/searchdata.h
rcldb/searchdataxml.cpp
rcldb/stemdb.cpp rcldb/stemdb.cpp
rcldb/stemdb.h rcldb/stemdb.h
rcldb/stoplist.cpp rcldb/stoplist.cpp