Commit Graph

621 Commits

Author SHA1 Message Date
Tim Rühsen 03df58fc96
Merge pull request #162 from thinkski/master
Add libiconv dep to meson build
2020-09-21 16:22:17 +02:00
Chris Hiszpanski 079e8d0f6c Add libiconv dep to meson build 2020-09-20 04:57:12 -07:00
Tim Rühsen 17cce94216
Merge pull request #158 from kloczek/master
Install psl executable and man pages.
2020-08-05 20:06:12 +02:00
Tomasz Kłoczko 47bab910ee Install psl executable and man pages.
Resolve #156
2020-08-05 18:38:11 +01:00
Tim Rühsen a5e6f26cce Release V0.21.1 2020-07-18 13:15:00 +02:00
Tim Rühsen 0073dd737d
Merge pull request #155 from damz/pr/fix-coveralls
Upgrade Ubuntu to fix the coveralls issue
2020-07-02 18:52:47 +02:00
Damien Tournoud c471792664 Try if upgrading ubuntu helps with the coveralls issue 2020-07-02 09:43:52 -07:00
Tim Rühsen f5142207aa
Merge pull request #154 from kotnik/psh-test-update
Update Platform.sh example in test_data
2020-07-02 18:38:52 +02:00
Nikola Kotur f364cea73e Update Platform.sh example in test data 2020-07-02 17:04:27 +02:00
Tim Rühsen 72365d3036
Merge pull request #153 from nirbheek/fix-build-windows
meson: Fix running of psl-make-dafsa on Windows
2020-04-06 17:03:17 +02:00
Nirbheek Chauhan 0c11bf19df meson: Fix running of psl-make-dafsa on Windows
`find_program()` evaluates to `python psl-make-dafsa` on Windows, so
running it with `python` evaluates to `python python psl-make-dafsa`,
causing this error on Windows:

```
"c:/python38/python.exe" "python" "C:/projects/repos/libpsl/src/psl-make-dafsa" "--output-format=binary" "C:/projects/repos/libpsl/list/public_suffix_list.dat" "tests/psl.dafsa"
c:/python38/python.exe: can't open file 'python': [Errno 2] No such file or directory
```
2020-04-06 20:18:45 +05:30
Tim Rühsen 20ad8fb106
Merge pull request #152 from nirbheek/fix-typo
meson: Fix typo
2020-04-03 17:29:05 +02:00
Nirbheek Chauhan 116b5fe7b9 meson: Fix typo 2020-04-03 20:50:07 +05:30
Tim Rühsen 8d9e490ee7
Merge pull request #151 from nirbheek/fix-buildtype-usage
meson: Use the b_vscrt option for selecting the CRT
2020-04-03 15:22:51 +02:00
Nirbheek Chauhan a582a9c142 meson: Use the b_vscrt option for selecting the CRT
This option has been available since 0.48, and we should use it
instead of only guessing based on buildtype.
2020-04-03 16:45:11 +05:30
Tim Rühsen 96412ad0e0
Merge pull request #150 from ystreet/meson-python
meson: run python script against the meson version of python
2020-04-02 10:22:12 +02:00
Matthew Waters a10c374dad meson: run python script against the meson version of python
Avoids using a python that may not exist in a python3 only distribution:

