[HarfBuzz] harfbuzz: Branch 'master' - 10 commits
Behdad Esfahbod
behdad at kemper.freedesktop.org
Thu Oct 2 13:40:55 PDT 2014
.travis.yml | 33 ++++++++-------------------------
README | 3 +++
README.md | 1 +
src/check-defs.sh | 2 +-
src/check-symbols.sh | 6 +++---
src/hb-ft.cc | 4 ++--
6 files changed, 18 insertions(+), 31 deletions(-)
New commits:
commit 8afaf096870d7895cf2fffb6438b02c0ad1b6c52
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Thu Oct 2 16:40:41 2014 -0400
[ft] Add NO_HINTING in a couple other places
diff --git a/src/hb-ft.cc b/src/hb-ft.cc
index 16bf51f..c42d484 100644
--- a/src/hb-ft.cc
+++ b/src/hb-ft.cc
@@ -136,7 +136,7 @@ hb_ft_get_glyph_v_origin (hb_font_t *font HB_UNUSED,
void *user_data HB_UNUSED)
{
FT_Face ft_face = (FT_Face) font_data;
- int load_flags = FT_LOAD_DEFAULT;
+ int load_flags = FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING;
if (unlikely (FT_Load_Glyph (ft_face, glyph, load_flags)))
return false;
@@ -185,7 +185,7 @@ hb_ft_get_glyph_extents (hb_font_t *font HB_UNUSED,
void *user_data HB_UNUSED)
{
FT_Face ft_face = (FT_Face) font_data;
- int load_flags = FT_LOAD_DEFAULT;
+ int load_flags = FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING;
if (unlikely (FT_Load_Glyph (ft_face, glyph, load_flags)))
return false;
commit 7228011411f0e490ad1ba9894dd0d576823903ea
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Oct 1 18:58:43 2014 -0400
[travis] Fix clang again
diff --git a/.travis.yml b/.travis.yml
index 702fea0..4b3e0f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ install:
script:
- NOCONFIGURE=1 ./autogen.sh
- ./configure --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2
- - make && make check && { rm -f src/.libs/NONE.gcov && touch src/NONE && test $CC == gcc && coveralls; }
+ - make && make check && { rm -f src/.libs/NONE.gcov; touch src/NONE; test $CC != gcc || coveralls; }
notifications:
irc: "irc.freenode.org#harfbuzz"
email: harfbuzz at lists.freedesktop.org
commit 406a020e5228d4a04da6282f5a75165bab7a483e
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Oct 1 18:54:55 2014 -0400
[travis] Fail build if coveralls fails
diff --git a/.travis.yml b/.travis.yml
index 548f26e..702fea0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ env:
- CFLAGS="-Werror --coverage"
- CXXFLAGS="-Werror --coverage"
- LDFLAGS="--coverage"
-before_install:
+install:
- sudo apt-get install pkg-config ragel gtk-doc-tools # for autogen.sh
- sudo apt-get install libfreetype6-dev # for font functions
- sudo apt-get install libglib2.0-dev # for font functions / tests / utils
@@ -16,21 +16,10 @@ before_install:
- sudo apt-get install libicu-dev # for extra unicode functions
- sudo apt-get install libgraphite2-dev # for extra shapers
- sudo pip install cpp-coveralls # for coveralls.io code coverage tracking
-install:
- - true
-before_script:
- - true
script:
- NOCONFIGURE=1 ./autogen.sh
- ./configure --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2
- - make && make check
-after_success:
- - rm -f src/.libs/NONE.gcov; touch src/NONE # coveralls needs some help
- - if test $CC == gcc; then coveralls; fi # currently only gcc works
-after_failure:
- - true
-after_script:
- - true
+ - make && make check && { rm -f src/.libs/NONE.gcov && touch src/NONE && test $CC == gcc && coveralls; }
notifications:
irc: "irc.freenode.org#harfbuzz"
email: harfbuzz at lists.freedesktop.org
commit a8aa20260dbd9af9cbcc7d545fa8b41b07aae276
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Oct 1 18:48:40 2014 -0400
[travis] Only run coveralls under gcc
diff --git a/.travis.yml b/.travis.yml
index be4522a..548f26e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,9 +25,8 @@ script:
- ./configure --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2
- make && make check
after_success:
- - rm -f src/.libs/NONE.gcov # coveralls chokes on this
- - touch src/NONE # see if this makes coveralls happy
- - coveralls
+ - rm -f src/.libs/NONE.gcov; touch src/NONE # coveralls needs some help
+ - if test $CC == gcc; then coveralls; fi # currently only gcc works
after_failure:
- true
after_script:
commit 5de0407337d630117e424b7c715b7cbd432f4ef9
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Oct 1 18:18:25 2014 -0400
Help clang with gcov
diff --git a/src/check-defs.sh b/src/check-defs.sh
index 357347f..65a2467 100755
--- a/src/check-defs.sh
+++ b/src/check-defs.sh
@@ -21,7 +21,7 @@ for def in $defs; do
lib=`echo "$def" | sed 's/[.]def$//;s at .*/@@'`
so=.libs/lib${lib}.so
- EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>' | cut -d' ' -f3`"
+ EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>\| __gcov_flush\>\| llvm_' | cut -d' ' -f3`"
if test -f "$so"; then
diff --git a/src/check-symbols.sh b/src/check-symbols.sh
index 91eefd4..b2bf43f 100755
--- a/src/check-symbols.sh
+++ b/src/check-symbols.sh
@@ -19,12 +19,12 @@ tested=false
for suffix in so dylib; do
so=.libs/libharfbuzz.$suffix
if ! test -f "$so"; then continue; fi
- prefix=
- EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>' | cut -d' ' -f3`"
+ EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>\| __gcov_flush\>\| llvm_' | cut -d' ' -f3`"
+
prefix=`basename "$so" | sed 's/libharfbuzz/hb/; s/-/_/g; s/[.].*//'`
- # Ob mac, C symbols are prefixed with _
+ # On mac, C symbols are prefixed with _
if test $suffix = dylib; then prefix="_$prefix"; fi
echo "Processing $so"
commit ef40ca8e5e830231539dc61088b58e907a840629
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Oct 1 18:07:27 2014 -0400
[travis] Try to make coverage work with clang
diff --git a/.travis.yml b/.travis.yml
index 25c028d..be4522a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,10 @@ compiler:
- gcc
env:
global:
- - FEATURES="--with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2"
- - CPPFLAGS="-Werror -fprofile-arcs -ftest-coverage" LDFLAGS="-lgcov"
+ - CPPFLAGS=""
+ - CFLAGS="-Werror --coverage"
+ - CXXFLAGS="-Werror --coverage"
+ - LDFLAGS="--coverage"
before_install:
- sudo apt-get install pkg-config ragel gtk-doc-tools # for autogen.sh
- sudo apt-get install libfreetype6-dev # for font functions
@@ -20,9 +22,8 @@ before_script:
- true
script:
- NOCONFIGURE=1 ./autogen.sh
- - ./configure $FEATURES CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
- - make
- - make check
+ - ./configure --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2
+ - make && make check
after_success:
- rm -f src/.libs/NONE.gcov # coveralls chokes on this
- touch src/NONE # see if this makes coveralls happy
commit 52784da17b7278f2587168234878bb15d918c9fe
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Oct 1 17:57:43 2014 -0400
[travis] Minor
diff --git a/README b/README
index c238604..d34bc74 100644
--- a/README
+++ b/README
@@ -1,3 +1,6 @@
+[](https://travis-ci.org/behdad/harfbuzz)
+[](https://coveralls.io/r/behdad/harfbuzz)
+
This is HarfBuzz, a text shaping library.
For bug reports, mailing list, and other information please visit:
@@ -5,6 +8,3 @@ For bug reports, mailing list, and other information please visit:
http://harfbuzz.org/
For license information, see the file COPYING.
-
-[](https://travis-ci.org/behdad/harfbuzz)
-[](https://coveralls.io/r/behdad/harfbuzz)
commit f2c9005f5123c7f9b227fd9ac9a3438c5fe4cf47
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Oct 1 17:45:17 2014 -0400
Add README.md symlink to make github happy
diff --git a/README.md b/README.md
new file mode 120000
index 0000000..100b938
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+README
\ No newline at end of file
commit 40987e8aaca4155d9cff211549e8d23f24c334e5
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Oct 1 17:44:30 2014 -0400
[travis] Re-enable clang
diff --git a/.travis.yml b/.travis.yml
index cc706c1..25c028d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
language: cpp
compiler:
- #- clang
+ - clang
- gcc
env:
global:
@@ -20,12 +20,6 @@ before_script:
- true
script:
- NOCONFIGURE=1 ./autogen.sh
- - echo CC=$CC
- - echo CXX=$CXX
- - echo CPP=$CPP
- - echo LD=$LD
- - echo CPPFLAGS="$CPPFLAGS"
- - echo LDFLAGS="$LDFLAGS"
- ./configure $FEATURES CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
- make
- make check
commit 5400ac476e5a5bcc66559fcfb05a683a6b433ea1
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Oct 1 17:41:41 2014 -0400
Add build and coverage status links
diff --git a/README b/README
index 74e739d..c238604 100644
--- a/README
+++ b/README
@@ -5,3 +5,6 @@ For bug reports, mailing list, and other information please visit:
http://harfbuzz.org/
For license information, see the file COPYING.
+
+[](https://travis-ci.org/behdad/harfbuzz)
+[](https://coveralls.io/r/behdad/harfbuzz)
More information about the HarfBuzz
mailing list