From e58a66978a458b23da8d47857778414a0812b3ea Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaledhosny@eglug.org>
Date: Fri, 19 Jun 2015 18:34:08 +0200
Subject: [PATCH] Fix build
Fix the paths after repo split.
---
Makefile | 10 +++++-----
add_svg_glyphs.py | 2 +-
flag_glyph_name.py | 2 +-
map_pua_emoji.py | 3 ++-
third_party/color_emoji/add_glyphs.py | 4 ++--
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
index 000933cc3..94dae55e1 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ font: $(EMOJI).ttf
CFLAGS = -std=c99 -Wall -Wextra `pkg-config --cflags --libs cairo`
LDFLAGS = `pkg-config --libs cairo`
-PNGQUANTDIR := $(abspath `pwd`/../../third_party/pngquant)
+PNGQUANTDIR := $(abspath `pwd`/../third_party/pngquant)
PNGQUANT := $(PNGQUANTDIR)/pngquant
PNGQUANTFLAGS = --speed 1 --skip-if-larger --ext '.png' --force
@@ -55,7 +55,7 @@ FLAGS = AD AE AF AG AI AL AM AO AR AS AT AU AW AX AZ \
YE \
ZA ZM ZW
-FLAGS_SRC_DIR = ../third_party/region-flags/png
+FLAGS_SRC_DIR = third_party/region-flags/png
FLAGS_DIR = ./flags
glyph_name = $(shell ./flag_glyph_name.py $(flag))
@@ -76,9 +76,9 @@ $(PNG128_FLAGS): flag-symlinks
EMOJI_PNG128 = ./png/128/emoji_u
-EMOJI_BUILDER = ../third_party/color_emoji/emoji_builder.py
-ADD_GLYPHS = ../third_party/color_emoji/add_glyphs.py
-PUA_ADDER = ../nototools/map_pua_emoji.py
+EMOJI_BUILDER = third_party/color_emoji/emoji_builder.py
+ADD_GLYPHS = third_party/color_emoji/add_glyphs.py
+PUA_ADDER = map_pua_emoji.py
%.ttx: %.ttx.tmpl $(ADD_GLYPHS) $(UNI) flag-symlinks
python $(ADD_GLYPHS) "$<" "$@" "$(EMOJI_PNG128)"
diff --git a/add_svg_glyphs.py b/add_svg_glyphs.py
index 413f0d398..913bfd0cf 100755
--- a/add_svg_glyphs.py
+++ b/add_svg_glyphs.py
@@ -33,8 +33,8 @@ from fontTools.ttLib.tables import otTables
from fontTools.ttLib.tables import _g_l_y_f
from fontTools.ttLib.tables import S_V_G_ as SVG
from fontTools import ttx
-from nototools import add_emoji_gsub
+import add_emoji_gsub
import svg_builder
import svg_cleaner
diff --git a/flag_glyph_name.py b/flag_glyph_name.py
index e51b56fb9..f5d6ce256 100755
--- a/flag_glyph_name.py
+++ b/flag_glyph_name.py
@@ -20,7 +20,7 @@ __author__ = 'roozbeh@google.com (Roozbeh Pournader)'
import sys
-from nototools import add_emoji_gsub
+import add_emoji_gsub
def two_letter_code_to_glyph_name(iso_code):
return 'u%04x_%04x' % (
diff --git a/map_pua_emoji.py b/map_pua_emoji.py
index 5d03b9df6..676aea39f 100644
--- a/map_pua_emoji.py
+++ b/map_pua_emoji.py
@@ -22,9 +22,10 @@ import sys
from fontTools import ttLib
-from nototools import add_emoji_gsub
from nototools import font_data
+import add_emoji_gsub
+
def get_glyph_name_from_gsub(char_seq, font):
"""Find the glyph name for ligature of a given character sequence from GSUB.
diff --git a/third_party/color_emoji/add_glyphs.py b/third_party/color_emoji/add_glyphs.py
index dc2b11c81..d92962458 100644
--- a/third_party/color_emoji/add_glyphs.py
+++ b/third_party/color_emoji/add_glyphs.py
@@ -5,8 +5,8 @@ from fontTools import ttx
from fontTools.ttLib.tables import otTables
from png import PNG
-sys.path.append('../../nototools')
-from nototools import add_emoji_gsub
+sys.path.append('../../')
+import add_emoji_gsub
def glyph_name(string):