Makefile: Move misc/tools/fix-vf-meta.py to a better place

This commit is contained in:
Rasmus Andersson 2019-10-21 12:08:42 -07:00
parent 95d2ac37d9
commit 4ca248c6c8

View file

@ -90,9 +90,13 @@ build/%.woff: build/%.ttf
# Master UFOs -> variable TTF # Master UFOs -> variable TTF
$(FONTDIR)/var/%.var.ttf: src/%.designspace $(all_ufo_masters) version.txt $(FONTDIR)/var/Inter.var.ttf: src/Inter.designspace $(all_ufo_masters) version.txt
misc/fontbuild compile-var -o $@ $(FONTBUILD_FLAGS) $< misc/fontbuild compile-var -o $@ $(FONTBUILD_FLAGS) $<
$(FONTDIR)/var/Inter-%.var.ttf: src/Inter-%.designspace $(all_ufo_masters) version.txt
misc/fontbuild compile-var -o $@ $(FONTBUILD_FLAGS) $<
misc/tools/fix-vf-meta.py $@
# Instance UFO -> OTF, TTF (note: masters' rules in generated.make) # Instance UFO -> OTF, TTF (note: masters' rules in generated.make)
$(FONTDIR)/const/Inter-%.otf: build/ufo/Inter-%.ufo version.txt $(FONTDIR)/const/Inter-%.otf: build/ufo/Inter-%.ufo version.txt
misc/fontbuild compile -o $@ $(FONTBUILD_FLAGS) $< misc/fontbuild compile -o $@ $(FONTBUILD_FLAGS) $<
@ -102,7 +106,8 @@ $(FONTDIR)/const/Inter-%.ttf: build/ufo/Inter-%.ufo version.txt
# designspace <- glyphs file # designspace <- glyphs file
src/Inter-*.designspace: src/Inter.designspace src/Inter-upright.designspace: src/Inter.designspace
src/Inter-italic.designspace: src/Inter.designspace
src/Inter.designspace: src/Inter.glyphs src/Inter.designspace: src/Inter.glyphs
misc/fontbuild glyphsync $< misc/fontbuild glyphsync $<
@ -217,14 +222,6 @@ build/tmp/a.zip:
cp -a misc/dist/*.txt "$(ZD)/" cp -a misc/dist/*.txt "$(ZD)/"
cp -a LICENSE.txt "$(ZD)/" cp -a LICENSE.txt "$(ZD)/"
@# @#
@# Fix VF metadata
misc/tools/fix-vf-meta.py \
"$(ZD)/Inter (web)/Inter-upright.var.woff2" \
"$(ZD)/Inter (web)/Inter-italic.var.woff2"
misc/tools/fix-vf-meta.py \
"$(ZD)/Inter (TTF variable)/Inter-upright.var.ttf" \
"$(ZD)/Inter (TTF variable)/Inter-italic.var.ttf"
@#
@# Add "beta" to Light and Thin filenames. @# Add "beta" to Light and Thin filenames.
@# Requires "rename" tool in PATH (`brew install rename` on macOS) @# Requires "rename" tool in PATH (`brew install rename` on macOS)
rename 's/(Light.*|Thin.*)\./$$1-BETA./' "$(ZD)/Inter"*/*.* rename 's/(Light.*|Thin.*)\./$$1-BETA./' "$(ZD)/Inter"*/*.*