/usr/bin/env: ‘python’: No such file or directory
2020-04-02 15:16:20 +11:00
Tim Rühsen d54ecbd05e Add meson check for strings.h 2020-03-10 15:57:33 +01:00
Tim Rühsen 55889b1d9e Add recent changes from meson.build to meson.build.in 2020-03-10 15:47:55 +01:00
Tim Rühsen b9a190264f psl.c: Include strings.h only if it is available 2020-03-10 15:16:25 +01:00
Tim Rühsen a2411a7207 Add Github FUNDING.yml 2020-03-07 20:42:04 +01:00
Tim Rühsen d26a0acfd7
Merge pull request #148 from nirbheek/meson-port
meson: Use libtool library versioning, same as autotools
2020-02-28 14:01:36 +01:00
Nirbheek Chauhan 841ae6dddd meson: Use libtool library versioning, same as autotools
This helps maintain ABI compatibility with the Autotools build so it's
a drop-in replacement.
2020-02-28 13:20:23 +05:30
Tim Rühsen fca622f587 Include string.h in src/psl.c 2020-02-01 17:04:36 +01:00
Tim Rühsen 39c2990840
Merge pull request #146 from fanc999/master.msv
Improve Visual Studio builds Add instructions
2019-10-30 14:32:02 +01:00
Chun-wei Fan 0e8addfe20 NMake builds: Make PDB generation cleaner
Separate the locations where the intermediate PDB files are generated,
to make things cleaner.
2019-10-30 18:09:00 +08:00
Chun-wei Fan 28319ed36f NMake builds: Include Visual Studio version in output dir
This avoids builds done with other Visual Studio versions being
confused with the one that is being used now.
2019-10-30 18:07:19 +08:00
Chun-wei Fan 3e92891d8c msvc/detectenv-msvc.mak: Accomdate Visual Studio 2019
This adds detection logic for Visual Studio 2019.
2019-10-30 17:36:38 +08:00
Chun-wei Fan f277af5bd8 Add instructions on building with MSVC
This includes building via NMake and Meson.
2019-10-30 17:36:06 +08:00
Chun-wei Fan 978e2989ca NMake: Fix building test programs
Define PSL_DAFSA and PSL_ASCII_DAFSA to point to the corresponding DAFSA
files that we generated during the build.
2019-10-30 15:26:02 +08:00
Tim Rühsen c6114a690c
Merge pull request #141 from blino/flags-fix
Fix auto flags for icu runtime and libidn builtin
2019-08-28 14:17:54 +02:00
Olivier Blin 75603d131d Fix auto flags for icu runtime and libidn builtin 2019-08-28 13:59:26 +02:00
Tim Rühsen e497735e45
Merge pull request #140 from rossburton/py
Makefile.am: use PYTHON when invoking psl-make-dafsa
2019-07-12 09:59:34 +02:00
Ross Burton b4fec5d0dd Makefile.am: use PYTHON when invoking psl-make-dafsa
In an environment where only Python 3 is installed, configure.ac finds and sets
PYTHON=python3 correctly but src/psl-make-dafsa is called directly, so the hashbang of
`#!/usr/bin/env python` is used which doesn't exist.

Fix this by explicitly running $(PYTHON) when using the tool.
2019-07-11 17:47:11 +01:00
Tim Rühsen 22a7e4045c
Merge pull request #139 from xhaakon/win32-build
Fix build when dirent.h is not available
2019-06-05 09:56:09 +02:00
Jakub Adam 49ce76a8cf Fix build when dirent.h is not available 2019-06-05 09:45:50 +02:00
Tim Rühsen f850de85ab
Merge pull request #138 from xclaesse/langinfo
Fix build when langinfo.h is not found
2019-06-03 22:06:14 +02:00
Xavier Claessens 93e3bb3e29 Fix build when langinfo.h is not found 2019-06-03 15:52:48 -04:00
Tim Rühsen 867872e80d Include stdio.h for fmemopen in fuzzers 2019-06-02 13:39:15 +02:00
Tim Rühsen f32c240cc0 Remove alloca from fuzz/main.c 2019-06-02 13:07:35 +02:00
Tim Rühsen 5131ef0d5d
Merge pull request #137 from kanavin/fix-tree-index
gtk-doc: do not include tree_index.sgml
2019-06-01 14:27:44 +02:00
Alexander Kanavin 87d1add318 gtk-doc: do not include tree_index.sgml
gtk-doc 1.30 no longer generates the file if the object tree is empty.
2019-06-01 13:13:50 +02:00
Tim Rühsen 999f28cc15 Use %NULL and %FILE overall in gtk-docs 2019-05-26 18:01:50 +02:00
Tim Rühsen 74ee95079d Add missing api-indeces for gtk-doc 2019-05-26 18:00:29 +02:00
Tim Rühsen ef352f8923 Add PSL_API to libpsl-sections.txt 2019-05-26 17:59:44 +02:00
Tim Rühsen 87715ba378
Merge pull request #131 from sunpoet/master
Fix build when configured with --with-psl-file
2019-04-17 15:57:06 +02:00
Po-Chuan Hsieh 9347024221
Fix build when configured with --with-psl-file
The error message is as follows:
Making all in tests
make: don't know how to make ../list/public_suffix_list.dat. Stop

make: stopped in /usr/ports/works/usr/ports/dns/libpsl/work/libpsl-libpsl-0.21.0/tests
*** Error code 1

Stop.
2019-04-17 13:25:48 +00:00
Tim Rühsen 8b913fe484 Dynamically create version in meson.build 2019-04-17 12:46:46 +02:00
Tim Rühsen 082ee9740e Fix patch version in include/meson.build 2019-04-17 12:33:03 +02:00
Tim Rühsen 94a7e7c6ed Include meson build files into tarball 2019-04-17 12:05:00 +02:00