diff options
| author | Jules Aguillon | 2022-04-24 20:52:36 +0200 |
|---|---|---|
| committer | Jules Aguillon | 2022-04-24 20:52:36 +0200 |
| commit | 39952f8bdf2ee77e32152bf67df456a83e3e03fe (patch) | |
| tree | 0287109a42d37cb41e55aa456382df7184b513e3 /Makefile | |
| parent | ab4c73f9f3dda374e0ff60f2eab382612093263e (diff) | |
| download | unexpected-keyboard-39952f8bdf2ee77e32152bf67df456a83e3e03fe.tar.gz unexpected-keyboard-39952f8bdf2ee77e32152bf67df456a83e3e03fe.zip | |
Remove build dependency on Fontforge
The required version of fontforge (from 2020!) is not available in many
distros. This is an annoying for contributors and greatly complicated
the CI and F-Droid scripts.
The generated font file is now included in the sources. Fontforge is
still needed when adding new glyphs but this is not a common operation.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 19 |
1 files changed, 9 insertions, 10 deletions
@@ -22,7 +22,10 @@ clean: rm -rf _build/*.dex _build/class _build/gen _build/*.apk _build/*.unsigned-apk \ _build/*.idsig _build/assets -.PHONY: release debug installd clean +rebuild_special_font: + cd srcs/special_font && fontforge -lang=ff -script build.pe *.svg + +.PHONY: release debug installd clean rebuild_special_font $(shell mkdir -p _build) @@ -85,6 +88,11 @@ _build/%.unaligned-apk: $(addprefix _build/,$(APK_EXTRA_FILES)) $(MANIFEST_FILE) -I $(ANDROID_PLATFORM)/android.jar -F "$@" $(AAPT_PACKAGE_FLAGS) cd $(@D) && $(ANDROID_BUILD_TOOLS)/aapt add $(@F) $(APK_EXTRA_FILES) +# Copy the special font file into _build because aapt requires relative paths +_build/assets/special_font.ttf: srcs/special_font/result.ttf + mkdir -p $(@D) + cp "$<" "$@" + # R.java GEN_DIR = _build/gen @@ -95,15 +103,6 @@ $(R_FILE): $(RES_FILES) $(MANIFEST_FILE) $(ANDROID_BUILD_TOOLS)/aapt package -f -m -S $(RES_DIR) -J $(GEN_DIR) \ -M $(MANIFEST_FILE) -I $(ANDROID_PLATFORM)/android.jar -# Special font - -SPECIAL_FONT_GLYPHS = $(wildcard $(CURDIR)/srcs/special_font/*.svg) -SPECIAL_FONT_SCRIPT = $(CURDIR)/srcs/special_font/build.pe - -_build/assets/special_font.ttf: $(SPECIAL_FONT_SCRIPT) $(SPECIAL_FONT_GLYPHS) - mkdir -p $(@D) - fontforge -lang=ff -script $(SPECIAL_FONT_SCRIPT) $(CURDIR)/$@ $(SPECIAL_FONT_GLYPHS) - # Compile java classes and build classes.dex OBJ_DIR = _build/class |