Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make: add googlefonts target #678

Merged
merged 4 commits into from
May 15, 2024
Merged

make: add googlefonts target #678

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a65452
make: add googlefonts target
m4rc1e Feb 6, 2024
ec3c759
implement Rasmus feedback
m4rc1e Mar 26, 2024
ad0c3d2
make: ensure venv is activated before running gftools
m4rc1e May 15, 2024
9c5b1e0
Upgrade gftools
m4rc1e May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,14 @@ var: \
$(FONTDIR)/var/InterVariable.ttf \
$(FONTDIR)/var/InterVariable-Italic.ttf

googlefonts: var
gftools fix-family $(FONTDIR)/var/*.ttf \
m4rc1e marked this conversation as resolved.
Show resolved Hide resolved
--rename-family "Inter" \
--include-source-fixes \
-o $(FONTDIR)/googlefonts;
gftools fontsetter $(FONTDIR)/googlefonts/Inter[opsz,wght].ttf src/googlefonts-fixes.yaml -o $(FONTDIR)/googlefonts/Inter[opsz,wght].ttf;
gftools fontsetter $(FONTDIR)/googlefonts/Inter-Italic[opsz,wght].ttf src/googlefonts-fixes.yaml -o $(FONTDIR)/googlefonts/Inter-Italic[opsz,wght].ttf;

var_web: \
$(FONTDIR)/var/InterVariable.woff2 \
$(FONTDIR)/var/InterVariable-Italic.woff2
Expand Down Expand Up @@ -297,7 +305,7 @@ static_otf: $(STATIC_FONTS_OTF)
static_ttf: $(STATIC_FONTS_TTF)
static_web: $(STATIC_FONTS_WEB)

all: var static web static_otf
all: var googlefonts static web static_otf

.PHONY: \
all var var_web web \
Expand Down Expand Up @@ -416,6 +424,7 @@ zip_beta: \
# - step2 runs tests, then makes a zip archive and updates the website (docs/ dir.)

DIST_ZIP = build/release/Inter-${VERSION}.zip
DIST_ZIP_GF = $(SRCDIR)/build/release/Inter-$(VERSION)-GoogleFonts.zip

dist:
@echo "——————————————————————————————————————————————————————————————————"
Expand All @@ -435,13 +444,15 @@ dist:
$(MAKE) -f $(MAKEFILE) -j$(nproc) clean
$(MAKE) -f $(MAKEFILE) -j$(nproc) all
$(MAKE) -f $(MAKEFILE) -j$(nproc) test
$(MAKE) -f $(MAKEFILE) -j$(nproc) dist_zip dist_docs
$(MAKE) -f $(MAKEFILE) -j$(nproc) dist_zip dist_zip_gf dist_docs
$(MAKE) -f $(MAKEFILE) dist_postflight

dist_zip: | venv
@#. $(VENV) ; python misc/tools/patch-version.py misc/dist/inter.css
bash misc/makezip2.sh -reveal-in-finder "$(DIST_ZIP)"

dist_zip_gf: | venv
cd "$(FONTDIR)/googlefonts" && zip -q -X -r "$(DIST_ZIP_GF)" *.ttf

dist_docs:
$(MAKE) -C docs -j$(nproc) dist

Expand Down
5 changes: 3 additions & 2 deletions Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ ufo2ft = "==2.30.0"
fontmake = "==3.5.*"
fontbakery = "==0.10.4"
skia-pathops = "==0.8.*"
gftools = "==0.9.*"
gftools = "==0.9.52"
glyphspkg = "==0.1.*"
brotli = "==1.0.*"
psautohint = "==2.4.*"
pipfile = "*"

[dev-packages]

# Mainly due to https://pypi.org/project/fonttools/
# > FontTools requires Python 3.8 or later. We try to follow the same schedule
# > of minimum Python version support as NumPy (see NEP 29).

[requires]
python_version = "3.8"
Loading