Merge branch 'master' into support-for-pseudo-class-contains

.gitignore

@@ -4,3 +4,26 @@
 *~
 modest.pc
 uninstal.mk
+debian/.debhelper/
+debian/debhelper-build-stamp
+debian/files
+debian/libmodest-dev.debhelper.log
+debian/libmodest-dev.substvars
+debian/libmodest-dev/
+debian/libmodest.debhelper.log
+debian/libmodest.substvars
+debian/libmodest/
+debian/tmp/
+examples/myhtml/attributes_high_level
+examples/myhtml/fragment_high_level
+examples/myhtml/get_title_low_level
+examples/myhtml/insert_in_appropriate_place_high_level
+examples/myhtml/parse_without_whitespace
+examples/myhtml/string_manipulate_high_level
+lib/
+test/mycore/utils/avl_tree
+test/mycss/declaration
+test/myencoding/encoding_detect_meta
+test/myhtml/commoncrawl
+test/myurl/url
+test_suite/

Makefile

@@ -112,14 +112,16 @@ BUILD_SUB_DIRS := examples $(TEST_DIR)
 PROJECT_INSTALL_LIBRARY := lib
 PROJECT_INSTALL_HEADER  := include
 
-libdir     ?= $(prefix)/$(PROJECT_INSTALL_LIBRARY)
-includedir ?= $(prefix)/$(PROJECT_INSTALL_HEADER)
-
-MODEST_INSTALL_CREATE_DIR := mkdir -p $(prefix)/$(PROJECT_INSTALL_LIBRARY) 
-MODEST_INSTALL_COMMAND := $(MODEST_INSTALL_CREATE_DIR) $(MODEST_UTILS_NEW_LINE) cp -av $(LIB_DIR_BASE)/* $(libdir)
+libdir     ?= $(DESTDIR)$(prefix)/$(PROJECT_INSTALL_LIBRARY)
+includedir ?= $(DESTDIR)$(prefix)/$(PROJECT_INSTALL_HEADER)
 
+MODEST_INSTALL_CREATE_DIR := mkdir -p $(libdir)
+ifneq ($(PROJECT_INSTALL_WITHOUT_HEADERS),YES)
+	MODEST_INSTALL_CREATE_DIR += $(includedir)
+endif
+
+MODEST_INSTALL_COMMAND := cp -av $(LIB_DIR_BASE)/* $(libdir)
 ifneq ($(PROJECT_INSTALL_WITHOUT_HEADERS),YES)
-	MODEST_INSTALL_CREATE_DIR += $(prefix)/$(PROJECT_INSTALL_HEADER)
 	MODEST_INSTALL_COMMAND += $(MODEST_UTILS_NEW_LINE) cp -av $(INCLUDE_DIR_API)/* $(includedir)
 endif
 
@@ -142,7 +144,7 @@ MODEST_UNINSTALL_COMMAND = echo "MODEST_UNINSTALL_MK_COMMAND = $(MODEST_UNINSTAL
 # PKG-CONFIG
 #***************
 MODEST_PKG_CONFIG_FILE := modest.pc
-MODEST_PKG_CONFIG_CFLAGS := $(foreach name,$(MODEST_BUILD_MODULES_LIST_WITHOUT_PORT),-I$\{includedir}/$(name))
+MODEST_PKG_CONFIG_CFLAGS := $(foreach name,$(MODEST_BUILD_MODULES_LIST_WITHOUT_PORT),-I$$\{includedir}/$(name))
 MODEST_PKG_CONFIG_PROCESS = \
 $(SED) \
 -e 's,@version\@,$(PROJECT_VERSION_STRING),g' \
@@ -154,6 +156,10 @@ $(SED) \
 -e 's,@libname\@,$(LIB_NAME),g' \
 -e 's,@description\@,$(DESCRIPTION),g' \
 $1 > $2
+MODEST_INSTALL_CREATE_DIR += $(libdir)/pkgconfig
+MODEST_INSTALL_COMMAND += $(MODEST_UTILS_NEW_LINE) cp -av $(MODEST_PKG_CONFIG_FILE) $(libdir)/pkgconfig
+
+MODEST_INSTALL_COMMAND := $(MODEST_INSTALL_CREATE_DIR) $(MODEST_UTILS_NEW_LINE) $(MODEST_INSTALL_COMMAND)
 
 #********************
 # Target options
@@ -172,9 +178,11 @@ static: make-pc-file create $(MODEST_BUILD_MODULES_TARGET_ALL)
 	$(call MODEST_BUILD_STATIC_AFTER)
 
 clean: $(MODEST_BUILD_MODULES_TARGET_CLEAN)
-	rm -f $(call MODEST_LIBRARY_WITH_VERSION) && rm -f $(call MODEST_LIBRARY_STATIC)
-	rm -rf $(TEST_DIR_BASE)
+	-rm $(call MODEST_LIBRARY_WITH_VERSION)
+	-rm $(call MODEST_LIBRARY_STATIC)
+	-rm -r $(TEST_DIR_BASE)
 	$(call MODEST_BUILD_CLEAN_AFTER)
+	-rm $(MODEST_PKG_CONFIG_FILE)
 	for f in $(BUILD_SUB_DIRS); do $(MAKE) -C $$f clean; done
 
 clone: clean_api $(MODEST_BUILD_MODULES_TARGET_CLONE)
@@ -197,7 +205,9 @@ uninstall:
 test: library
 	$(MAKE) -C $(TEST_DIR) run
 
-make-pc-file:
+make-pc-file: $(MODEST_PKG_CONFIG_FILE)
+
+$(MODEST_PKG_CONFIG_FILE): $(MODEST_PKG_CONFIG_FILE).in
 	$(call MODEST_PKG_CONFIG_PROCESS,$(MODEST_PKG_CONFIG_FILE).in, $(MODEST_PKG_CONFIG_FILE))
 
 modules:

README.md

@@ -42,6 +42,7 @@ See [INSTALL.md](https://github.com/lexborisov/Modest/blob/master/INSTALL.md)
 ## External Bindings and Wrappers
 * [Crystal wrapper](https://github.com/kostya/modest) for CSS Selectors (Modest Finder)
 * [Python binding](https://github.com/rushter/selectolax) for Modest engine (fast HTML5 parser and CSS selectors)
+* [Elixir/Erlang](https://github.com/f34nk/modest_ex) bindings
 
 ## Examples
 

debian/changelog

@@ -0,0 +1,5 @@
+modest (1.0.0) stable; urgency=medium
+
+  * Initial release
+
+ -- Alexander Borisov <lex.borisov@gmail.com>  Tue, 21 Mar 2017 14:46:45 +0200

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -0,0 +1,31 @@
+Source: modest
+Section: libs
+Priority: optional
+Maintainer: Alexander Fedyashov <a@fedyashov.com>
+Standards-Version: 3.9.5
+Vcs-Git: git://github.com/lexborisov/Modest.git
+Vcs-Browser: https://github.com/lexborisov/Modest
+Homepage: https://github.com/lexborisov/Modest
+Build-Depends:
+ debhelper (>= 9)
+
+Package: libmodest
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Modest —  a pure C HTML renderer
+ Modest is a fast HTML renderer implemented as a pure C99 library with no
+ outside dependencies.
+
+Package: libmodest-dev
+Section: libdevel
+Architecture: any
+Depends:
+ libmodest (= ${binary:Version}),
+ ${misc:Depends}
+Description: Modest —  a pure C HTML renderer (development files)
+ Modest is a fast HTML renderer implemented as a pure C99 library with no
+ outside dependencies.

debian/copyright

@@ -0,0 +1,17 @@
+Format: http://dep.debian.net/deps/dep5/
+Files: *
+Copyright: 2015-2018 Alexander Borisov
+License: LGPL
+ .
+ This is free software; you can redistribute it and/or modify it under the
+ terms of the GNU Leser General Public License as published by the Free
+ Software Foundation; either version 2.1, or (at your option) any later
+ version.
+ .
+ This software 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.
+ .
+ On Debian systems, you can find the GNU Lesser General Public License
+ version 2.1 in the file /usr/share/common-licenses/LGPL-2.1.

debian/docs

@@ -0,0 +1 @@
+README.md

debian/libmodest-dev.install

@@ -0,0 +1,4 @@
+usr/include
+usr/lib/libmodest.so
+usr/lib/libmodest_static.a
+usr/lib/pkgconfig

debian/libmodest.install

@@ -0,0 +1 @@
+usr/lib/libmodest-*.so

debian/rules

@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+%:
+	dh $@ --parallel
+
+override_dh_auto_build:
+	dh_auto_build -- prefix=/usr
+
+override_dh_auto_install:
+	dh_auto_install -- prefix=/usr

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

modest.pc.in

@@ -7,4 +7,4 @@ Name: @libname@
 Description: @description@
 Version: @version@
 Cflags: @cflags@
-Libs: -L${libdir} -l@libname@
+Libs: -L${libdir} -l@libname@ -lm