walkero
/
libpsl
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Release V0.2.5

This commit is contained in:
Tim Ruehsen 2014-05-31 19:34:09 +02:00
parent dd68aceac9 ecdadf76e5
commit 1434b7f6b0
11 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -11,6 +11,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man
## pkg-config files are also used for architecture-independent data packages, ## pkg-config files are also used for architecture-independent data packages,
## in which case the correct install location would be $(datadir)/pkgconfig. ## in which case the correct install location would be $(datadir)/pkgconfig.
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libpsl-$(LIBPSL_API_VERSION).pc pkgconfig_DATA = libpsl.pc
EXTRA_DIST = config.rpath EXTRA_DIST = config.rpath

10
NEWS
View File

@ -1,7 +1,11 @@
Copyright (C) 2014 Tim Ruehsen Copyright (C) 2014 Tim Ruehsen
30.05.2014 31.05.2014 Release V0.2.5
* Fixed psl_builtin() to return NULL if no built-in PSL data is available * added psl_get_version()
* removed version from library name
30.05.2014 Release V0.2.4
* fixed psl_builtin() to return NULL if no built-in PSL data is available
27.05.2014 Release V0.2.3 27.05.2014 Release V0.2.3
* changed API version to 0.2 * changed API version to 0.2
@ -12,6 +16,6 @@ Copyright (C) 2014 Tim Ruehsen
* build static library by default * build static library by default
25.04.2014 Hotfix release V0.2.1 25.04.2014 Hotfix release V0.2.1
* Updated to the latest Publix Suffix List * updated to the latest Publix Suffix List
25.04.2014 Initial release V0.2 25.04.2014 Initial release V0.2

8
configure.ac
View File

