Added support for git theme repos

Usage:
OMEGA_THEME_REPO must be set to a valid git url, or local for local repository
OMEGA_THEME_NAME must be set to an existing theme in the repository
This commit is contained in:
M4x1m3
2020-06-22 19:02:32 +02:00
parent 3f959a44db
commit 72d9e31847
5 changed files with 30 additions and 7 deletions

View File

@@ -35,7 +35,8 @@ info:
@echo "EPSILON_VERSION = $(EPSILON_VERSION)"
@echo "EPSILON_APPS = $(EPSILON_APPS)"
@echo "EPSILON_I18N = $(EPSILON_I18N)"
@echo "OMEGA_THEME = $(OMEGA_THEME)"
@echo "OMEGA_THEME_NAME = $(OMEGA_THEME_NAME)"
@echo "OMEGA_THEME_REPO = $(OMEGA_THEME_REPO)"
@echo "BUILD_DIR = $(BUILD_DIR)"
@echo "PLATFORM" = $(PLATFORM)
@echo "DEBUG" = $(DEBUG)

View File

@@ -107,10 +107,20 @@ apps_tests_src += $(addprefix apps/,\
global_preferences.cpp \
)
ifeq ($(OMEGA_THEME_REPO),local)
$(foreach img,$(image_list), $(eval $(call rule_for, \
ICON, \
$(img), \
$(addprefix themes/themes/, $(addsuffix .json, $(OMEGA_THEME))), \
$$(PYTHON) themes/themes_manager.py -i $(OMEGA_THEME) $$@ $(BUILD_DIR)/, \
$(addprefix themes/themes/local/, $(addsuffix .json, $(OMEGA_THEME_NAME))), \
$$(PYTHON) themes/themes_manager.py -i $(OMEGA_THEME_REPO) $(OMEGA_THEME_NAME) $$@ $(BUILD_DIR)/, \
global \
)))
else
$(foreach img,$(image_list), $(eval $(call rule_for, \
ICON, \
$(img), \
$(addsuffix /escher/palette.h, $(BUILD_DIR)), \
$$(PYTHON) themes/themes_manager.py -i $(OMEGA_THEME_REPO) $(OMEGA_THEME_NAME) $$@ $(BUILD_DIR)/, \
global \
)))
endif

View File

@@ -13,5 +13,6 @@ EPSILON_I18N ?= en fr es de pt hu
EPSILON_GETOPT ?= 0
EPSILON_TELEMETRY ?= 0
ESCHER_LOG_EVENTS_BINARY ?= 0
OMEGA_THEME ?= omega_light
OMEGA_THEME_NAME ?= omega_light
OMEGA_THEME_REPO ?= local
LEDS_CHOICE ?= 0

View File

@@ -1,12 +1,23 @@
SFLAGS += -Iescher/include
ifeq ($(OMEGA_THEME_REPO),local)
$(eval $(call rule_for, \
THEME, \
escher/palette.h, \
$(addprefix themes/themes/, $(addsuffix .json, $(OMEGA_THEME))), \
$$(PYTHON) themes/themes_manager.py $(OMEGA_THEME) $$@, \
$(addprefix themes/themes/local/, $(addsuffix .json, $(OMEGA_THEME_NAME))), \
$$(PYTHON) themes/themes_manager.py $(OMEGA_THEME_REPO) $(OMEGA_THEME_NAME) $$@ $(BUILD_DIR)/, \
global \
))
else
$(eval $(call rule_for, \
THEME, \
escher/palette.h, \
themes/themes/git/.empty-folder, \
$$(PYTHON) themes/themes_manager.py $(OMEGA_THEME_REPO) $(OMEGA_THEME_NAME) $$@ $(BUILD_DIR)/, \
global \
))
endif
escher_src += $(addprefix escher/src/,\
alternate_empty_view_controller.cpp \

2
themes

Submodule themes updated: c0f54d2298...e609f158bd