From d0a9537fe261871a5f1a4c86716d36a42c65eedc Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Sun, 25 Mar 2012 22:33:27 +0200 Subject: [PATCH] unity lens: simplified install: no libexec use --- src/desktop/unity-lens-recoll/ChangeLog | 58 ++++++++++++++++++ src/desktop/unity-lens-recoll/Makefile.am | 4 +- src/desktop/unity-lens-recoll/Makefile.in | 60 +++++++++---------- .../data/unity-lens-recoll.service.in | 2 +- src/desktop/unity-lens-recoll/excludefile | 3 + src/desktop/unity-lens-recoll/mkdist.sh | 52 ++++++++++++++++ 6 files changed, 146 insertions(+), 33 deletions(-) create mode 100644 src/desktop/unity-lens-recoll/excludefile create mode 100644 src/desktop/unity-lens-recoll/mkdist.sh diff --git a/src/desktop/unity-lens-recoll/ChangeLog b/src/desktop/unity-lens-recoll/ChangeLog index e69de29b..f82dedb4 100644 --- a/src/desktop/unity-lens-recoll/ChangeLog +++ b/src/desktop/unity-lens-recoll/ChangeLog @@ -0,0 +1,58 @@ +changeset: 2631:ea84aedd25e0 +parent: 2628:d1665b3a0e57 +user: Jean-Francois Dockes +date: Fri Mar 23 11:33:27 2012 +0100 +files: src/desktop/unity-lens-recoll/bin/unity-recoll-daemon.in src/desktop/unity-lens-recoll/recollscope/rclsearch.py +description: +unity-lens-recoll with category filtering usable + + +changeset: 2626:adb6eff2a9f6 +user: Jean-Francois Dockes +date: Fri Mar 23 08:58:34 2012 +0100 +files: src/desktop/unity-lens-recoll/data/recollbg24.png +description: +none + + +changeset: 2622:10162119234f +user: Jean-Francois Dockes +date: Fri Mar 23 07:29:53 2012 +0100 +files: src/desktop/unity-lens-recoll/bin/unity-recoll-daemon.in src/desktop/unity-lens-recoll/recollscope/rclsearch.py +description: +removed debug traces + + +changeset: 2621:859ec39916ec +user: Jean-Francois Dockes +date: Thu Mar 22 19:13:04 2012 +0100 +files: src/desktop/unity-lens-recoll/Makefile.am src/desktop/unity-lens-recoll/Makefile.in src/desktop/unity-lens-recoll/README src/desktop/unity-lens-recoll/bin/unity-recoll-daemon.in src/desktop/unity-lens-recoll/data/recoll-lens.svg src/desktop/unity-lens-recoll/data/recoll.lens.in src/desktop/unity-lens-recoll/recollscope/rclsearch.py +description: +changed icon. Added filter code, but wont display + + +changeset: 2620:44f1d9457b8c +user: Jean-Francois Dockes +date: Thu Mar 22 13:54:14 2012 +0100 +files: src/desktop/unity-lens-recoll/bin/unity-recoll-daemon.in src/desktop/unity-lens-recoll/recollscope/rclsearch.py +description: +usable. Needs new svg icon + + +changeset: 2619:8ae983a1c2b7 +user: Jean-Francois Dockes +date: Thu Mar 22 08:34:57 2012 +0100 +files: src/desktop/unity-lens-recoll/Makefile.am src/desktop/unity-lens-recoll/Makefile.in src/desktop/unity-lens-recoll/bin/unity-recoll-daemon.in src/desktop/unity-lens-recoll/configure src/desktop/unity-lens-recoll/configure.ac src/desktop/unity-lens-recoll/data/recoll.lens.in src/desktop/unity-lens-recoll/data/unity-lens-recoll.menu.in src/desktop/unity-lens-recoll/data/unity-lens-recoll.service.in src/desktop/unity-lens-recoll/recoll/__init__.py src/desktop/unity-lens-recoll/recoll/rclsearch.py src/desktop/unity-lens-recoll/recollscope/__init__.py src/desktop/unity-lens-recoll/recollscope/rclsearch.py +description: +1st raw version installable and searching + + +changeset: 2618:35b76344948e +parent: -1:000000000000 +user: Jean-Francois Dockes +date: Wed Mar 21 18:44:23 2012 +0100 +files: src/desktop/unity-lens-recoll/AUTHORS src/desktop/unity-lens-recoll/COPYING src/desktop/unity-lens-recoll/ChangeLog src/desktop/unity-lens-recoll/INSTALL src/desktop/unity-lens-recoll/Makefile.am src/desktop/unity-lens-recoll/Makefile.in src/desktop/unity-lens-recoll/NEWS src/desktop/unity-lens-recoll/README src/desktop/unity-lens-recoll/acinclude.m4 src/desktop/unity-lens-recoll/aclocal.m4 src/desktop/unity-lens-recoll/bin/unity-recoll-daemon.in src/desktop/unity-lens-recoll/configure src/desktop/unity-lens-recoll/configure.ac src/desktop/unity-lens-recoll/data/recoll-lens.svg src/desktop/unity-lens-recoll/data/recoll.lens.in src/desktop/unity-lens-recoll/data/unity-lens-recoll.menu.in src/desktop/unity-lens-recoll/data/unity-lens-recoll.service.in src/desktop/unity-lens-recoll/install-sh src/desktop/unity-lens-recoll/missing src/desktop/unity-lens-recoll/py-compile src/desktop/unity-lens-recoll/recoll/__init__.py src/desktop/unity-lens-recoll/recoll/rclsearch.py +description: +initial version after renaming bliss things + + diff --git a/src/desktop/unity-lens-recoll/Makefile.am b/src/desktop/unity-lens-recoll/Makefile.am index 852c97ad..91e4f20f 100644 --- a/src/desktop/unity-lens-recoll/Makefile.am +++ b/src/desktop/unity-lens-recoll/Makefile.am @@ -19,7 +19,6 @@ docsdir = $(datadir)/doc/unity-lens-recoll docs_DATA = \ AUTHORS \ ChangeLog \ - COPYING \ NEWS \ README \ $(NULL) @@ -33,7 +32,8 @@ lens_PYTHON = \ recollscope/rclsearch.py \ $(NULL) -libexec_SCRIPTS = \ +daemondir = $(datadir)/unity-lens-recoll/ +daemon_SCRIPTS = \ bin/unity-recoll-daemon \ $(NULL) diff --git a/src/desktop/unity-lens-recoll/Makefile.in b/src/desktop/unity-lens-recoll/Makefile.in index a147b2e7..a2854ab2 100644 --- a/src/desktop/unity-lens-recoll/Makefile.in +++ b/src/desktop/unity-lens-recoll/Makefile.in @@ -72,10 +72,10 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(lensdir)" \ +am__installdirs = "$(DESTDIR)$(daemondir)" "$(DESTDIR)$(lensdir)" \ "$(DESTDIR)$(dbusdir)" "$(DESTDIR)$(docsdir)" \ "$(DESTDIR)$(dotlensdir)" "$(DESTDIR)$(iconsdir)" -SCRIPTS = $(libexec_SCRIPTS) +SCRIPTS = $(daemon_SCRIPTS) SOURCES = DIST_SOURCES = py_compile = $(top_srcdir)/py-compile @@ -194,7 +194,6 @@ docsdir = $(datadir)/doc/unity-lens-recoll docs_DATA = \ AUTHORS \ ChangeLog \ - COPYING \ NEWS \ README \ $(NULL) @@ -209,7 +208,8 @@ lens_PYTHON = \ recollscope/rclsearch.py \ $(NULL) -libexec_SCRIPTS = \ +daemondir = $(datadir)/unity-lens-recoll/ +daemon_SCRIPTS = \ bin/unity-recoll-daemon \ $(NULL) @@ -283,10 +283,10 @@ data/recoll.lens: $(top_builddir)/config.status $(top_srcdir)/data/recoll.lens.i cd $(top_builddir) && $(SHELL) ./config.status $@ data/unity-lens-recoll.service: $(top_builddir)/config.status $(top_srcdir)/data/unity-lens-recoll.service.in cd $(top_builddir) && $(SHELL) ./config.status $@ -install-libexecSCRIPTS: $(libexec_SCRIPTS) +install-daemonSCRIPTS: $(daemon_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" - @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \ + test -z "$(daemondir)" || $(MKDIR_P) "$(DESTDIR)$(daemondir)" + @list='$(daemon_SCRIPTS)'; test -n "$(daemondir)" || list=; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -304,19 +304,19 @@ install-libexecSCRIPTS: $(libexec_SCRIPTS) while read type dir files; do \ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \ + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(daemondir)$$dir'"; \ + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(daemondir)$$dir" || exit $$?; \ } \ ; done -uninstall-libexecSCRIPTS: +uninstall-daemonSCRIPTS: @$(NORMAL_UNINSTALL) - @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \ + @list='$(daemon_SCRIPTS)'; test -n "$(daemondir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + echo " ( cd '$(DESTDIR)$(daemondir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(daemondir)" && rm -f $$files install-lensPYTHON: $(lens_PYTHON) @$(NORMAL_INSTALL) test -z "$(lensdir)" || $(MKDIR_P) "$(DESTDIR)$(lensdir)" @@ -593,7 +593,7 @@ check-am: all-am check: check-am all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(lensdir)" "$(DESTDIR)$(dbusdir)" "$(DESTDIR)$(docsdir)" "$(DESTDIR)$(dotlensdir)" "$(DESTDIR)$(iconsdir)"; do \ + for dir in "$(DESTDIR)$(daemondir)" "$(DESTDIR)$(lensdir)" "$(DESTDIR)$(dbusdir)" "$(DESTDIR)$(docsdir)" "$(DESTDIR)$(dotlensdir)" "$(DESTDIR)$(iconsdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -643,14 +643,15 @@ info: info-am info-am: -install-data-am: install-dbusDATA install-docsDATA install-dotlensDATA \ - install-iconsDATA install-lensPYTHON +install-data-am: install-daemonSCRIPTS install-dbusDATA \ + install-docsDATA install-dotlensDATA install-iconsDATA \ + install-lensPYTHON install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-libexecSCRIPTS +install-exec-am: install-html: install-html-am @@ -690,9 +691,9 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dbusDATA uninstall-docsDATA \ - uninstall-dotlensDATA uninstall-iconsDATA uninstall-lensPYTHON \ - uninstall-libexecSCRIPTS +uninstall-am: uninstall-daemonSCRIPTS uninstall-dbusDATA \ + uninstall-docsDATA uninstall-dotlensDATA uninstall-iconsDATA \ + uninstall-lensPYTHON .MAKE: install-am install-strip @@ -700,18 +701,17 @@ uninstall-am: uninstall-dbusDATA uninstall-docsDATA \ dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \ dist-xz dist-zip distcheck distclean distclean-generic \ distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dbusDATA install-docsDATA \ + html-am info info-am install install-am install-daemonSCRIPTS \ + install-data install-data-am install-dbusDATA install-docsDATA \ install-dotlensDATA install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am install-iconsDATA \ - install-info install-info-am install-lensPYTHON \ - install-libexecSCRIPTS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-dbusDATA \ - uninstall-docsDATA uninstall-dotlensDATA uninstall-iconsDATA \ - uninstall-lensPYTHON uninstall-libexecSCRIPTS + install-info install-info-am install-lensPYTHON install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-daemonSCRIPTS uninstall-dbusDATA uninstall-docsDATA \ + uninstall-dotlensDATA uninstall-iconsDATA uninstall-lensPYTHON # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/src/desktop/unity-lens-recoll/data/unity-lens-recoll.service.in b/src/desktop/unity-lens-recoll/data/unity-lens-recoll.service.in index cee922ae..b7eb14c3 100644 --- a/src/desktop/unity-lens-recoll/data/unity-lens-recoll.service.in +++ b/src/desktop/unity-lens-recoll/data/unity-lens-recoll.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.recoll.UnityLensRecoll.Lens -Exec=@LIBEXECDIR@/unity-recoll-daemon +Exec=@DATADIR@/unity-lens-recoll/unity-recoll-daemon diff --git a/src/desktop/unity-lens-recoll/excludefile b/src/desktop/unity-lens-recoll/excludefile new file mode 100644 index 00000000..246a8593 --- /dev/null +++ b/src/desktop/unity-lens-recoll/excludefile @@ -0,0 +1,3 @@ +mkdist.sh +autom4te.cache +excludefile diff --git a/src/desktop/unity-lens-recoll/mkdist.sh b/src/desktop/unity-lens-recoll/mkdist.sh new file mode 100644 index 00000000..1b548f75 --- /dev/null +++ b/src/desktop/unity-lens-recoll/mkdist.sh @@ -0,0 +1,52 @@ +#!/bin/sh + +fatal() { + echo $* + exit 1 +} +usage() { + echo 'Usage: mkdist.sh ' + exit 1 +} + +VCCMD=hg +TAR=/usr/bin/tar + +VRECOLL=`cat ../../VERSION` +VLENS=`hg tip | egrep ^changeset: | awk '{print $2}' | awk -F: '{print $1}'` +VERSION=${VRECOLL}.${VLENS} +echo $VERSION + +targetdir=${targetdir-/tmp} + +checkmodified=${checkmodified-yes} + +editedfiles=`$VCCMD status . | egrep -v '^\?'` +if test "$checkmodified" = "yes" -a ! -z "$editedfiles"; then + fatal "Edited files exist: " $editedfiles +fi + +releasename=recoll-lens-${VERSION} + +topdir=$targetdir/$releasename +if test ! -d $topdir ; then + mkdir $topdir || exit 1 +else + echo "Removing everything under $topdir Ok ? (y/n)" + read rep + if test $rep = 'y';then + rm -rf $topdir/* + fi +fi + +# Clean up this dir and copy the dist-specific files +make distclean +yes | clean.O + +$TAR chfX - excludefile . | (cd $topdir;$TAR xf -) + +out=$releasename.tar.gz +(cd $targetdir ; \ + $TAR chf - $releasename | \ + gzip > $out) +echo "$targetdir/$out created"