[cantarell-fonts/ufo-conversion] Adjust build system and deps to use new scripts

[Nikolaus Waxweiler <nwaxweiler src gnome org>]

commit 3f5f6092f644b2b6d850693688823785b2bb186d
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Mon Mar 25 21:24:37 2019 +0000

    Adjust build system and deps to use new scripts

 meson.build                  |  6 +++---
 requirements-dev.in          |  3 +--
 requirements-dev.txt         | 10 ++++-----
 requirements.in              |  8 ++++++--
 requirements.txt             | 20 +++++++++---------
 scripts/fm.py                | 48 --------------------------------------------
 scripts/make-static-fonts.py |  4 ++--
 src/meson.build              | 19 ++++++++++++++++--
 8 files changed, 42 insertions(+), 76 deletions(-)
---
diff --git a/meson.build b/meson.build
index a6ee1abc..6576e013 100644
--- a/meson.build
+++ b/meson.build
@@ -10,9 +10,9 @@ endif
 
 useprebuilt = get_option('useprebuilt')
 if useprebuilt == false
-  python3 = import('python3').find_python()
-  fontmake = find_program('fontmake')
-  fontmake_wrapper = join_paths(meson.current_source_dir(), 'scripts', 'fm.py')
+  python3 = import('python').find_installation('python3')
+  make_static_fonts = join_paths(meson.current_source_dir(), 'scripts', 'make-static-fonts.py')
+  make_variable_font = join_paths(meson.current_source_dir(), 'scripts', 'make-variable-font.py')
   psautohint = find_program('psautohint')
   subdir('src')
 else
diff --git a/requirements-dev.in b/requirements-dev.in
index 6624540c..8f6bf724 100644
--- a/requirements-dev.in
+++ b/requirements-dev.in
@@ -1,7 +1,6 @@
 -r requirements.txt
 
-ufoLib2
-glyphsLib>=2.3.0
+glyphsLib>=3.3.0
 
 mypy
 pylint
\ No newline at end of file
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 35496223..cf195836 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -4,6 +4,7 @@
 #
 #    pip-compile --output-file requirements-dev.txt requirements-dev.in
 #
+-e git+git://github.com/googlei18n/ufo2ft@99531b06e94f70c1958adcaef4913f5ab89d0d1b#egg=ufo2ft
 appdirs==1.4.3
 astroid==2.2.5            # via pylint
 attrs==18.2.0
@@ -11,17 +12,15 @@ booleanoperations==0.8.2
 cattrs==0.9.0
 compreffor==0.4.6.post1
 cu2qu==1.6.5
-defcon[lxml]==0.6.0
-fontmake==1.9.1
-fontmath==0.4.9
+defcon==0.6.0
+fontmath==0.5.0
 fonttools[lxml,ufo,unicode]==3.39.0
 fs==2.4.4
 glyphslib==3.3.0
-isort==4.3.15             # via pylint
+isort==4.3.16             # via pylint
 lazy-object-proxy==1.3.1  # via astroid
 lxml==4.3.2
 mccabe==0.6.1             # via pylint
-mutatormath==2.1.2
 mypy-extensions==0.4.1    # via mypy
 mypy==0.670
 psautohint==1.9.1
@@ -31,6 +30,5 @@ pytz==2018.9
 six==1.12.0
 statmake==0.1.1
 typed-ast==1.3.1          # via astroid, mypy
-ufo2ft==2.7.0
 ufolib2==0.3.2.post2
 wrapt==1.11.1             # via astroid
diff --git a/requirements.in b/requirements.in
index 48e63ac2..796a0eb6 100644
--- a/requirements.in
+++ b/requirements.in
@@ -1,3 +1,7 @@
-fontmake>=1.9.1
+attrs>=18.2
+fontMath>=0.5.0
+fontTools>=3.39.0
 psautohint>=1.8.0
