Skip to content

Commit

Permalink
release v1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
rsms committed Aug 22, 2017
1 parent 06fd775 commit eda835f
Show file tree
Hide file tree
Showing 16 changed files with 59 additions and 13 deletions.
54 changes: 42 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#
all: all_web all_otf

VERSION := $(shell misc/version.py)

# generated.make is automatically generated by init.sh and defines depenencies for
# all styles and alias targets
include build/etc/generated.make
Expand Down Expand Up @@ -56,26 +58,54 @@ build/%.woff: build/%.ttf
# build/%.eot: build/%.ttf
# ttf2eot "$<" > "$@"

# TTF -> zip
zip: all
ZIP_FILE_DIST := build/release/Interface-${VERSION}.zip
ZIP_FILE_DEV := build/release/Interface-${VERSION}-$(shell git rev-parse --short=10 HEAD).zip

# zip intermediate
build/.zip.zip: all
@rm -rf build/.zip
@rm -f build/.zip.zip
@mkdir -p \
"build/.zip/Interface (web)" \
"build/.zip/Interface (hinted TTF)" \
"build/.zip/Interface (TTF)" \
"build/.zip/Interface (OTF)"
cp -a build/dist/*.woff build/dist/*.woff2 "build/.zip/Interface (web)/"
cp -a build/dist/*.ttf "build/.zip/Interface (hinted TTF)/"
cp -a build/dist-unhinted/*.ttf "build/.zip/Interface (TTF)/"
cp -a build/dist-unhinted/*.otf "build/.zip/Interface (OTF)/"
cp -a misc/doc/install-*.txt "build/.zip/"
cd build/.zip && zip -v -X -r "../../build/.zip.zip" *
@mkdir -p build/release
@mv -f build/.zip.zip build/release/Interface-`date '+%Y%m%d'`.zip
@echo write build/release/Interface-`date '+%Y%m%d'`.zip
@cp -a build/dist/*.woff build/dist/*.woff2 "build/.zip/Interface (web)/"
@cp -a build/dist/*.ttf "build/.zip/Interface (hinted TTF)/"
@cp -a build/dist-unhinted/*.ttf "build/.zip/Interface (TTF)/"
@cp -a build/dist-unhinted/*.otf "build/.zip/Interface (OTF)/"
@cp -a misc/doc/install-*.txt "build/.zip/"
cd build/.zip && zip -v -X -r "../../build/.zip.zip" * >/dev/null && cd ../..
@rm -rf build/.zip

# zip
build/release/Interface-%.zip: build/.zip.zip
@mkdir -p "$(shell dirname "$@")"
@mv -f "$<" "$@"
@echo write "$@"

zip: ${ZIP_FILE_DEV}
zip_dist: ${ZIP_FILE_DIST}

dist:
@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
@$(MAKE) zip_dist
rm -rf docs/font-files
mkdir docs/font-files
cp -a build/dist/*.woff build/dist/*.woff2 docs/font-files/
@echo "——————————————————————————————————————————————————————————————————"
@echo ""
@echo "Next step:"
@echo " Create new release with ${ZIP_FILE_DIST} at"
@echo ""
@echo " https://github.com/rsms/interface/releases/new?tag=v${VERSION}"
@echo ""
@echo "——————————————————————————————————————————————————————————————————"

install_ttf: all_ttf
@echo "Installing TTF files locally at ~/Library/Fonts/Interface"
rm -rf ~/Library/Fonts/Interface
Expand Down Expand Up @@ -103,4 +133,4 @@ _local/UnicodeData.txt:
clean:
rm -vrf build/tmp/* build/dist/Interface-*.*

.PHONY: all web clean install install_otf install_ttf deploy zip glyphinfo
.PHONY: all web clean install install_otf install_ttf deploy zip zip_dist dist glyphinfo
Binary file modified docs/font-files/Interface-Bold.woff
Binary file not shown.
Binary file modified docs/font-files/Interface-Bold.woff2
Binary file not shown.
Binary file modified docs/font-files/Interface-BoldItalic.woff
Binary file not shown.
Binary file modified docs/font-files/Interface-BoldItalic.woff2
Binary file not shown.
Binary file modified docs/font-files/Interface-Medium.woff
Binary file not shown.
Binary file modified docs/font-files/Interface-Medium.woff2
Binary file not shown.
Binary file modified docs/font-files/Interface-MediumItalic.woff
Binary file not shown.
Binary file modified docs/font-files/Interface-MediumItalic.woff2
Binary file not shown.
Binary file modified docs/font-files/Interface-Regular.woff
Binary file not shown.
Binary file modified docs/font-files/Interface-Regular.woff2
Binary file not shown.
Binary file modified docs/font-files/Interface-RegularItalic.woff
Binary file not shown.
Binary file modified docs/font-files/Interface-RegularItalic.woff2
Binary file not shown.
Binary file modified docs/res/sample.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions misc/version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/usr/bin/env python
# encoding: utf8
from __future__ import print_function
import os, sys
from collections import OrderedDict
from ConfigParser import RawConfigParser


def main():
srcDir = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'src')
config = RawConfigParser(dict_type=OrderedDict)
config.read(os.path.join(srcDir, 'fontbuild.cfg'))
sys.stdout.write(config.get('main', 'version'))

if __name__ == '__main__':
main()
2 changes: 1 addition & 1 deletion src/fontbuild.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[main]

version: 1.0
version: 1.1
foundry: rsms
foundryurl: https://rsms.me/
designer: Rasmus Andersson
Expand Down

0 comments on commit eda835f

Please sign in to comment.