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

added all combinations of runtime and builtin options

This commit is contained in:
Tim Rühsen 2014-06-30 10:35:33 +02:00
parent 373bcb912c
commit bb12832c30
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.travis.yml
View File

@ -6,9 +6,22 @@ compiler:
script: script:
- ./autogen.sh - ./autogen.sh
- ./configure && make -j4 && make check -j4 - ./configure && make -j4 && make check -j4
- ./configure --without-libicu && make clean && make -j4 && make check -j4 - ./configure --enable-runtime=libicu --enable-builtin=libicu && make clean && make -j4 && make check -j4
- ./configure --disable-builtin && make clean && make -j4 && make check -j4 - ./configure --enable-runtime=libicu --enable-builtin=libidn2 && make clean && make -j4 && make check -j4
- ./configure --disable-builtin --without-libicu && make clean && make -j4 && make check -j4 - ./configure --enable-runtime=libicu --enable-builtin=libidn && make clean && make -j4 && make check -j4
- ./configure --enable-runtime=libicu --disable-builtin && make clean && make -j4 && make check -j4
- ./configure --enable-runtime=libidn2 --enable-builtin=libicu && make clean && make -j4 && make check -j4
- ./configure --enable-runtime=libidn2 --enable-builtin=libidn2 && make clean && make -j4 && make check -j4
- ./configure --enable-runtime=libidn2 --enable-builtin=libidn && make clean && make -j4 && make check -j4
- ./configure --enable-runtime=libidn2 --disable-builtin && make clean && make -j4 && make check -j4
- ./configure --enable-runtime=libidn --enable-builtin=libicu && make clean && make -j4 && make check -j4
- ./configure --enable-runtime=libidn --enable-builtin=libidn2 && make clean && make -j4 && make check -j4
- ./configure --enable-runtime=libidn --enable-builtin=libidn && make clean && make -j4 && make check -j4
- ./configure --enable-runtime=libidn --disable-builtin && make clean && make -j4 && make check -j4
- ./configure --disable-runtime --enable-builtin=libicu && make clean && make -j4 && make check -j4
- ./configure --disable-runtime --enable-builtin=libidn2 && make clean && make -j4 && make check -j4
- ./configure --disable-runtime --enable-builtin=libidn && make clean && make -j4 && make check -j4
- ./configure --disable-runtime --disable-builtin && make clean && make -j4 && make check -j4
- ./configure --enable-gtk-doc && make -j4 && make check -j4 - ./configure --enable-gtk-doc && make -j4 && make check -j4
- make distcheck - make distcheck
before_install: before_install:

2
tools/Makefile.am
View File

@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
LDADD = ../src/libpsl.la LDADD = ../src/libpsl.la
#if WITH_LIBICU #if WITH_LIBICU
# LDADD += $(LIBICU_LIBS) # LDADD += -licuuc
#endif #endif
#if WITH_LIBIDN2 #if WITH_LIBIDN2
# LDADD += -lidn2 # LDADD += -lidn2

5
tools/psl.c
View File

@ -37,10 +37,12 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
/*
#ifdef WITH_LIBICU #ifdef WITH_LIBICU
# include <unicode/uloc.h> # include <unicode/uloc.h>
# include <unicode/ucnv.h> # include <unicode/ucnv.h>
#endif #endif
*/
#include <libpsl.h> #include <libpsl.h>
@ -217,11 +219,12 @@ int main(int argc, const char *const *argv)
printf("builtin compile time: %ld (%s)\n", psl_builtin_compile_time(), time2str(psl_builtin_compile_time())); printf("builtin compile time: %ld (%s)\n", psl_builtin_compile_time(), time2str(psl_builtin_compile_time()));
printf("builtin file time: %ld (%s)\n", psl_builtin_file_time(), time2str(psl_builtin_file_time())); printf("builtin file time: %ld (%s)\n", psl_builtin_file_time(), time2str(psl_builtin_file_time()));
printf("builtin SHA1 file hash: %s\n", psl_builtin_sha1sum()); printf("builtin SHA1 file hash: %s\n", psl_builtin_sha1sum());
/*
#ifdef WITH_LIBICU #ifdef WITH_LIBICU
printf("uloc_getDefault=%s\n", uloc_getDefault()); printf("uloc_getDefault=%s\n", uloc_getDefault());
printf("ucnv_getDefaultName=%s\n", ucnv_getDefaultName()); printf("ucnv_getDefaultName=%s\n", ucnv_getDefaultName());
#endif #endif
*/
} else } else
printf("No builtin PSL data available\n"); printf("No builtin PSL data available\n");
} }