docs/reference/Makefile.am | 5 ++++- docs/reference/harfbuzz-sections.txt | 8 +++++--- git.mk | 17 +++++++++++++---- src/hb-common.h | 4 +++- 4 files changed, 25 insertions(+), 9 deletions(-)
New commits: commit 029f46bde7e39094d3decb46525e91a97c5cc02c Author: Behdad Esfahbod <[email protected]> Date: Mon Aug 26 18:11:07 2013 -0400 [gtk-doc] Remove tmpl in make maintainer-clean diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 71a75db..1da46a6 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -106,4 +106,7 @@ TESTS_ENVIRONMENT = cd $(srcdir) && \ #TESTS = $(GTKDOC_CHECK) endif +maintainer-clean-local: + -rm -rf $(srcdir)/tmpl + -include $(top_srcdir)/git.mk commit dddf990c3687a47297eafc82b54fa96842e68003 Author: Behdad Esfahbod <[email protected]> Date: Mon Aug 26 17:58:25 2013 -0400 [git.mk] Update diff --git a/git.mk b/git.mk index cf8bc57..2fa799d 100644 --- a/git.mk +++ b/git.mk @@ -77,7 +77,7 @@ GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \ $(srcdir)/aclocal.m4 \ $(srcdir)/autoscan.log \ $(srcdir)/configure.scan \ - `AUX_DIR=$(srcdir)/$$($(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' $(srcdir)/configure.ac); \ + `AUX_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' ./configure.ac); \ test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \ for x in \ ar-lib \ @@ -90,13 +90,13 @@ GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \ missing \ mkinstalldirs \ ; do echo "$$AUX_DIR/$$x"; done` \ - `$(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' $(srcdir)/configure.ac | \ + `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \ head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done` # # All modules should also be fine including the following variable, which # removes automake-generated Makefile.in files: GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \ - `$(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' $(srcdir)/configure.ac | \ + `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' ./configure.ac | \ while read f; do \ case $$f in Makefile|*/Makefile) \ test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \ @@ -160,6 +160,8 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk "tmpl/*.bak" \ xml html \ ; do echo "/$$x"; done; \ + FLAVOR=$$(cd $(top_srcdir); $(AUTOCONF) --trace 'GTK_DOC_CHECK:$$2' ./configure.ac); \ + case $$FLAVOR in *no-tmpl*) echo /tmpl;; esac; \ fi; \ if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \ for lc in $(DOC_LINGUAS); do \ @@ -235,7 +237,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk if test "x$(am__dirstamp)" = x; then :; else \ echo "$(am__dirstamp)"; \ fi; \ - if test "x$(LTCOMPILE)" = x; then :; else \ + if test "x$(LTCOMPILE)" = x -a "x$(GTKDOC_RUN)" = x; then :; else \ for x in \ "*.lo" \ ".libs" "_libs" \ @@ -250,6 +252,9 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk $(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \ so_locations \ $(MOSTLYCLEANFILES) \ + $(TEST_LOGS) \ + $(TEST_LOGS:.log=.trs) \ + $(TEST_SUITE_LOG) \ "*.$(OBJEXT)" \ $(DISTCLEANFILES) \ $(am__CONFIG_DISTCLEAN_FILES) \ @@ -259,6 +264,10 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk $(MAINTAINERCLEANFILES) \ $(BUILT_SOURCES) \ $(DEPDIR) \ + $(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \ + $(filter %_vala.stamp,$(DIST_COMMON)) \ + $(filter %.vapi,$(DIST_COMMON)) \ + $(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))) \ Makefile \ Makefile.in \ "*.orig" \ commit 700a15fe4b80da9c67befd85ae10a166f5b65962 Author: Behdad Esfahbod <[email protected]> Date: Mon Aug 26 17:49:36 2013 -0400 Add HB_DISABLE_DEPRECATED That moment that you have to accept that you made API mistakes... diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 1e1b5e7..71a75db 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -28,7 +28,7 @@ SCANGOBJ_OPTIONS= # Extra options to supply to gtkdoc-scan. # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" -SCAN_OPTIONS=--rebuild-types +SCAN_OPTIONS=--rebuild-types --deprecated-guards="HB_DISABLE_DEPRECATED" # Extra options to supply to gtkdoc-mkdb. # e.g. MKDB_OPTIONS=--xml-mode --output-format=xml diff --git a/docs/reference/harfbuzz-sections.txt b/docs/reference/harfbuzz-sections.txt index 3ba4b0c..416d76d 100644 --- a/docs/reference/harfbuzz-sections.txt +++ b/docs/reference/harfbuzz-sections.txt @@ -102,6 +102,7 @@ hb_script_from_string hb_script_get_horizontal_direction hb_script_t hb_script_to_iso15924_tag +HB_SCRIPT_CANADIAN_ABORIGINAL hb_tag_from_string hb_tag_t hb_tag_to_string @@ -276,9 +277,6 @@ HB_OT_LAYOUT_NO_SCRIPT_INDEX HB_OT_TAG_GDEF HB_OT_TAG_GPOS HB_OT_TAG_GSUB -Xhb_ot_layout_lookup_enumerate_sequences -Xhb_ot_layout_lookup_position -Xhb_ot_layout_lookup_substitute hb_ot_layout_collect_lookups hb_ot_layout_feature_get_lookups hb_ot_layout_get_attach_points @@ -305,6 +303,10 @@ hb_ot_layout_table_find_script hb_ot_layout_table_get_feature_tags hb_ot_layout_table_get_script_tags hb_ot_shape_plan_collect_lookups +<SUBSECTION Private> +Xhb_ot_layout_lookup_enumerate_sequences +Xhb_ot_layout_lookup_position +Xhb_ot_layout_lookup_substitute </SECTION> <SECTION> diff --git a/src/hb-common.h b/src/hb-common.h index 8699bf6..5040b90 100644 --- a/src/hb-common.h +++ b/src/hb-common.h @@ -273,8 +273,10 @@ typedef enum /*---*/ HB_SCRIPT_INVALID = HB_TAG_NONE } hb_script_t; -/* Deprecated misspellings. */ +#ifndef HB_DISABLE_DEPRECATED +/* Deprecated misspelling. */ #define HB_SCRIPT_CANADIAN_ABORIGINAL HB_SCRIPT_CANADIAN_SYLLABICS +#endif /* These are moved out of hb_script_t because glib-mkenums chokes otherwise. */ #if 0 _______________________________________________ HarfBuzz mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/harfbuzz
