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

Raleway to heaven [part 1] #68

Merged
merged 3 commits into from
Aug 22, 2020
Merged

Raleway to heaven [part 1] #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f53bd43
fix(ufo): Detect base package-directory names
alerque Aug 22, 2020
13215d1
fix(ufo): Use configurable source directory
alerque Aug 22, 2020
00f7f2e
chore(rules): Don't hide log information that says what failed
alerque Aug 22, 2020
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
4 changes: 2 additions & 2 deletions src/rules-ufo.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
# UFO -> OTF

define otf_instance_template ?=
$$(BUILDDIR)/$1-%-instance.otf: $1-%.ufo | $$(BUILDDIR)
$$(BUILDDIR)/$1-%-instance.otf: $(SOURCEDIR)/$1-%.ufo | $$(BUILDDIR)
$$(FONTMAKE) $$(FONTMAKEFLAGS) -u $$< -o otf --output-path $$@
endef

# UFO -> TTF

define ttf_instance_template ?=
$$(BUILDDIR)/$1-%-instance.ttf: $1-%.ufo | $$(BUILDDIR)
$$(BUILDDIR)/$1-%-instance.ttf: $(SOURCEDIR)/$1-%.ufo | $$(BUILDDIR)
$$(FONTMAKE) $$(FONTMAKEFLAGS) -u $$< -o ttf --output-path $$@
$$(GFTOOLS) $$(GFTOOLSFLAGS) fix-dsig --autofix $$@
endef
4 changes: 2 additions & 2 deletions src/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ SOURCEDIR ?= sources
# Some Makefile shinanigans to avoid aggressive trimming
space := $() $()

SOURCES ?= $(shell git ls-files '$(SOURCEDIR)/*.glyphs' '$(SOURCEDIR)/*.sfd' '$(SOURCEDIR)/*.ufo')
SOURCES ?= $(shell git ls-files -- '$(SOURCEDIR)/*.glyphs' '$(SOURCEDIR)/*.sfd' '$(SOURCEDIR)/*.ufo/*' | sed -e '/\.ufo/s#.ufo/.*#.ufo#' | uniq)
CANONICAL ?= $(or $(and $(filter %.glyphs,$(SOURCES)),glyphs),\
$(and $(filter %.sfd,$(SOURCES)),sfd),\
$(and $(filter %.ufo,$(SOURCES)),ufo))
Expand Down Expand Up @@ -287,7 +287,7 @@ $(STATICTTFS): %.ttf: $(BUILDDIR)/%-hinted.ttf.fix $(BUILDDIR)/last-commit
$(normalizeVersion)

$(BUILDDIR)/%-hinted.otf: $(BUILDDIR)/%-instance.otf
$(PSAUTOHINT) $(PSAUTOHINTFLAGS) $< -o $@ --log [email protected]
$(PSAUTOHINT) $(PSAUTOHINTFLAGS) $< -o $@

$(BUILDDIR)/%-subr.otf: $(BUILDDIR)/%-hinted.otf
$(PYTHON) -m cffsubr -o $@ $<
Expand Down