-statmake
\ No newline at end of file
+statmake
+ufoLib2>=0.3.2.post2
+-e git+git://github.com/googlei18n/ufo2ft@99531b06e94f70c1958adcaef4913f5ab89d0d1b#egg=ufo2ft
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 72411f8a..9ebd154f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,23 +4,21 @@
 #
 #    pip-compile --output-file requirements.txt requirements.in
 #
+-e git+git://github.com/googlei18n/ufo2ft@99531b06e94f70c1958adcaef4913f5ab89d0d1b#egg=ufo2ft
 appdirs==1.4.3            # via fs
-attrs==18.2.0             # via cattrs, statmake
-booleanoperations==0.8.2  # via fontmake, ufo2ft
+attrs==18.2.0
+booleanoperations==0.8.2
 cattrs==0.9.0             # via statmake
-compreffor==0.4.6.post1   # via ufo2ft
-cu2qu==1.6.5              # via fontmake, ufo2ft
-defcon[lxml]==0.6.0       # via fontmake, glyphslib, mutatormath, ufo2ft
-fontmake==1.9.1
-fontmath==0.4.9           # via mutatormath
-fonttools[lxml,ufo,unicode]==3.39.0  # via booleanoperations, compreffor, cu2qu, defcon, fontmake, fontmath, 
glyphslib, mutatormath, psautohint, statmake, ufo2ft
+compreffor==0.4.6.post1
+cu2qu==1.6.5
+defcon==0.6.0
+fontmath==0.5.0
+fonttools[lxml,ufo,unicode]==3.39.0
 fs==2.4.4                 # via fonttools
-glyphslib==3.3.0          # via fontmake
 lxml==4.3.2               # via fonttools
-mutatormath==2.1.2        # via fontmake
 psautohint==1.9.1
 pyclipper==1.1.0.post1    # via booleanoperations
 pytz==2018.9              # via fs
 six==1.12.0               # via fs
 statmake==0.1.1
-ufo2ft==2.7.0             # via fontmake
+ufolib2==0.3.2.post2
diff --git a/scripts/make-static-fonts.py b/scripts/make-static-fonts.py
index 47f39187..d956c8b3 100644
--- a/scripts/make-static-fonts.py
+++ b/scripts/make-static-fonts.py
@@ -11,7 +11,7 @@ import ufo2ft
 import instantiator
 
 
-def generate_and_write_instance(
+def generate_and_write_autohinted_instance(
     instantiator: instantiator.Instantiator,
     instance_descriptor: fontTools.designspaceLib.InstanceDescriptor,
     output_dir: Path,
@@ -64,7 +64,7 @@ if __name__ == "__main__":
     for index, instance in enumerate(designspace.instances):
         processes.append(
             pool.apply_async(
-                generate_and_write_instance,
+                generate_and_write_autohinted_instance,
                 args=(generator, instance, args.output_dir, args.psautohint),
             )
         )
diff --git a/src/meson.build b/src/meson.build
index cd06b85e..969b83be 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,5 +1,5 @@
 custom_target(
-    'cantarell-fonts',
+    'cantarell-static-fonts',
     input: 'Cantarell.designspace',
     output: [
         'Cantarell-Thin.otf',
@@ -8,7 +8,22 @@ custom_target(
         'Cantarell-Bold.otf',
         'Cantarell-ExtraBold.otf',
     ],
-    command: [python3, fontmake_wrapper, fontmake, psautohint, '@INPUT@', '@OUTDIR@'],
+    command: [python3, make_static_fonts, '@INPUT@', psautohint, '@OUTDIR@'],
     install: true,
     install_dir: fontsdir,
 )
+
+custom_target(
+    'cantarell-variable-font',
+    input: 'Cantarell.designspace',
+    output: 'Cantarell.ttf',
+    command: [
+        python3,
+        make_variable_font,
+        '@INPUT@',
+        join_paths(meson.current_source_dir(), 'Cantarell.stylespace'),
+        '@OUTPUT@'
+    ],
+    install: true,
+    install_dir: fontsdir,
+)
\ No newline at end of file