summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile68
1 files changed, 41 insertions, 27 deletions
diff --git a/Makefile b/Makefile
index 274416796..be9db7734 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ all_ufo_masters = $(Thin_ufo_d) \
$(BlackItalic_ufo_d)
# Hinted variable font disabled. See https://github.com/rsms/inter/issues/75
-# all_var_hinted: $(FONTDIR)/var-hinted/Inter.var.ttf $(FONTDIR)/var-hinted/Inter.var.woff2
+# all_var_hinted: $(FONTDIR)/var-hinted/Inter.var.otf $(FONTDIR)/var-hinted/Inter.var.woff2
# .PHONY: all_var_hinted
.PHONY: all_const all_const_hinted var all_var
@@ -89,7 +89,7 @@ build/%.woff: build/%.ttf
ttf2woff -O -t woff "$<" "$@"
# make sure intermediate TTFs are not gc'd by make
-.PRECIOUS: build/%.ttf
+.PRECIOUS: build/%.ttf build/%.var.otf
@@ -155,14 +155,14 @@ $(FONTDIR)/const-hinted/%.ttf: $(FONTDIR)/const/%.ttf
# ttfautohint --fallback-stem-width=256 --no-info "$<" "$@"
# make sure intermediate TTFs are not gc'd by make
-.PRECIOUS: $(FONTDIR)/const/%.ttf $(FONTDIR)/const-hinted/%.ttf $(FONTDIR)/var/%.var.ttf
+.PRECIOUS: $(FONTDIR)/const/%.ttf $(FONTDIR)/const-hinted/%.ttf $(FONTDIR)/var/%.var.otf
# check var
test_var: all_var
- misc/fontbuild checkfont $(FONTDIR)/var/*.ttf $(FONTDIR)/var/*.woff2
+ misc/fontbuild checkfont $(FONTDIR)/var/*.otf $(FONTDIR)/var/*.woff2
# test runs all tests
# Note: all_check_const is generated by init.sh and runs "fontbuild checkfont"
@@ -177,7 +177,7 @@ check:
$(FONTDIR)/const/*.ttf \
$(FONTDIR)/const/*.otf \
$(FONTDIR)/const/*.woff2 \
- $(FONTDIR)/var/*.ttf \
+ $(FONTDIR)/var/*.otf \
$(FONTDIR)/var/*.woff2
@echo "check: all ok"
@@ -189,15 +189,18 @@ check:
# samples renders PDF and PNG samples
samples: $(FONTDIR)/samples all_samples_pdf all_samples_png
-$(FONTDIR)/samples/%.pdf: $(FONTDIR)/const/%.otf
+$(FONTDIR)/samples/%.pdf: $(FONTDIR)/const/%.otf $(FONTDIR)/samples
misc/tools/fontsample/fontsample -o "$@" "$<"
-$(FONTDIR)/samples/%.png: $(FONTDIR)/const/%.otf
+$(FONTDIR)/samples/%.png: $(FONTDIR)/const/%.otf $(FONTDIR)/samples
misc/tools/fontsample/fontsample -o "$@" "$<"
$(FONTDIR)/samples:
mkdir -p $@
+.PHONY: samples
+
+
ZD = build/tmp/zip
# intermediate zip target that creates a zip file at build/tmp/a.zip
@@ -205,29 +208,38 @@ build/tmp/a.zip:
@rm -rf "$(ZD)"
@rm -f build/tmp/a.zip
@mkdir -p \
- "$(ZD)/Inter (web)" \
- "$(ZD)/Inter (web hinted)" \
- "$(ZD)/Inter (TTF)" \
- "$(ZD)/Inter (TTF hinted)" \
- "$(ZD)/Inter (TTF variable)" \
- "$(ZD)/Inter (OTF)"
+ "$(ZD)/Inter" \
+ "$(ZD)/Inter (Hinted, for Windows)" \
+ "$(ZD)/Inter (Variable)" \
+ "$(ZD)/Inter (Variable, single axis)" \
+ "$(ZD)/Inter (Web)" \
+ "$(ZD)/Inter V (Variable)"
@#
@# copy font files
+ cp -a $(FONTDIR)/const/*.otf "$(ZD)/Inter/"
+ @#
cp -a $(FONTDIR)/const/*.woff \
$(FONTDIR)/const/*.woff2 \
- $(FONTDIR)/var/*.woff2 "$(ZD)/Inter (web)/"
+ $(FONTDIR)/var/Inter.var.woff2 \
+ $(FONTDIR)/var/Inter-italic.var.woff2 \
+ $(FONTDIR)/var/Inter-roman.var.woff2 \
+ misc/dist/inter.css \
+ "$(ZD)/Inter (Web)/"
cp -a $(FONTDIR)/const-hinted/*.woff \
$(FONTDIR)/const-hinted/*.woff2 \
- "$(ZD)/Inter (web hinted)/"
- cp -a $(FONTDIR)/const/*.ttf "$(ZD)/Inter (TTF)/"
- cp -a $(FONTDIR)/const-hinted/*.ttf "$(ZD)/Inter (TTF hinted)/"
- cp -a $(FONTDIR)/var/*.ttf "$(ZD)/Inter (TTF variable)/"
- cp -a $(FONTDIR)/const/*.otf "$(ZD)/Inter (OTF)/"
+ $(FONTDIR)/const-hinted/*.ttf \
+ misc/dist/inter.css \
+ "misc/dist/about hinted fonts.txt" \
+ "$(ZD)/Inter (Hinted, for Windows)/"
+ @#
+ cp -a $(FONTDIR)/var/Inter.var.otf "$(ZD)/Inter (Variable)/Inter.otf"
+ cp -a $(FONTDIR)/var/Inter-roman.var.otf "$(ZD)/Inter (Variable, single axis)/Inter-roman.otf"
+ cp -a $(FONTDIR)/var/Inter-italic.var.otf "$(ZD)/Inter (Variable, single axis)/Inter-italic.otf"
+ @#
+ cp -a $(FONTDIR)/var/Inter-V.var.otf "$(ZD)/Inter V (Variable)/Inter-V.otf"
@#
@# copy misc stuff
- cp -a misc/dist/inter.css "$(ZD)/Inter (web)/"
- cp -a misc/dist/inter.css "$(ZD)/Inter (web hinted)/"
- cp -a misc/dist/*.txt "$(ZD)/"
+ cp -a misc/dist/install*.txt "$(ZD)/"
cp -a LICENSE.txt "$(ZD)/"
@#
@# Add "beta" to Light and Thin filenames.
@@ -259,19 +271,17 @@ zip_dist: pre_dist
$(MAKE) check
$(MAKE) ${ZIP_FILE_DIST}
-.PHONY: zip zip_dist
-
# distribution
pre_dist: all
@echo "Creating distribution for version ${VERSION}"
@if [ -f "${ZIP_FILE_DIST}" ]; \
then echo "${ZIP_FILE_DIST} already exists. Bump version or remove the zip file to continue." >&2; \
exit 1; \
- fi
+ fi
+ misc/tools/versionize.py
dist: zip_dist
$(MAKE) -j docs
- misc/tools/versionize.py
@echo "——————————————————————————————————————————————————————————————————"
@echo ""
@echo "Next steps:"
@@ -285,6 +295,10 @@ dist: zip_dist
@echo ""
@echo "——————————————————————————————————————————————————————————————————"
+.PHONY: zip zip_dist pre_dist dist
+
+
+
docs: docs_fonts
$(MAKE) -j docs_info
@@ -363,4 +377,4 @@ install: install_otf
clean:
rm -rvf build/tmp build/fonts
-.PHONY: all web clean install install_otf install_ttf deploy pre_dist dist geninfo glyphsync
+.PHONY: all web clean install install_otf install_ttf