[HarfBuzz] harfbuzz: Branch 'master' - 2 commits
Behdad Esfahbod
behdad at kemper.freedesktop.org
Sun Dec 2 00:35:06 UTC 2018
CMakeLists.txt | 12 --
src/Makefile.am | 6 -
src/Makefile.sources | 231 +++++++++++++++++++++-------------------------
test/api/hb-subset-test.h | 2
4 files changed, 112 insertions(+), 139 deletions(-)
New commits:
commit 58d4d19947794aded4e966290b01e1034f216a7d
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Sat Dec 1 19:34:18 2018 -0500
Simplify build source list
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 019e205b..2d6e77e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,10 +168,6 @@ extract_make_variable(HB_BASE_headers ${SRCSOURCES})
add_prefix_to_list(HB_BASE_headers "${PROJECT_SOURCE_DIR}/src/")
extract_make_variable(HB_FALLBACK_sources ${SRCSOURCES})
add_prefix_to_list(HB_FALLBACK_sources "${PROJECT_SOURCE_DIR}/src/")
-extract_make_variable(HB_OT_sources ${SRCSOURCES})
-add_prefix_to_list(HB_OT_sources "${PROJECT_SOURCE_DIR}/src/")
-extract_make_variable(HB_OT_headers ${SRCSOURCES})
-add_prefix_to_list(HB_OT_headers "${PROJECT_SOURCE_DIR}/src/")
extract_make_variable(HB_SUBSET_sources ${SRCSOURCES})
add_prefix_to_list(HB_SUBSET_sources "${PROJECT_SOURCE_DIR}/src/")
@@ -180,13 +176,10 @@ extract_make_variable(HB_SUBSET_headers ${SRCSOURCES})
add_prefix_to_list(HB_SUBSET_headers "${PROJECT_SOURCE_DIR}/src/")
extract_make_variable(HB_BASE_RAGEL_GENERATED_sources ${SRCSOURCES})
-extract_make_variable(HB_OT_RAGEL_GENERATED_sources ${SRCSOURCES})
#if (IN_HB_DIST)
add_prefix_to_list(HB_BASE_RAGEL_GENERATED_sources "${PROJECT_SOURCE_DIR}/src/")
- add_prefix_to_list(HB_OT_RAGEL_GENERATED_sources "${PROJECT_SOURCE_DIR}/src/")
#else ()
# add_prefix_to_list(HB_BASE_RAGEL_GENERATED_sources "${PROJECT_BINARY_DIR}/src/")
-# add_prefix_to_list(HB_OT_RAGEL_GENERATED_sources "${PROJECT_BINARY_DIR}/src/")
#endif ()
extract_make_variable(HB_VIEW_sources ${UTILSOURCES})
@@ -212,7 +205,7 @@ set (HB_VERSION_MICRO ${CMAKE_MATCH_4})
## Define ragel tasks
# if (NOT IN_HB_DIST)
-# foreach (ragel_output IN ITEMS ${HB_BASE_RAGEL_GENERATED_sources} ${HB_OT_RAGEL_GENERATED_sources})
+# foreach (ragel_output IN ITEMS ${HB_BASE_RAGEL_GENERATED_sources})
# string(REGEX MATCH "([^/]+)\\.hh" temp ${ragel_output})
# set (target_name ${CMAKE_MATCH_1})
# add_custom_command(OUTPUT ${ragel_output}
@@ -246,8 +239,6 @@ set (project_sources
${HB_BASE_RAGEL_GENERATED_sources}
${HB_FALLBACK_sources}
- ${HB_OT_sources}
- ${HB_OT_RAGEL_GENERATED_sources}
)
set (subset_project_sources
@@ -260,7 +251,6 @@ set (project_headers
#${HB_VERSION_H}
${HB_BASE_headers}
- ${HB_OT_headers}
)
set (subset_project_headers
diff --git a/src/Makefile.am b/src/Makefile.am
index c726cf2a..3618d03a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,10 +28,6 @@ HBSOURCES = $(HB_BASE_sources)
HBSOURCES += $(HB_BASE_RAGEL_GENERATED_sources)
HBHEADERS = $(HB_BASE_headers)
-HBSOURCES += $(HB_OT_sources)
-HBSOURCES += $(HB_OT_RAGEL_GENERATED_sources)
-HBHEADERS += $(HB_OT_headers)
-
if HAVE_FALLBACK
HBSOURCES += $(HB_FALLBACK_sources)
endif
@@ -299,12 +295,10 @@ built-sources: $(BUILT_SOURCES)
RAGEL_GENERATED = \
$(patsubst %,$(srcdir)/%,$(HB_BASE_RAGEL_GENERATED_sources)) \
- $(patsubst %,$(srcdir)/%,$(HB_OT_RAGEL_GENERATED_sources)) \
$(NULL)
BUILT_SOURCES += $(RAGEL_GENERATED)
EXTRA_DIST += \
$(HB_BASE_RAGEL_sources) \
- $(HB_OT_RAGEL_sources) \
$(NULL)
# We decided to add ragel-generated files to git...
#MAINTAINERCLEANFILES += $(RAGEL_GENERATED)
diff --git a/src/Makefile.sources b/src/Makefile.sources
index 5484764c..e12d3b55 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -1,199 +1,177 @@
# Base and default-included sources and headers
HB_BASE_sources = \
+ hb-aat-layout-ankr-table.hh \
+ hb-aat-layout-bsln-table.hh \
+ hb-aat-layout-common.hh \
+ hb-aat-layout-feat-table.hh \
+ hb-aat-layout-just-table.hh \
+ hb-aat-layout-kerx-table.hh \
+ hb-aat-layout-lcar-table.hh \
+ hb-aat-layout-morx-table.hh \
+ hb-aat-layout-trak-table.hh \
+ hb-aat-layout.cc \
+ hb-aat-layout.hh \
+ hb-aat-ltag-table.hh \
+ hb-aat-map.cc \
+ hb-aat-map.hh \
hb-atomic.hh \
- hb-blob.hh \
hb-blob.cc \
- hb-buffer.hh \
+ hb-blob.hh \
hb-buffer-serialize.cc \
hb-buffer.cc \
+ hb-buffer.hh \
hb-cache.hh \
+ hb-cff-interp-common.hh \
+ hb-cff-interp-cs-common.hh \
+ hb-cff-interp-dict-common.hh \
+ hb-cff1-interp-cs.hh \
+ hb-cff2-interp-cs.hh \
hb-common.cc \
hb-debug.hh \
hb-dsalgs.hh \
- hb-face.hh \
hb-face.cc \
- hb-font.hh \
+ hb-face.hh \
hb-font.cc \
+ hb-font.hh \
hb-iter.hh \
hb-kern.hh \
- hb-map.hh \
- hb-map.cc \
hb-machinery.hh \
+ hb-map.cc \
+ hb-map.hh \
hb-mutex.hh \
hb-null.hh \
hb-object.hh \
hb-open-file.hh \
hb-open-type.hh \
- hb-ot-color-cbdt-table.hh \
- hb-ot-cmap-table.hh \
- hb-ot-glyf-table.hh \
- hb-ot-cff1-table.hh \
+ hb-ot-cff-common.hh \
hb-ot-cff1-table.cc \
- hb-ot-cff2-table.hh \
+ hb-ot-cff1-table.hh \
hb-ot-cff2-table.cc \
- hb-ot-vorg-table.hh \
+ hb-ot-cff2-table.hh \
+ hb-ot-cmap-table.hh \
+ hb-ot-color-cbdt-table.hh \
+ hb-ot-color-colr-table.hh \
+ hb-ot-color-cpal-table.hh \
+ hb-ot-color-sbix-table.hh \
+ hb-ot-color-svg-table.hh \
+ hb-ot-color.cc \
+ hb-ot-face.cc \
+ hb-ot-face.hh \
+ hb-ot-font.cc \
+ hb-ot-glyf-table.hh \
hb-ot-hdmx-table.hh \
hb-ot-head-table.hh \
hb-ot-hhea-table.hh \
hb-ot-hmtx-table.hh \
hb-ot-kern-table.hh \
- hb-ot-maxp-table.hh \
- hb-ot-name-language.cc \
- hb-ot-name-language.hh \
- hb-ot-name-table.hh \
- hb-ot-name.cc \
- hb-ot-os2-table.hh \
- hb-ot-os2-unicode-ranges.hh \
- hb-ot-post-macroman.hh \
- hb-ot-post-table.hh \
- hb-ot-tag-table.hh \
- hb-ot-tag.cc \
- hb.hh \
- hb-set-digest.hh \
- hb-set.hh \
- hb-set.cc \
- hb-shape.cc \
- hb-shape-plan.hh \
- hb-shape-plan.cc \
- hb-shaper-list.hh \
- hb-shaper-impl.hh \
- hb-shaper.hh \
- hb-shaper.cc \
- hb-static.cc \
- hb-string-array.hh \
- hb-unicode.hh \
- hb-unicode-emoji-table.hh \
- hb-unicode.cc \
- hb-vector.hh \
- hb-utf.hh \
- hb-warning.cc \
- $(NULL)
-
-HB_BASE_RAGEL_GENERATED_sources = \
- hb-buffer-deserialize-json.hh \
- hb-buffer-deserialize-text.hh \
- $(NULL)
-HB_BASE_RAGEL_sources = \
- hb-buffer-deserialize-json.rl \
- hb-buffer-deserialize-text.rl \
- $(NULL)
-
-HB_BASE_headers = \
- hb.h \
- hb-blob.h \
- hb-buffer.h \
- hb-common.h \
- hb-deprecated.h \
- hb-face.h \
- hb-font.h \
- hb-map.h \
- hb-set.h \
- hb-shape.h \
- hb-shape-plan.h \
- hb-unicode.h \
- hb-version.h \
- $(NULL)
-
-HB_FALLBACK_sources = \
- hb-fallback-shape.cc \
- $(NULL)
-
-HB_OT_sources = \
- hb-aat-layout.cc \
- hb-aat-layout-common.hh \
- hb-aat-layout-ankr-table.hh \
- hb-aat-layout-bsln-table.hh \
- hb-aat-layout-feat-table.hh \
- hb-aat-layout-just-table.hh \
- hb-aat-layout-kerx-table.hh \
- hb-aat-layout-lcar-table.hh \
- hb-aat-layout-morx-table.hh \
- hb-aat-layout-trak-table.hh \
- hb-aat-layout.hh \
- hb-aat-ltag-table.hh \
- hb-aat-map.cc \
- hb-aat-map.hh \
- hb-ot-face.hh \
- hb-ot-face.cc \
- hb-ot-font.cc \
- hb-ot-layout.cc \
hb-ot-layout-base-table.hh \
hb-ot-layout-common.hh \
hb-ot-layout-gdef-table.hh \
hb-ot-layout-gpos-table.hh \
- hb-ot-layout-gsubgpos.hh \
hb-ot-layout-gsub-table.hh \
+ hb-ot-layout-gsubgpos.hh \
hb-ot-layout-jstf-table.hh \
+ hb-ot-layout.cc \
hb-ot-layout.hh \
- hb-ot-color.cc \
- hb-ot-color-colr-table.hh \
- hb-ot-color-cpal-table.hh \
- hb-ot-color-sbix-table.hh \
- hb-ot-color-svg-table.hh \
hb-ot-map.cc \
hb-ot-map.hh \
- hb-ot-math.cc \
hb-ot-math-table.hh \
- hb-ot-shape.cc \
- hb-ot-shape-complex-arabic.cc \
+ hb-ot-math.cc \
+ hb-ot-maxp-table.hh \
+ hb-ot-name-language.cc \
+ hb-ot-name-language.hh \
+ hb-ot-name-table.hh \
+ hb-ot-name.cc \
+ hb-ot-os2-table.hh \
+ hb-ot-os2-unicode-ranges.hh \
+ hb-ot-post-macroman.hh \
+ hb-ot-post-table.hh \
hb-ot-shape-complex-arabic-fallback.hh \
- hb-ot-shape-complex-arabic.hh \
hb-ot-shape-complex-arabic-table.hh \
hb-ot-shape-complex-arabic-win1256.hh \
+ hb-ot-shape-complex-arabic.cc \
+ hb-ot-shape-complex-arabic.hh \
hb-ot-shape-complex-default.cc \
hb-ot-shape-complex-hangul.cc \
hb-ot-shape-complex-hebrew.cc \
+ hb-ot-shape-complex-indic-table.cc \
hb-ot-shape-complex-indic.cc \
hb-ot-shape-complex-indic.hh \
- hb-ot-shape-complex-indic-table.cc \
- hb-ot-shape-complex-khmer.hh \
hb-ot-shape-complex-khmer.cc \
- hb-ot-shape-complex-myanmar.hh \
+ hb-ot-shape-complex-khmer.hh \
hb-ot-shape-complex-myanmar.cc \
+ hb-ot-shape-complex-myanmar.hh \
hb-ot-shape-complex-thai.cc \
+ hb-ot-shape-complex-use-table.cc \
hb-ot-shape-complex-use.cc \
hb-ot-shape-complex-use.hh \
- hb-ot-shape-complex-use-table.cc \
hb-ot-shape-complex-vowel-constraints.cc \
hb-ot-shape-complex-vowel-constraints.hh \
hb-ot-shape-complex.hh \
- hb-ot-shape-normalize.hh \
- hb-ot-shape-normalize.cc \
- hb-ot-shape-fallback.hh \
hb-ot-shape-fallback.cc \
+ hb-ot-shape-fallback.hh \
+ hb-ot-shape-normalize.cc \
+ hb-ot-shape-normalize.hh \
+ hb-ot-shape.cc \
hb-ot-shape.hh \
hb-ot-stat-table.hh \
- hb-ot-var.cc \
+ hb-ot-tag-table.hh \
+ hb-ot-tag.cc \
hb-ot-var-avar-table.hh \
hb-ot-var-fvar-table.hh \
hb-ot-var-hvar-table.hh \
hb-ot-var-mvar-table.hh \
- hb-ot-cff-common.hh \
- hb-cff-interp-common.hh \
- hb-cff-interp-cs-common.hh \
- hb-cff1-interp-cs.hh \
- hb-cff2-interp-cs.hh \
- hb-cff-interp-dict-common.hh \
+ hb-ot-var.cc \
+ hb-ot-vorg-table.hh \
+ hb-set-digest.hh \
+ hb-set.cc \
+ hb-set.hh \
+ hb-shape-plan.cc \
+ hb-shape-plan.hh \
+ hb-shape.cc \
+ hb-shaper-impl.hh \
+ hb-shaper-list.hh \
+ hb-shaper.cc \
+ hb-shaper.hh \
+ hb-static.cc \
+ hb-string-array.hh \
+ hb-unicode-emoji-table.hh \
+ hb-unicode.cc \
+ hb-unicode.hh \
+ hb-utf.hh \
+ hb-vector.hh \
+ hb-warning.cc \
+ hb.hh \
$(NULL)
-HB_OT_RAGEL_GENERATED_sources = \
+HB_BASE_RAGEL_GENERATED_sources = \
+ hb-buffer-deserialize-json.hh \
+ hb-buffer-deserialize-text.hh \
hb-ot-shape-complex-indic-machine.hh \
hb-ot-shape-complex-khmer-machine.hh \
hb-ot-shape-complex-myanmar-machine.hh \
hb-ot-shape-complex-use-machine.hh \
$(NULL)
-HB_OT_RAGEL_sources = \
+HB_BASE_RAGEL_sources = \
+ hb-buffer-deserialize-json.rl \
+ hb-buffer-deserialize-text.rl \
hb-ot-shape-complex-indic-machine.rl \
hb-ot-shape-complex-khmer-machine.rl \
hb-ot-shape-complex-myanmar-machine.rl \
hb-ot-shape-complex-use-machine.rl \
$(NULL)
-HB_OT_headers = \
- hb-aat.h \
+HB_BASE_headers = \
hb-aat-layout.h \
- hb-ot.h \
+ hb-aat.h \
+ hb-blob.h \
+ hb-buffer.h \
+ hb-common.h \
+ hb-deprecated.h \
+ hb-face.h \
+ hb-font.h \
+ hb-map.h \
hb-ot-color.h \
hb-ot-deprecated.h \
hb-ot-font.h \
@@ -202,6 +180,17 @@ HB_OT_headers = \
hb-ot-name.h \
hb-ot-shape.h \
hb-ot-var.h \
+ hb-ot.h \
+ hb-set.h \
+ hb-shape-plan.h \
+ hb-shape.h \
+ hb-unicode.h \
+ hb-version.h \
+ hb.h \
+ $(NULL)
+
+HB_FALLBACK_sources = \
+ hb-fallback-shape.cc \
$(NULL)
# Optional Sources and Headers with external deps
commit 967a204ee92548163a0d19678a237dcaf3720c20
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Sat Dec 1 19:28:17 2018 -0500
Minor
diff --git a/test/api/hb-subset-test.h b/test/api/hb-subset-test.h
index 6e7888c4..cefa4e06 100644
--- a/test/api/hb-subset-test.h
+++ b/test/api/hb-subset-test.h
@@ -73,7 +73,7 @@ hb_subset_test_check (hb_face_t *expected,
hb_tag_t table)
{
hb_blob_t *expected_blob, *actual_blob;
- fprintf(stderr, "compare %c%c%c%c\n", HB_UNTAG(table));
+ //fprintf(stderr, "comparing %c%c%c%c ", HB_UNTAG(table));
expected_blob = hb_face_reference_table (expected, table);
actual_blob = hb_face_reference_table (actual, table);
hb_test_assert_blobs_equal (expected_blob, actual_blob);
More information about the HarfBuzz
mailing list