From 1fa07fe0cc34ccb5e71d40ee14f02d280cb7895f Mon Sep 17 00:00:00 2001 From: Brad Erickson Date: Fri, 15 Apr 2016 13:01:39 -0700 Subject: make: Add directories/readme/licenses to packages Fixes #28 --- Makefile | 56 +++++++++++++++++++++++++++------------ linux/expected-results.test | 36 ------------------------- linux/tests.sh | 49 ---------------------------------- linux/tests/expected-results.test | 36 +++++++++++++++++++++++++ linux/tests/tests.sh | 49 ++++++++++++++++++++++++++++++++++ 5 files changed, 124 insertions(+), 102 deletions(-) delete mode 100644 linux/expected-results.test delete mode 100755 linux/tests.sh create mode 100644 linux/tests/expected-results.test create mode 100755 linux/tests/tests.sh diff --git a/Makefile b/Makefile index 4922e0d..7b1d390 100644 --- a/Makefile +++ b/Makefile @@ -9,12 +9,12 @@ TMP := /tmp SCFBUILD := SCFBuild/bin/scfbuild VERSION := 1.0-beta3 -FONT_PREFIX := build/EmojiOneColor-SVGinOT -REGULAR_FONT := $(FONT_PREFIX).ttf -REGULAR_ZIP := $(FONT_PREFIX)-$(VERSION).zip -LINUX_ZIP := $(FONT_PREFIX)-Linux-$(VERSION).zip -OSX_FONT := $(FONT_PREFIX)-OSX.ttf -OSX_ZIP := $(FONT_PREFIX)-OSX-$(VERSION).zip +FONT_PREFIX := EmojiOneColor-SVGinOT +REGULAR_FONT := build/$(FONT_PREFIX).ttf +REGULAR_PACKAGE := build/$(FONT_PREFIX)-$(VERSION) +OSX_FONT := build/$(FONT_PREFIX)-OSX.ttf +OSX_PACKAGE := build/$(FONT_PREFIX)-OSX-$(VERSION) +LINUX_PACKAGE := $(FONT_PREFIX)-Linux-$(VERSION) # There are two SVG source directories to keep the emojione assets separate. SVG_EMOJIONE := assets/emojione-svg @@ -27,20 +27,42 @@ SVG_STAGE_FILES := $(patsubst $(SVG_MORE)/%.svg, build/stage/%.svg, $(SVG_STAGE_ SVG_TRACE_FILES := $(patsubst build/stage/%.svg, build/svg-trace/%.svg, $(SVG_STAGE_FILES)) SVG_COLOR_FILES := $(patsubst build/stage/%.svg, build/svg-color/%.svg, $(SVG_STAGE_FILES)) -.PHONY: all package clean +.PHONY: all package regular-package linux-package osx-package clean all: $(REGULAR_FONT) $(OSX_FONT) -package: all - rm -rf $(REGULAR_ZIP) $(LINUX_ZIP) $(OSX_ZIP) build/linux - 7z a -tzip -mx=9 $(REGULAR_ZIP) ./$(REGULAR_FONT) - 7z a -tzip -mx=9 $(OSX_ZIP) ./$(OSX_FONT) - mkdir build/linux - cp -R linux/* build/linux/ - cp $(REGULAR_FONT) build/linux/ - cp README.md build/linux/ - 7z a -tzip -mx=9 $(LINUX_ZIP) ./build/linux/* - +# Create the operating system specific packages +package: regular-package linux-package osx-package + +regular-package: $(REGULAR_FONT) + rm -f $(REGULAR_PACKAGE).zip + rm -rf $(REGULAR_PACKAGE) + mkdir $(REGULAR_PACKAGE) + cp $(REGULAR_FONT) $(REGULAR_PACKAGE) + cp LICENSE* $(REGULAR_PACKAGE) + cp README.md $(REGULAR_PACKAGE) + 7z a -tzip -mx=9 $(REGULAR_PACKAGE).zip ./$(REGULAR_PACKAGE) + +linux-package: $(REGULAR_FONT) + rm -f build/$(LINUX_PACKAGE).tar.gz + rm -rf build/$(LINUX_PACKAGE) + mkdir build/$(LINUX_PACKAGE) + cp $(REGULAR_FONT) build/$(LINUX_PACKAGE) + cp LICENSE* build/$(LINUX_PACKAGE) + cp README.md build/$(LINUX_PACKAGE) + cp -R linux/* build/$(LINUX_PACKAGE) + tar zcvf build/$(LINUX_PACKAGE).tar.gz -C build $(LINUX_PACKAGE) + +osx-package: $(OSX_FONT) + rm -f $(OSX_PACKAGE).zip + rm -rf $(OSX_PACKAGE) + mkdir $(OSX_PACKAGE) + cp $(OSX_FONT) $(OSX_PACKAGE) + cp LICENSE* $(OSX_PACKAGE) + cp README.md $(OSX_PACKAGE) + 7z a -tzip -mx=9 $(OSX_PACKAGE).zip ./$(OSX_PACKAGE) + +# Build both versions of the fonts $(REGULAR_FONT): $(SVG_TRACE_FILES) $(SVG_COLOR_FILES) $(SCFBUILD) -c scfbuild.yml -o $(REGULAR_FONT) --font-version="$(VERSION)" diff --git a/linux/expected-results.test b/linux/expected-results.test deleted file mode 100644 index 142dfc4..0000000 --- a/linux/expected-results.test +++ /dev/null @@ -1,36 +0,0 @@ -Font: sans -Vera.ttf: "Bitstream Vera Sans" "Roman" -EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular" - -Font: sans-serif -Vera.ttf: "Bitstream Vera Sans" "Roman" -EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular" - -Font: serif -VeraSe.ttf: "Bitstream Vera Serif" "Roman" -EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular" - -Font: mono -VeraMono.ttf: "Bitstream Vera Sans Mono" "Roman" -EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular" - -Font: monospace -VeraMono.ttf: "Bitstream Vera Sans Mono" "Roman" -EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular" - -Font: Bitstream Vera Sans -Vera.ttf: "Bitstream Vera Sans" "Roman" -EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular" - -Font: Bitstream Vera Serif -VeraSe.ttf: "Bitstream Vera Serif" "Roman" -EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular" - -Font: Bitstream Vera Sans Mono -VeraMono.ttf: "Bitstream Vera Sans Mono" "Roman" -EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular" - -Font: Emoji One Color -EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular" -Vera.ttf: "Bitstream Vera Sans" "Roman" - diff --git a/linux/tests.sh b/linux/tests.sh deleted file mode 100755 index 1b6dc15..0000000 --- a/linux/tests.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -# Tests of fontconfig configuration for Bitstream Vera and Emoji One Color. -# -# The first two lines of the results of fc-match for each font request are -# are compared to known correct results. Any differences are shown. - -# The test result file -TMP=current-results.test -# The expected test result file -EXPECTED=expected-results.test - -FONTS[0]='sans' -FONTS[1]="sans-serif" -FONTS[2]="serif" -FONTS[3]="mono" -FONTS[4]="monospace" -FONTS[5]="Bitstream Vera Sans" -FONTS[6]="Bitstream Vera Serif" -FONTS[7]="Bitstream Vera Sans Mono" -FONTS[8]="Emoji One Color" - -rm -f $TMP - -# Run fc-match against all font values -for FONT in "${FONTS[@]}"; do - echo "Font: $FONT" >> $TMP - fc-match -s "$FONT" | head -n2 >> $TMP - echo >> $TMP -done - -# Create expected results if missing, aka delete to update. -if [ ! -f $EXPECTED ]; then - cp $TMP $EXPECTED - echo "Fontconfig tests: UPDATE" - exit 1 -fi -# Compare current results to expected results -echo diff $TMP $EXPECTED -diff -yt $TMP $EXPECTED -RESULT=$? -rm $TMP - -if [ $RESULT -eq 0 ]; then - echo "Fontconfig tests: PASS" - exit 0 -else - echo "Fontconfig tests: FAIL" - exit 1 -fi diff --git a/linux/tests/expected-results.test b/linux/tests/expected-results.test new file mode 100644 index 0000000..142dfc4 --- /dev/null +++ b/linux/tests/expected-results.test @@ -0,0 +1,36 @@ +Font: sans +Vera.ttf: "Bitstream Vera Sans" "Roman" +EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular" + +Font: sans-serif +Vera.ttf: "Bitstream Vera Sans" "Roman" +EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular" + +Font: serif +VeraSe.ttf: "Bitstream Vera Serif" "Roman" +EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular" + +Font: mono +VeraMono.ttf: "Bitstream Vera Sans Mono" "Roman" +EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular" + +Font: monospace +VeraMono.ttf: "Bitstream Vera Sans Mono" "Roman" +EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular" + +Font: Bitstream Vera Sans +Vera.ttf: "Bitstream Vera Sans" "Roman" +EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular" + +Font: Bitstream Vera Serif +VeraSe.ttf: "Bitstream Vera Serif" "Roman" +EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular" + +Font: Bitstream Vera Sans Mono +VeraMono.ttf: "Bitstream Vera Sans Mono" "Roman" +EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular" + +Font: Emoji One Color +EmojiOneColor-SVGinOT.ttf: "Emoji One Color" "Regular" +Vera.ttf: "Bitstream Vera Sans" "Roman" + diff --git a/linux/tests/tests.sh b/linux/tests/tests.sh new file mode 100755 index 0000000..1b6dc15 --- /dev/null +++ b/linux/tests/tests.sh @@ -0,0 +1,49 @@ +#!/bin/bash +# Tests of fontconfig configuration for Bitstream Vera and Emoji One Color. +# +# The first two lines of the results of fc-match for each font request are +# are compared to known correct results. Any differences are shown. + +# The test result file +TMP=current-results.test +# The expected test result file +EXPECTED=expected-results.test + +FONTS[0]='sans' +FONTS[1]="sans-serif" +FONTS[2]="serif" +FONTS[3]="mono" +FONTS[4]="monospace" +FONTS[5]="Bitstream Vera Sans" +FONTS[6]="Bitstream Vera Serif" +FONTS[7]="Bitstream Vera Sans Mono" +FONTS[8]="Emoji One Color" + +rm -f $TMP + +# Run fc-match against all font values +for FONT in "${FONTS[@]}"; do + echo "Font: $FONT" >> $TMP + fc-match -s "$FONT" | head -n2 >> $TMP + echo >> $TMP +done + +# Create expected results if missing, aka delete to update. +if [ ! -f $EXPECTED ]; then + cp $TMP $EXPECTED + echo "Fontconfig tests: UPDATE" + exit 1 +fi +# Compare current results to expected results +echo diff $TMP $EXPECTED +diff -yt $TMP $EXPECTED +RESULT=$? +rm $TMP + +if [ $RESULT -eq 0 ]; then + echo "Fontconfig tests: PASS" + exit 0 +else + echo "Fontconfig tests: FAIL" + exit 1 +fi -- cgit v1.2.3