[HarfBuzz] harfbuzz: Branch 'master' - 5 commits
Behdad Esfahbod
behdad at kemper.freedesktop.org
Wed Oct 1 12:49:30 PDT 2014
src/Makefile.am | 43 ++++++++++++++++++++++---------------------
src/check-static-inits.sh | 4 ++--
2 files changed, 24 insertions(+), 23 deletions(-)
New commits:
commit c0b82ba32a1987902a3b9c05b46f8be6b121883a
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Oct 1 14:24:07 2014 -0400
Create ragel-generated files in srcdir
diff --git a/src/Makefile.am b/src/Makefile.am
index 07d957a..71614a4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -290,13 +290,14 @@ built-sources: $(BUILT_SOURCES)
.PHONY: unicode-tables arabic-table indic-table built-sources
-BUILT_SOURCES += \
- hb-buffer-deserialize-json.hh \
- hb-buffer-deserialize-text.hh \
- hb-ot-shape-complex-indic-machine.hh \
- hb-ot-shape-complex-myanmar-machine.hh \
- hb-ot-shape-complex-sea-machine.hh \
+RAGEL_GENERATED = \
+ $(srcdir)/hb-buffer-deserialize-json.hh \
+ $(srcdir)/hb-buffer-deserialize-text.hh \
+ $(srcdir)/hb-ot-shape-complex-indic-machine.hh \
+ $(srcdir)/hb-ot-shape-complex-myanmar-machine.hh \
+ $(srcdir)/hb-ot-shape-complex-sea-machine.hh \
$(NULL)
+BUILT_SOURCES += $(RAGEL_GENERATED)
EXTRA_DIST += \
hb-buffer-deserialize-json.rl \
hb-buffer-deserialize-text.rl \
@@ -304,15 +305,9 @@ EXTRA_DIST += \
hb-ot-shape-complex-myanmar-machine.rl \
hb-ot-shape-complex-sea-machine.rl \
$(NULL)
-MAINTAINERCLEANFILES += \
- hb-buffer-deserialize-json.hh \
- hb-buffer-deserialize-text.hh \
- hb-ot-shape-complex-indic-machine.hh \
- hb-ot-shape-complex-myanmar-machine.hh \
- hb-ot-shape-complex-sea-machine.hh \
- $(NULL)
-.rl.hh:
- $(AM_V_GEN)$(RAGEL) -e -F1 -o "$@" "$<" \
+MAINTAINERCLEANFILES += $(RAGEL_GENERATED)
+$(srcdir)/%.hh: $(srcdir)/%.rl
+ $(AM_V_GEN)(cd $(srcdir) && $(RAGEL) -e -F1 -o "$*.hh" "$*.rl") \
|| ($(RM) "$@"; false)
noinst_PROGRAMS = \
commit 79bbb10b0da49ace763a50f259c2ea687143f7ea
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Oct 1 13:33:21 2014 -0400
Clean ragel-generated headers in maintainercleanfiles
diff --git a/src/Makefile.am b/src/Makefile.am
index 78566fd..07d957a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -304,6 +304,13 @@ EXTRA_DIST += \
hb-ot-shape-complex-myanmar-machine.rl \
hb-ot-shape-complex-sea-machine.rl \
$(NULL)
+MAINTAINERCLEANFILES += \
+ hb-buffer-deserialize-json.hh \
+ hb-buffer-deserialize-text.hh \
+ hb-ot-shape-complex-indic-machine.hh \
+ hb-ot-shape-complex-myanmar-machine.hh \
+ hb-ot-shape-complex-sea-machine.hh \
+ $(NULL)
.rl.hh:
$(AM_V_GEN)$(RAGEL) -e -F1 -o "$@" "$<" \
|| ($(RM) "$@"; false)
commit 8971cac83eb4f06847abfa3eaa15857d27141810
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Oct 1 12:41:03 2014 -0400
Don't use tmp files in Makefile
Useful for code-coverage generation of the ragel-generated files
as they will now contain the correct .hh filename in them.
diff --git a/src/Makefile.am b/src/Makefile.am
index ba07ac5..78566fd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -234,8 +234,8 @@ hb-gobject-enums.%: hb-gobject-enums.%.tmpl $(HBHEADERS)
$(AM_V_GEN) $(GLIB_MKENUMS) \
--identifier-prefix hb_ --symbol-prefix hb_gobject \
--template $^ | \
- sed 's/_t_get_type/_get_type/g; s/_T (/ (/g' > "$@.tmp" && \
- mv "$@.tmp" "$@" || ( $(RM) "@.tmp" && false )
+ sed 's/_t_get_type/_get_type/g; s/_T (/ (/g' > "$@" \
+ || ($(RM) "$@"; false)
endif
EXTRA_DIST += \
harfbuzz-gobject.pc.in \
@@ -251,8 +251,8 @@ EXTRA_DIST += \
-e 's@%libdir%@$(libdir)@g' \
-e 's@%includedir%@$(includedir)@g' \
-e 's@%VERSION%@$(VERSION)@g' \
- "$<" \
- > "$@.tmp" && mv "$@.tmp" "$@" || ( $(RM) "$@.tmp"; false )
+ "$<" > "$@" \
+ || ($(RM) "$@"; false)
CLEANFILES += $(pkgconfig_DATA)
@@ -265,8 +265,9 @@ harfbuzz.def: $(HBHEADERS) $(HBNODISTHEADERS)
sed -e 's/ (.*//' | \
LANG=C sort; \
echo LIBRARY libharfbuzz-$(HB_VERSION_MAJOR).dll; \
- ) >"$@.tmp"
- @ ! grep -q hb_ERROR "$@.tmp" && mv "$@.tmp" "$@" || ($(RM) "$@"; false)
+ ) >"$@"
+ @ ! grep -q hb_ERROR "$@" \
+ || ($(RM) "$@"; false)
GENERATORS = \
@@ -278,14 +279,12 @@ EXTRA_DIST += $(GENERATORS)
unicode-tables: arabic-table indic-table
indic-table: gen-indic-table.py IndicSyllabicCategory.txt IndicMatraCategory.txt Blocks.txt
- $(AM_V_GEN) $(builddir)/$^ > hb-ot-shape-complex-indic-table.cc.tmp && \
- mv hb-ot-shape-complex-indic-table.cc.tmp $(srcdir)/hb-ot-shape-complex-indic-table.cc || \
- ($(RM) hb-ot-shape-complex-indic-table.cc.tmp; false)
+ $(AM_V_GEN) $(builddir)/$^ > hb-ot-shape-complex-indic-table.cc \
+ || ($(RM) hb-ot-shape-complex-indic-table.cc; false)
arabic-table: gen-arabic-table.py ArabicShaping.txt UnicodeData.txt Blocks.txt
- $(AM_V_GEN) $(builddir)/$^ > hb-ot-shape-complex-arabic-table.hh.tmp && \
- mv hb-ot-shape-complex-arabic-table.hh.tmp $(srcdir)/hb-ot-shape-complex-arabic-table.hh || \
- ($(RM) hb-ot-shape-complex-arabic-table.hh.tmp; false)
+ $(AM_V_GEN) $(builddir)/$^ > hb-ot-shape-complex-arabic-table.hh \
+ || ($(RM) hb-ot-shape-complex-arabic-table.hh; false)
built-sources: $(BUILT_SOURCES)
@@ -306,8 +305,8 @@ EXTRA_DIST += \
hb-ot-shape-complex-sea-machine.rl \
$(NULL)
.rl.hh:
- $(AM_V_GEN)$(RAGEL) -e -F1 -o "$@.tmp" "$<" && \
- mv "$@.tmp" "$@" || ( $(RM) "$@.tmp" && false )
+ $(AM_V_GEN)$(RAGEL) -e -F1 -o "$@" "$<" \
+ || ($(RM) "$@"; false)
noinst_PROGRAMS = \
main \
commit 22723186652224a635f1dad5cda0f753e78c301d
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Oct 1 11:56:07 2014 -0400
check-static-inits: Filter out zero-length sections
When compiling with -O0, zero-sized constructors were showing up
and confusing the test.
diff --git a/src/check-static-inits.sh b/src/check-static-inits.sh
index 6b03dd2..1446fa7 100755
--- a/src/check-static-inits.sh
+++ b/src/check-static-inits.sh
@@ -22,7 +22,7 @@ fi
echo "Checking that no object file has static initializers"
for obj in $OBJS; do
- if objdump -t "$obj" | grep '[.][cd]tors'; then
+ if objdump -t "$obj" | grep '[.][cd]tors' | grep -v '\<00*\>'; then
echo "Ouch, $obj has static initializers/finalizers"
stat=1
fi
commit b695a3dc2300ed970a4154ad8b997407b3cb4faf
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Oct 1 11:55:14 2014 -0400
check-static-inits: check for static finalizers
diff --git a/src/check-static-inits.sh b/src/check-static-inits.sh
index 83d02c8..6b03dd2 100755
--- a/src/check-static-inits.sh
+++ b/src/check-static-inits.sh
@@ -22,8 +22,8 @@ fi
echo "Checking that no object file has static initializers"
for obj in $OBJS; do
- if objdump -t "$obj" | grep '[.]ctors'; then
- echo "Ouch, $obj has static initializers"
+ if objdump -t "$obj" | grep '[.][cd]tors'; then
+ echo "Ouch, $obj has static initializers/finalizers"
stat=1
fi
done
More information about the HarfBuzz
mailing list