@ -1,5 +1,5 @@
AC_INIT([libpsl], [0.2.4], [tim.ruehsen@gmx.de], [libpsl], [http://github.com/rockdaboot/libpsl]) AC_INIT([libpsl], [0.2.5], [tim.ruehsen@gmx.de], [libpsl], [http://github.com/rockdaboot/libpsl])
AC_PREREQ([2.59]) AC_PREREQ([2.59])
AM_INIT_AUTOMAKE([1.10 -Wall no-define]) AM_INIT_AUTOMAKE([1.10 -Wall no-define])
@ -63,8 +63,8 @@ AS_IF([ test "$enable_man" != no ], [
# 4. If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0. # 4. If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0.
# 5. If any interfaces have been added since the last public release, then increment age. # 5. If any interfaces have been added since the last public release, then increment age.
# 6. If any interfaces have been removed or changed since the last public release, then set age to 0. # 6. If any interfaces have been removed or changed since the last public release, then set age to 0.
AC_SUBST([LIBPSL_SO_VERSION], [0:4:0]) AC_SUBST([LIBPSL_SO_VERSION], [1:0:1])
AC_SUBST([LIBPSL_API_VERSION], [0.2]) AC_SUBST([LIBPSL_VERSION], $VERSION)
# Check for idn2 # Check for idn2
AC_CHECK_PROG(HAVE_IDN2, idn2, yes, AC_MSG_ERROR(Cannot find required tool 'idn2'.)) AC_CHECK_PROG(HAVE_IDN2, idn2, yes, AC_MSG_ERROR(Cannot find required tool 'idn2'.))
@ -126,7 +126,7 @@ AC_CONFIG_FILES([Makefile
docs/libpsl/version.xml docs/libpsl/version.xml
data/Makefile data/Makefile
tests/Makefile tests/Makefile
libpsl-${LIBPSL_API_VERSION}.pc:libpsl.pc.in]) libpsl.pc:libpsl.pc.in])
AC_OUTPUT AC_OUTPUT
AC_MSG_NOTICE([Summary of build options: AC_MSG_NOTICE([Summary of build options:

1
docs/libpsl/libpsl-sections.txt
View File

@ -16,4 +16,5 @@ psl_builtin_file_time
psl_builtin_sha1sum psl_builtin_sha1sum
psl_builtin_filename psl_builtin_filename
psl_is_cookie_domain_acceptable psl_is_cookie_domain_acceptable
psl_get_version
</SECTION> </SECTION>

2
docs/libpsl/version.xml.in
View File

@ -1 +1 @@
@LIBPSL_API_VERSION@ @LIBPSL_VERSION@

3
include/libpsl.h
View File

@ -83,6 +83,9 @@ const char *
/* returns file name of PSL source file */ /* returns file name of PSL source file */
const char * const char *
psl_builtin_filename(void); psl_builtin_filename(void);
/* returns library version */
const char *
psl_get_version(void);
#ifdef __cplusplus #ifdef __cplusplus

4
libpsl.pc.in
View File

@ -7,5 +7,5 @@ Name: @PACKAGE_NAME@
Description: Publix Suffix List C library. Description: Publix Suffix List C library.
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
URL: @PACKAGE_URL@ URL: @PACKAGE_URL@
Libs: -L${libdir} -llibpsl-@LIBPSL_API_VERSION@ Libs: -L${libdir} -llibpsl
Cflags: -I${includedir}/libpsl-@LIBPSL_API_VERSION@ -I${libdir}/libpsl-@LIBPSL_API_VERSION@/include Cflags: -I${includedir}/libpsl -I${libdir}/libpsl/include

8
src/Makefile.am
View File

@ -4,12 +4,12 @@ BUILT_SOURCES = suffixes.c
# suffixes.c is a built source that must be cleaned # suffixes.c is a built source that must be cleaned
CLEANFILES = suffixes.c CLEANFILES = suffixes.c
lib_LTLIBRARIES = libpsl-@LIBPSL_API_VERSION@.la lib_LTLIBRARIES = libpsl.la
libpsl_@LIBPSL_API_VERSION@_la_SOURCES = psl.c libpsl_la_SOURCES = psl.c
libpsl_@LIBPSL_API_VERSION@_la_CPPFLAGS = -I$(top_srcdir)/include libpsl_la_CPPFLAGS = -I$(top_srcdir)/include
# include ABI version information # include ABI version information
libpsl_@LIBPSL_API_VERSION@_la_LDFLAGS = -version-info $(LIBPSL_SO_VERSION) libpsl_la_LDFLAGS = -version-info $(LIBPSL_SO_VERSION)
noinst_PROGRAMS = psl2c noinst_PROGRAMS = psl2c
psl2c_SOURCES = psl2c.c psl2c_SOURCES = psl2c.c

14
src/psl.c
View File

@ -674,6 +674,20 @@ const char *psl_builtin_filename(void)
return _psl_filename; return _psl_filename;
} }
/**
* psl_get_version:
*
* Get libpsl version.
*
* Returns: String containing version of libpsl.
*
* Since: 0.2.5
**/
const char *psl_get_version (void)
{
return PACKAGE_VERSION;
}
/** /**
* psl_is_cookie_domain_acceptable: * psl_is_cookie_domain_acceptable:
* @psl: PSL context pointer * @psl: PSL context pointer

2
tests/Makefile.am
View File

@ -1,6 +1,6 @@
DEFS = @DEFS@ -DDATADIR=\"$(top_srcdir)/data\" -DSRCDIR=\"$(srcdir)\" -DPSL_FILE=\"$(PSL_FILE)\" -DPSL_TESTFILE=\"$(PSL_TESTFILE)\" DEFS = @DEFS@ -DDATADIR=\"$(top_srcdir)/data\" -DSRCDIR=\"$(srcdir)\" -DPSL_FILE=\"$(PSL_FILE)\" -DPSL_TESTFILE=\"$(PSL_TESTFILE)\"
AM_CPPFLAGS = -I$(top_srcdir)/include AM_CPPFLAGS = -I$(top_srcdir)/include
LDADD = ../src/libpsl-@LIBPSL_API_VERSION@.la LDADD = ../src/libpsl.la
if WITH_BUILTIN if WITH_BUILTIN

2
tools/Makefile.am
View File

@ -2,4 +2,4 @@ bin_PROGRAMS = psl
AM_CPPFLAGS = -I$(top_srcdir)/include AM_CPPFLAGS = -I$(top_srcdir)/include
AM_LDFLAGS = -static AM_LDFLAGS = -static
LDADD = ../src/libpsl-@LIBPSL_API_VERSION@.la LDADD = ../src/libpsl.la