From: Adam Dickmeiss Date: Mon, 30 Nov 2009 13:21:24 +0000 (+0100) Subject: Merge branch 'icu_refactor' into yaz4 X-Git-Tag: v4.0.0~104 X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=4adcf3fecf9b8d2880ee0b671c9f9d20da18ca49;hp=54bd147d353f7f340a48a9da5c6a568446223371 Merge branch 'icu_refactor' into yaz4 --- diff --git a/configure.ac b/configure.ac index ee5b5bb..b5681aa 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl This file is part of the YAZ toolkit. dnl Copyright (C) 1995-2009 Index Data AC_PREREQ([2.60]) -AC_INIT([yaz],[3.0.51],[yaz-help@indexdata.dk]) +AC_INIT([yaz],[4.0.0],[yaz-help@indexdata.dk]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_AUX_DIR([config]) AM_INIT_AUTOMAKE([1.9]) diff --git a/debian/.gitignore b/debian/.gitignore index efd5c63..dc3a5f9 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,7 +1,7 @@ copyright files -libyaz3 -libyaz3-dev +libyaz4 +libyaz4-dev yaz-icu yaz-illclient tmp diff --git a/debian/changelog b/debian/changelog index 7608c07..89eec15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -yaz (3.0.51-1indexdata) unstable; urgency=low +yaz (4.0.0-1indexdata) unstable; urgency=low - * Upstream. + * Version 4. - -- Adam Dickmeiss Thu, 26 Nov 2009 13:59:09 +0100 + -- Adam Dickmeiss Wed, 25 Nov 2009 21:03:23 +0100 yaz (3.0.50-1indexdata) unstable; urgency=low diff --git a/debian/control b/debian/control index 4917800..d470832 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Adam Dickmeiss Priority: extra Build-Depends: debhelper (>= 4), pkg-config, libxslt1-dev, libgnutls-dev, libreadline5-dev, libwrap0-dev, libicu36-dev | libicu-dev -Package: libyaz3 +Package: libyaz4 Section: libs Architecture: any Depends: ${shlibs:Depends} @@ -36,10 +36,10 @@ Description: documentation for the Z39.50 toolkit . This package includes HTML documentation for YAZ. -Package: libyaz3-dev -Depends: libyaz3 (= ${Source-Version}), libxslt1-dev, libwrap0-dev, libicu36-dev|libicu-dev, libgnutls-dev, tcl8.3|tclsh +Package: libyaz4-dev +Depends: libyaz4 (= ${Source-Version}), libxslt1-dev, libwrap0-dev, libicu36-dev|libicu-dev, libgnutls-dev, tcl8.3|tclsh Replaces: yaz-devel -Conflicts: yaz-devel, libyaz-dev, libyaz2-dev +Conflicts: yaz-devel, libyaz-dev, libyaz2-dev, libyaz3-dev Section: libdevel Architecture: any Suggests: yaz-doc diff --git a/debian/libyaz3-dev.install b/debian/libyaz3-dev.install deleted file mode 100644 index 98e7964..0000000 --- a/debian/libyaz3-dev.install +++ /dev/null @@ -1,9 +0,0 @@ -debian/tmp/usr/include/yaz -debian/tmp/usr/lib/pkgconfig/yaz.pc -debian/tmp/usr/lib/libyaz*.a -debian/tmp/usr/lib/libyaz*.so -debian/tmp/usr/lib/libyaz*.la -debian/tmp/usr/bin/yaz-config -debian/tmp/usr/bin/yaz-asncomp -debian/tmp/usr/share/aclocal/yaz.m4 -debian/tmp/usr/share/yaz diff --git a/debian/libyaz3-dev.manpages b/debian/libyaz3-dev.manpages deleted file mode 100644 index 174644c..0000000 --- a/debian/libyaz3-dev.manpages +++ /dev/null @@ -1,3 +0,0 @@ -debian/tmp/usr/share/man/man1/yaz-asncomp.1 -debian/tmp/usr/share/man/man7/yaz.7 -debian/tmp/usr/share/man/man8/yaz-config.8 diff --git a/debian/libyaz3.install b/debian/libyaz3.install deleted file mode 100644 index c45ebcf..0000000 --- a/debian/libyaz3.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/lib*.so.* diff --git a/debian/libyaz4-dev.install b/debian/libyaz4-dev.install new file mode 100644 index 0000000..98e7964 --- /dev/null +++ b/debian/libyaz4-dev.install @@ -0,0 +1,9 @@ +debian/tmp/usr/include/yaz +debian/tmp/usr/lib/pkgconfig/yaz.pc +debian/tmp/usr/lib/libyaz*.a +debian/tmp/usr/lib/libyaz*.so +debian/tmp/usr/lib/libyaz*.la +debian/tmp/usr/bin/yaz-config +debian/tmp/usr/bin/yaz-asncomp +debian/tmp/usr/share/aclocal/yaz.m4 +debian/tmp/usr/share/yaz diff --git a/debian/libyaz4-dev.manpages b/debian/libyaz4-dev.manpages new file mode 100644 index 0000000..174644c --- /dev/null +++ b/debian/libyaz4-dev.manpages @@ -0,0 +1,3 @@ +debian/tmp/usr/share/man/man1/yaz-asncomp.1 +debian/tmp/usr/share/man/man7/yaz.7 +debian/tmp/usr/share/man/man8/yaz-config.8 diff --git a/debian/libyaz4.install b/debian/libyaz4.install new file mode 100644 index 0000000..c45ebcf --- /dev/null +++ b/debian/libyaz4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/lib*.so.* diff --git a/debian/rules b/debian/rules index b540ef2..0e24dcf 100755 --- a/debian/rules +++ b/debian/rules @@ -98,9 +98,9 @@ binary-arch: build install dh_fixperms # dh_perl # dh_python - dh_makeshlibs -V 'libyaz3 (>= 3.0.46)' + dh_makeshlibs -V 'libyaz4 (>= 4.0.0)' dh_installdeb - dh_shlibdeps -l debian/libyaz3/usr/lib + dh_shlibdeps -l debian/libyaz4/usr/lib dh_gencontrol dh_md5sums dh_builddeb diff --git a/include/yaz/backend.h b/include/yaz/backend.h index 5667e5c..5eac060 100644 --- a/include/yaz/backend.h +++ b/include/yaz/backend.h @@ -87,7 +87,6 @@ typedef struct { bend_request request; bend_association association; - int hits; /* number of hits */ int errcode; /* 0==OK */ char *errstring; /* system error string or NULL */ } bend_present_rr; diff --git a/include/yaz/nmem.h b/include/yaz/nmem.h index 9364323..fb7910c 100644 --- a/include/yaz/nmem.h +++ b/include/yaz/nmem.h @@ -44,13 +44,22 @@ YAZ_BEGIN_CDECL typedef struct nmem_control *NMEM; /** \brief Set to 1 if YAZ BER integer is 64-bit ; 0 otherwise */ -#define NMEM_64 0 +#ifndef NMEM_64 +#define NMEM_64 1 +#endif #if NMEM_64 -/** \brief BER/utility integer (64-bit or more) */ + +#ifdef _MSC_VER +/* Visual Studio. 6.0 and later supports this */ +typedef __int64 nmem_int_t; +#define NMEM_INT_PRINTF "%I64d" +#else +/* C99 */ typedef long long int nmem_int_t; -/** \brief printf format for nmem_int_t type */ #define NMEM_INT_PRINTF "%lld" +#endif + #else /** \brief BER/utility integer (32-bit on most platforms) */ typedef int nmem_int_t; diff --git a/src/Makefile.am b/src/Makefile.am index f8126ac..032da2e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ ## This file is part of the YAZ toolkit. ## Copyright (C) 1995-2009 Index Data -YAZ_VERSION_INFO=3:0:0 +YAZ_VERSION_INFO=4:0:0 lib_LTLIBRARIES = libyaz.la libyaz_server.la libyaz_icu.la diff --git a/win/makefile b/win/makefile index e2e0fa8..f6a124f 100644 --- a/win/makefile +++ b/win/makefile @@ -25,11 +25,11 @@ ICU_DIR = c:\icu # libxslt HAVE_LIBXSLT=1 -LIBXSLT_DIR=c:\libxslt-1.1.24.win32 +LIBXSLT_DIR=c:\libxslt-1.1.26.win32 # libxml2 HAVE_LIBXML2=1 -LIBXML2_DIR=c:\libxml2-2.7.1.win32 +LIBXML2_DIR=c:\libxml2-2.7.6.win32 # zlib compression (used by libxml2) ZLIB_DIR = c:\zlib-1.2.3.win32 @@ -172,15 +172,15 @@ ICU_DEF= \ /I"$(ICU_DIR)\include" ICU_LIB= \ $(ICU_DIR)\lib\icudt.lib $(ICU_DIR)\lib\icuin.lib $(ICU_DIR)\lib\icuuc.lib -icu: $(BINDIR)\icudt40.dll $(BINDIR)\icuin40.dll $(BINDIR)\icuuc40.dll +icu: $(BINDIR)\icudt42.dll $(BINDIR)\icuin42.dll $(BINDIR)\icuuc42.dll yazicu: dirs generate $(YAZ_ICU) -$(BINDIR)\icudt40.dll: - copy "$(ICU_DIR)\bin\icudt40.dll" $(BINDIR) -$(BINDIR)\icuin40.dll: - copy "$(ICU_DIR)\bin\icuin40.dll" $(BINDIR) -$(BINDIR)\icuuc40.dll: - copy "$(ICU_DIR)\bin\icuuc40.dll" $(BINDIR) +$(BINDIR)\icudt42.dll: + copy "$(ICU_DIR)\bin\icudt42.dll" $(BINDIR) +$(BINDIR)\icuin42.dll: + copy "$(ICU_DIR)\bin\icuin42.dll" $(BINDIR) +$(BINDIR)\icuuc42.dll: + copy "$(ICU_DIR)\bin\icuuc42.dll" $(BINDIR) !else ICU_DEF= \ /D YAZ_HAVE_ICU=0