diff options
| author | James Godfrey-Kittle <jamesgk@google.com> | 2015-04-14 20:44:48 -0700 |
|---|---|---|
| committer | James Godfrey-Kittle <jamesgk@google.com> | 2015-04-16 12:16:35 -0700 |
| commit | 1f220aa82142f35e7a44c67c9359135fe77d58b6 (patch) | |
| tree | a9e47853e7cbb1f82dc200441cb766eab0efb6d7 | |
| parent | 402408f2ef97158df1d35f7cc6f72817cea3b62e (diff) | |
Move v2 output from out/v2/ to out/.
Rollback changes from ra92a8e3146bd.
| -rwxr-xr-x | scripts/coverage_test.py | 4 | ||||
| -rw-r--r-- | scripts/lib/fontbuild/Build.py | 2 | ||||
| -rwxr-xr-x | scripts/run_exhaustive_tests.py | 4 | ||||
| -rwxr-xr-x | scripts/run_general_tests.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/scripts/coverage_test.py b/scripts/coverage_test.py index 82cf936..bd4275f 100755 --- a/scripts/coverage_test.py +++ b/scripts/coverage_test.py @@ -38,8 +38,8 @@ from nototools import unicode_data def load_fonts(): """Load all fonts built for Android.""" - all_fonts = (glob.glob('out/v2/RobotoTTF/*.ttf') - + glob.glob('out/v2/RobotoCondensedTTF/*.ttf')) + all_fonts = (glob.glob('out/RobotoTTF/*.ttf') + + glob.glob('out/RobotoCondensedTTF/*.ttf')) all_fonts = [ttLib.TTFont(font) for font in all_fonts] return all_fonts diff --git a/scripts/lib/fontbuild/Build.py b/scripts/lib/fontbuild/Build.py index 4dc5704..e416ed1 100644 --- a/scripts/lib/fontbuild/Build.py +++ b/scripts/lib/fontbuild/Build.py @@ -56,7 +56,7 @@ class FontProject: for roboName, aglName in roboNames: self.adobeGlyphList[roboName] = self.adobeGlyphList[aglName] - self.builddir = "out/v2" + self.builddir = "out" self.decompose = self.config.get("glyphs","decompose").split() self.predecompose = self.config.get("glyphs","predecompose").split() self.lessItalic = self.config.get("glyphs","lessitalic").split() diff --git a/scripts/run_exhaustive_tests.py b/scripts/run_exhaustive_tests.py index a499943..02d1583 100755 --- a/scripts/run_exhaustive_tests.py +++ b/scripts/run_exhaustive_tests.py @@ -27,8 +27,8 @@ import layout def load_fonts(): """Load all major fonts.""" - all_font_files = (glob.glob('out/v2/RobotoTTF/*.ttf') - + glob.glob('out/v2/RobotoCondensedTTF/*.ttf')) + all_font_files = (glob.glob('out/RobotoTTF/*.ttf') + + glob.glob('out/RobotoCondensedTTF/*.ttf')) all_fonts = [ttLib.TTFont(font) for font in all_font_files] assert len(all_font_files) == 18 return all_font_files, all_fonts diff --git a/scripts/run_general_tests.py b/scripts/run_general_tests.py index 3046dc9..5dd4dc8 100755 --- a/scripts/run_general_tests.py +++ b/scripts/run_general_tests.py @@ -21,7 +21,7 @@ import unittest import common_tests FONTS = common_tests.load_fonts( - ['out/v2/RobotoTTF/*.ttf', 'out/v2/RobotoCondensedTTF/*.ttf'], + ['out/RobotoTTF/*.ttf', 'out/RobotoCondensedTTF/*.ttf'], expected_count=18) class TestItalicAngle(common_tests.TestItalicAngle): |