From 02ac941cf7ed4fd94c6a68ddee930f530a153e63 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Sun, 22 Nov 2015 09:56:04 +0100 Subject: [PATCH] future 1.22 packaging --- packaging/debian/debian/changelog | 10 +- packaging/debian/debian/control | 7 +- packaging/debian/debian/copyright | 47 +--- .../debian/patches/fix-python-install.patch | 10 - packaging/debian/debian/patches/series | 1 - packaging/debian/debian/rules | 22 +- src/Makefile.am | 27 +- src/xaposix/config.h | 249 ------------------ src/xaposix/realtime.h | 107 -------- src/xaposix/safeerrno.h | 36 --- website/release-1.22.html | 3 - 11 files changed, 49 insertions(+), 470 deletions(-) delete mode 100644 packaging/debian/debian/patches/fix-python-install.patch delete mode 100644 src/xaposix/config.h delete mode 100644 src/xaposix/realtime.h delete mode 100644 src/xaposix/safeerrno.h diff --git a/packaging/debian/debian/changelog b/packaging/debian/debian/changelog index d76e1075..e4bbd001 100644 --- a/packaging/debian/debian/changelog +++ b/packaging/debian/debian/changelog @@ -1,10 +1,10 @@ -recoll (1.21.0-1~ppaPPAVERS~SERIES1) SERIES; urgency=low +recoll (1.22.0-1~ppaPPAVERS~SERIES1) SERIES; urgency=low - * New bison-based query parser. - * Improves filter execution performance - * Save/reload queries + * New build based on autotools + * Synonyms + * Windows port - -- Jean-Francois Dockes Tue, 16 Jun 2015 18:10:00 +0200 + -- Jean-Francois Dockes Sat, 21 Nov 2015 16:01:00 +0200 recoll (1.20.6-1~ppaPPAVERS~SERIES1) SERIES; urgency=low diff --git a/packaging/debian/debian/control b/packaging/debian/debian/control index 2b89bd8c..2632fb4e 100644 --- a/packaging/debian/debian/control +++ b/packaging/debian/debian/control @@ -4,6 +4,7 @@ Priority: optional Maintainer: Jean-Francois Dockes Build-Depends: autotools-dev, debhelper (>= 7), + dh-python, hardening-wrapper, bison, libqt4-dev, @@ -13,7 +14,7 @@ Build-Depends: autotools-dev, libz-dev, python-all-dev (>= 2.6.6-3~), python3-all-dev, -Standards-Version: 3.9.4 +Standards-Version: 3.9.6 X-Python-Version: >= 2.7 Homepage: http://www.lesbonscomptes.com/recoll Vcs-Git: git://anonscm.debian.org/collab-maint/recoll.git @@ -21,8 +22,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/recoll.git;a=summa Package: recoll Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Recommends: python-recoll, aspell, python, xdg-utils, xsltproc +Depends: ${misc:Depends}, ${shlibs:Depends}, python2, python +Recommends: python-recoll, aspell, xdg-utils, xsltproc Suggests: antiword, catdoc, ghostscript, diff --git a/packaging/debian/debian/copyright b/packaging/debian/debian/copyright index f5811875..95e5bc31 100644 --- a/packaging/debian/debian/copyright +++ b/packaging/debian/debian/copyright @@ -83,42 +83,11 @@ License: LGPL-2+ can be found in `/usr/share/common-licenses/LGPL-2' and `/usr/share/common-licenses/LGPL-2.1' and `/usr/share/common-licenses/LGPL-3'. -Files: qtgui/q3richtext_p.h -Copyright: 1992-2007, Trolltech ASA. All rights reserved -License: - This file is part of the Qt3Support module of the Qt Toolkit. - . - This file may be used under the terms of the GNU General Public License - version 2.0 as published by the Free Software Foundation and appearing in the - file LICENSE.GPL included in the packaging of this file. Please review the - following information to ensure GNU General Public Licensing requirements will - be met: http://trolltech.com/products/qt/licenses/licensing/opensource/ - . - If you are unsure which license is appropriate for your use, please review the - following information: - http://trolltech.com/products/qt/licenses/licensing/licensingoverview - or contact the sales department at sales@trolltech.com. - . - In addition, as a special exception, Trolltech gives you certain additional - rights. These rights are described in the Trolltech GPL Exception version 1.0, - which can be found at http://www.trolltech.com/products/qt/gplexception/ - and in the file GPL_EXCEPTION.txt in this package. - . - In addition, as a special exception, Trolltech, as the sole copyright - holder for Qt Designer, grants users of the Qt/Eclipse Integration - plug-in the right for the Qt/Eclipse Integration to link to - functionality provided by Qt Designer and its related libraries. - . - Trolltech reserves all rights not expressly granted herein. - . - Trolltech ASA (c) 2007 - . - This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - Files: common/uproplist.h Copyright: 1991-2006, Unicode, Inc. -License: +License: Unicode + +License: Unicode All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html . @@ -153,7 +122,9 @@ License: Files: utils/md5.* Copyright: 1991-1992, RSA Data Security, Inc. All rights reserved. -License: +License: RSA + +License:RSA MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm . License to copy and use this software is granted provided that it is @@ -176,7 +147,9 @@ License: Files: desktop/xdg-utils-1.0.1/* Copyright: 2006, Kevin Krammer , Jeremy White . -License: +License: MIT + +License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights @@ -197,6 +170,8 @@ License: Files: index/csguess.cpp Copyright: 2000-2004, Mikio Hirabayashi +License: LGPL-2.1+ + License: LGPL-2.1+ This file is part of QDBM, Quick Database Manager. . diff --git a/packaging/debian/debian/patches/fix-python-install.patch b/packaging/debian/debian/patches/fix-python-install.patch deleted file mode 100644 index e025a811..00000000 --- a/packaging/debian/debian/patches/fix-python-install.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/recollinstall.in -+++ b/recollinstall.in -@@ -149,5 +149,5 @@ - ${datadir}/recoll/translations/recoll_zh.qm || exit 1 - - --@NOPYTHON@(cd python/recoll;python setup.py install \ --@NOPYTHON@ --prefix=${REALPREFIX} ${ROOTFORPYTHON} ${OPTSFORPYTHON}) -+#@NOPYTHON@(cd python/recoll;python setup.py install \ -+#@NOPYTHON@ --prefix=${REALPREFIX} ${ROOTFORPYTHON} ${OPTSFORPYTHON}) diff --git a/packaging/debian/debian/patches/series b/packaging/debian/debian/patches/series index 977d94d2..e69de29b 100644 --- a/packaging/debian/debian/patches/series +++ b/packaging/debian/debian/patches/series @@ -1 +0,0 @@ -fix-python-install.patch diff --git a/packaging/debian/debian/rules b/packaging/debian/debian/rules index 5daf527d..5d69ebc3 100755 --- a/packaging/debian/debian/rules +++ b/packaging/debian/debian/rules @@ -3,16 +3,14 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export DEB_BUILD_HARDENING=1 +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -CFLAGS = -Wall -g -#LDFLAGS = -Wl,-z,defs - -#build qt4 UI only -#export QMAKE=qmake-qt4 +CFLAGS += -Wall -g +#LDFLAGS += -Wl,-z,defs ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 @@ -33,7 +31,7 @@ build-arch: build-stamp build-indep: build-stamp build-stamp: config.status dh_testdir - $(MAKE) + $(MAKE) -j 5 touch $@ clean: @@ -48,10 +46,12 @@ install: dh_testroot dh_prep dh_installdirs - $(MAKE) STRIP=ls prefix=$(CURDIR)/debian/tmp/usr install - # Work around recollinstall forgetting the PPT text-extract utility - install -m 0444 filters/msodump.zip $(CURDIR)/debian/tmp/usr/share/recoll/filters - install -m 0555 filters/ppt-dump.py $(CURDIR)/debian/tmp/usr/share/recoll/filters + $(MAKE) prefix=$(CURDIR)/debian/tmp/usr install + chmod a+x $(CURDIR)/debian/tmp/usr/share/recoll/examples/rclmon.sh + chmod a-x $(CURDIR)/debian/tmp/usr/share/recoll/filters/rclxslt.py + chmod a-x $(CURDIR)/debian/tmp/usr/share/recoll/filters/rclexec1.py + chmod a-x $(CURDIR)/debian/tmp/usr/share/recoll/filters/rclexec1.py + rm -f $(CURDIR)/debian/tmp/usr/lib/recoll/librecoll.la (cd python/recoll; python setup.py install \ --install-layout=deb \ --prefix=$(CURDIR)/debian/tmp/usr ) diff --git a/src/Makefile.am b/src/Makefile.am index ce1537ae..4e30bd84 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -113,6 +113,7 @@ internfile/mh_mail.cpp \ internfile/mh_mail.h \ internfile/mh_mbox.cpp \ internfile/mh_mbox.h \ +internfile/mh_null.h \ internfile/mh_symlink.h \ internfile/mh_text.cpp \ internfile/mh_text.h \ @@ -237,7 +238,11 @@ utils/wipedir.cpp \ utils/wipedir.h \ utils/workqueue.h \ utils/x11mon.cpp \ -utils/x11mon.h +utils/x11mon.h \ +xaposix/safefcntl.h \ +xaposix/safesysstat.h \ +xaposix/safesyswait.h \ +xaposix/safeunistd.h BUILT_SOURCES = query/wasaparse.cpp AM_YFLAGS = -d @@ -358,8 +363,8 @@ qtgui/i18n/recoll_ru.qm qtgui/i18n/recoll_ru.ts \ qtgui/i18n/recoll_tr.qm qtgui/i18n/recoll_tr.ts \ qtgui/i18n/recoll_uk.qm qtgui/i18n/recoll_uk.ts \ qtgui/i18n/recoll_xx.qm qtgui/i18n/recoll_xx.ts \ -qtgui/i18n/recoll_zh_CN.qm qtgui/i18n/recoll_zh_CN.ts \ qtgui/i18n/recoll_zh.qm qtgui/i18n/recoll_zh.ts \ +qtgui/i18n/recoll_zh_CN.qm qtgui/i18n/recoll_zh_CN.ts \ qtgui/idxsched.h \ qtgui/idxsched.ui \ qtgui/images/asearch.png \ @@ -380,26 +385,26 @@ qtgui/images/up.png \ qtgui/listdialog.h \ qtgui/listdialog.ui \ qtgui/main.cpp \ +qtgui/mtpics/License_sidux.txt \ +qtgui/mtpics/README \ qtgui/mtpics/aptosid-book.png \ qtgui/mtpics/aptosid-manual-copyright.txt \ qtgui/mtpics/aptosid-manual.png \ qtgui/mtpics/archive.png \ -qtgui/mtpics/bookchap.png \ qtgui/mtpics/book.png \ +qtgui/mtpics/bookchap.png \ qtgui/mtpics/document.png \ qtgui/mtpics/drawing.png \ qtgui/mtpics/emblem-symbolic-link.png \ qtgui/mtpics/folder.png \ qtgui/mtpics/html.png \ qtgui/mtpics/image.png \ -qtgui/mtpics/License_sidux.txt \ qtgui/mtpics/message.png \ qtgui/mtpics/mozilla_doc.png \ qtgui/mtpics/pdf.png \ qtgui/mtpics/pidgin.png \ qtgui/mtpics/postscript.png \ qtgui/mtpics/presentation.png \ -qtgui/mtpics/README \ qtgui/mtpics/sidux-book.png \ qtgui/mtpics/soffice.png \ qtgui/mtpics/source.png \ @@ -411,6 +416,10 @@ qtgui/mtpics/video.png \ qtgui/mtpics/wordprocessing.png \ qtgui/multisave.cpp \ qtgui/multisave.h \ +qtgui/preview_load.cpp \ +qtgui/preview_load.h \ +qtgui/preview_plaintorich.cpp \ +qtgui/preview_plaintorich.h \ qtgui/preview_w.cpp \ qtgui/preview_w.h \ qtgui/ptrans.ui \ @@ -418,14 +427,14 @@ qtgui/ptrans_w.cpp \ qtgui/ptrans_w.h \ qtgui/rclhelp.cpp \ qtgui/rclhelp.h \ -qtgui/rclmain.ui \ -qtgui/rclmain_w.cpp \ -qtgui/rclmain_w.h \ qtgui/rclm_idx.cpp \ qtgui/rclm_preview.cpp \ qtgui/rclm_saveload.cpp \ qtgui/rclm_view.cpp \ qtgui/rclm_wins.cpp \ +qtgui/rclmain.ui \ +qtgui/rclmain_w.cpp \ +qtgui/rclmain_w.h \ qtgui/rclzg.cpp \ qtgui/rclzg.h \ qtgui/recoll.h \ @@ -489,7 +498,7 @@ sampleconf/fields sampleconf/fragbuts.xml sampleconf/mimeconf \ sampleconf/mimemap sampleconf/mimeview sampleconf/mimeview.mac \ sampleconf/recoll.conf sampleconf/recoll.qss \ \ -unac/AUTHORS unac/COPYING unac/README unac/README.recoll \ +unac/AUTHORS unac/COPYING unac/README unac/README.recoll unac/unac.c \ \ VERSION diff --git a/src/xaposix/config.h b/src/xaposix/config.h deleted file mode 100644 index a9d5b902..00000000 --- a/src/xaposix/config.h +++ /dev/null @@ -1,249 +0,0 @@ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define if ftime returns void */ -/* #undef FTIME_RETURNS_VOID */ - -/* Define to 1 if you have the `closefrom' function. */ -/* #undef HAVE_CLOSEFROM */ - -/* Define to 1 if you have the `dirfd' function. */ -#define HAVE_DIRFD 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_DLFCN_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_FCNTL_H 1 - -/* Define to 1 if you have the `fork' function. */ -#define HAVE_FORK 1 - -/* Define to 1 if you have the `fsync' function. */ -#define HAVE_FSYNC 1 - -/* Define to 1 if you have the `ftime' function. */ -#define HAVE_FTIME 1 - -/* Define to 1 if you have the `gethostname' function. */ -#define HAVE_GETHOSTNAME 1 - -/* Define to 1 if you have the `getrlimit' function. */ -#define HAVE_GETRLIMIT 1 - -/* Define to 1 if you have the `getrusage' function. */ -#define HAVE_GETRUSAGE 1 - -/* Define to 1 if you have the `gettimeofday' function. */ -#define HAVE_GETTIMEOFDAY 1 - -/* Define to 1 if you have the `hstrerror' function. */ -#define HAVE_HSTRERROR 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* Define to 1 if you have the `link' function. */ -#define HAVE_LINK 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define if pread is available on this system */ -#define HAVE_PREAD 1 - -/* Define if pwrite is available on this system */ -#define HAVE_PWRITE 1 - -/* Define to 1 if you have the `setenv' function. */ -#define HAVE_SETENV 1 - -/* Define to 1 if you have the `sigaction' function. */ -#define HAVE_SIGACTION 1 - -/* Define to 1 if you have the `sigsetjmp' function */ -#define HAVE_SIGSETJMP 1 - -/* Define to 1 if you have the 'socketpair' function. */ -#define HAVE_SOCKETPAIR 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `strerror' function. */ -#define HAVE_STRERROR 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `sysconf' function. */ -#define HAVE_SYSCONF 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_ERRNO_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_RESOURCE_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_SELECT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_UTSNAME_H 1 - -/* Define to 1 if you have the `times' function. */ -#define HAVE_TIMES 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_UUID_H */ - -/* Define to 1 if you have the 'uuid_unparse_lower' function. */ -#define HAVE_UUID_UNPARSE_LOWER 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UUID_UUID_H 1 - -/* Define if a suitable valgrind is installed */ -#define HAVE_VALGRIND 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_VALGRIND_MEMCHECK_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_ZLIB_H 1 - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#define LT_OBJDIR ".libs/" - -/* Name of package */ -#define PACKAGE "xapian-core" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "http://xapian.org/bugs" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "xapian-core" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "xapian-core 1.2.14" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "xapian-core" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "1.2.14" - -/* explicit prototype needed for pread (if any) */ -/* #undef PREAD_PROTOTYPE */ - -/* explicit prototype needed for pwrite (if any) */ -/* #undef PWRITE_PROTOTYPE */ - -/* The size of `int', as computed by sizeof. */ -#define SIZEOF_INT 4 - -/* The size of `long', as computed by sizeof. */ -#define SIZEOF_LONG 8 - -/* Define to the name of a function implementing snprintf but not caring about - ISO C99 return value semantics (if one exists) */ -#define SNPRINTF snprintf - -/* Define to the name of a function implementing snprintf with ISO C99 - semantics (if one exists) */ -#define SNPRINTF_ISO snprintf - -/* type to use for 5th parameter to getsockopt */ -#define SOCKLEN_T socklen_t - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define if the testsuite should use RTTI */ -#define USE_RTTI 1 - -/* Version number of package */ -#define VERSION "1.2.14" - -/* Define if you want assertions (causes some slow-down) */ -/* #undef XAPIAN_ASSERTIONS */ - -/* Define if you want paranoid assertions (causes significant slow-down) */ -/* #undef XAPIAN_ASSERTIONS_PARANOID */ - -/* Define if you want a log of methods called and other debug messages */ -/* #undef XAPIAN_DEBUG_LOG */ - -/* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Define on mingw to the minimum msvcrt version to assume */ -/* #undef __MSVCRT_VERSION__ */ - -/* Define to `int' if does not define. */ -/* #undef mode_t */ - -/* Define to `int' if does not define. */ -/* #undef pid_t */ - -/* Define to `int' if does not define. */ -/* #undef ssize_t */ - -/* Disable stupid MSVC "performance" warning for converting int to bool. */ -#ifdef _MSC_VER -# pragma warning(disable:4800) -#endif - -/* _FORTIFY_SOURCE is only supported by GCC >= 4.1 and glibc >= 2.3.4, but it - * shouldn't cause a problem to define it where it's not supported and some - * distros may have backported support, so hardcoding version checks is - * counter-productive. - * - * Check if _FORTIFY_SOURCE is already defined to allow the user to override - * our choice with "./configure CPPFLAGS=-D_FORTIFY_SOURCE=0" or "...=1". - */ -#if defined __GNUC__ && !defined _FORTIFY_SOURCE -# define _FORTIFY_SOURCE 2 -#endif - -/* For GCC >= 3.0 (and Intel's C++ compiler, which also defines __GNUC__), - * we can use __builtin_expect to give the compiler hints about branch - * prediction. See HACKING for how to use these. - */ -#if defined __GNUC__ -/* The arguments of __builtin_expect() are both long, so use !! to ensure that - * the first argument is always an integer expression, and always 0 or 1, but - * still has the same truth value for the if or while it is used in. - */ -# define rare(COND) __builtin_expect(!!(COND), 0) -# define usual(COND) __builtin_expect(!!(COND), 1) -#else -# define rare(COND) (COND) -# define usual(COND) (COND) -#endif - diff --git a/src/xaposix/realtime.h b/src/xaposix/realtime.h deleted file mode 100644 index d2186d04..00000000 --- a/src/xaposix/realtime.h +++ /dev/null @@ -1,107 +0,0 @@ -/** @file realtime.h - * @brief Functions for handling a time or time interval in a double. - */ -/* Copyright (C) 2010,2013 Olly Betts - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef XAPIAN_INCLUDED_REALTIME_H -#define XAPIAN_INCLUDED_REALTIME_H - -#include -#include -#include "safeerrno.h" -#include "safeunistd.h" - -#ifndef __WIN32__ -# ifdef HAVE_FTIME -# include -# endif -# ifdef HAVE_GETTIMEOFDAY -# include -# endif -#else -# include -# include -extern void xapian_sleep_milliseconds(unsigned int millisecs); -#endif - -namespace RealTime { - -/// Return the current time. -inline double now() { -#ifndef __WIN32__ - // POSIX.1-2008 stopped specifying ftime(), so prefer gettimeofday(). -# ifdef HAVE_GETTIMEOFDAY - struct timeval tv; - if (usual(gettimeofday(&tv, NULL) == 0)) - return tv.tv_sec + (tv.tv_usec * 1e-6); - return double(std::time(NULL)); -# elif defined HAVE_FTIME - struct timeb tp; -# ifdef FTIME_RETURNS_VOID - ftime(&tp); -# else - if (rare(ftime(&tp) != 0)) - return double(std::time(NULL)); -# endif - return tp.time + (tp.millitm * 1e-3); -# else - return double(std::time(NULL)); -# endif -#else - struct __timeb64 tp; - _ftime64(&tp); - return tp.time + tp.millitm * 1e-3; -#endif -} - -/** Return the end time for a timeout in @a timeout seconds. - * - * If @a timeout is 0, that means "no timeout", so 0 is returned. Otherwise - * the current time plus @a timeout seconds is returned. - */ -inline double end_time(double timeout) { - return (timeout == 0.0 ? timeout : timeout + now()); -} - -/// Sleep until the time represented by this object. -inline void sleep(double t) { -#ifndef __WIN32__ - double delta; - struct timeval tv; - do { - delta = t - RealTime::now(); - if (delta <= 0.0) - return; - tv.tv_sec = long(delta); - tv.tv_usec = long(std::fmod(delta, 1.0) * 1e6); - } while (select(0, NULL, NULL, NULL, &tv) < 0 && errno == EINTR); -#else - double delta = t - RealTime::now(); - if (delta <= 0.0) - return; - while (rare(delta > 4294967.0)) { - xapian_sleep_milliseconds(4294967000u); - delta -= 4294967.0; - } - xapian_sleep_milliseconds(unsigned(delta * 1000.0)); -#endif -} - -} - -#endif // XAPIAN_INCLUDED_REALTIME_H diff --git a/src/xaposix/safeerrno.h b/src/xaposix/safeerrno.h deleted file mode 100644 index 6ce0fdc9..00000000 --- a/src/xaposix/safeerrno.h +++ /dev/null @@ -1,36 +0,0 @@ -/* safeerrno.h: #include , but working around broken platforms. - * - * Copyright (C) 2006,2007 Olly Betts - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 - * USA - */ - -#ifndef XAPIAN_INCLUDED_SAFEERRNO_H -#define XAPIAN_INCLUDED_SAFEERRNO_H - -//#ifndef PACKAGE -//# error You must #include before #include "safeerrno.h" -//#endif - -// Compaq's C++ compiler requires sys/errno.h to be included, followed by -// errno.h, otherwise you don't get EINTR or most of the other EXXX codes -// defined. -#if defined __DECCXX && defined HAVE_SYS_ERRNO_H -# include -#endif -#include - -#endif // XAPIAN_INCLUDED_SAFEERRNO_H diff --git a/website/release-1.22.html b/website/release-1.22.html index 70b93ff3..c4ff7a2b 100644 --- a/website/release-1.22.html +++ b/website/release-1.22.html @@ -64,9 +64,6 @@ - Windows port - New build system - Filters converted to python mexec -> faster in most cases. - - fix typo in synonyms multigroups update - - Support multi-word synonyms and add modifier to turn-off synonyms - expansion - Make dehyphenate (co-worker->coworker) optional