diff --git a/Makefile b/Makefile index faadc35..7bcffaa 100644 --- a/Makefile +++ b/Makefile @@ -1,28 +1,44 @@ -NODE_MODS := node_modules +NODE_MODULES := node_modules +INSTALL_STAMP := $(NODE_MODULES)/.install-stamp DIST_DIR := dist +ASSET_DIR := templates/assets/dist + NAME := $(shell grep '^[[:space:]]*name:' theme.yaml | head -n1 | cut -d ':' -f2 | xargs) VERSION := $(shell grep '^[[:space:]]*version:' theme.yaml | head -n1 | cut -d ':' -f2 | xargs) THEME := $(NAME)-$(VERSION) ARCHIVE := $(THEME).zip +ARCHIVE_PATH := $(DIST_DIR)/$(ARCHIVE) +EXTRACT_DIR := $(DIST_DIR)/$(NAME) -all: install build test +SOURCE_ROOTS := src templates i18n +SOURCE_FILES := $(shell find $(SOURCE_ROOTS) -type f \ + ! -path '$(ASSET_DIR)/*' \ + ! -name '.DS_Store') +SOURCE_DIRS := $(shell find $(SOURCE_ROOTS) -type d \ + ! -path '$(ASSET_DIR)' \ + ! -path '$(ASSET_DIR)/*') +BUILD_INPUTS := Makefile build.js package.json pnpm-lock.yaml theme.yaml settings.yaml \ + README.md LICENSE $(SOURCE_FILES) $(SOURCE_DIRS) -$(NODE_MODS): package.json pnpm-lock.yaml +all: test + +$(INSTALL_STAMP): package.json pnpm-lock.yaml pnpm install + @touch "$@" -$(DIST_DIR)/$(ARCHIVE): $(NODE_MODS) theme.yaml settings.yaml build.js templates +$(ARCHIVE_PATH): $(INSTALL_STAMP) $(BUILD_INPUTS) pnpm build -install: $(NODE_MODS) +install: $(INSTALL_STAMP) -build: $(DIST_DIR)/$(ARCHIVE) +build: $(ARCHIVE_PATH) test: build - @unzip $(DIST_DIR)/$(ARCHIVE) -d $(DIST_DIR)/$(NAME) - -.PHONY: all install build clean test + @test -n "$(NAME)" && test "$(EXTRACT_DIR)" != "$(DIST_DIR)" + @rm -rf "$(EXTRACT_DIR)" + @unzip -q "$(ARCHIVE_PATH)" -d "$(EXTRACT_DIR)" clean: - @rm -rf $(DIST_DIR) - @rm -rf $(NODE_MODS) - @rm -rf templates/assets/$(DIST_DIR) \ No newline at end of file + @rm -rf "$(DIST_DIR)" "$(NODE_MODULES)" "$(ASSET_DIR)" + +.PHONY: all install build test clean diff --git a/README.md b/README.md index 9834e51..2013de9 100644 --- a/README.md +++ b/README.md @@ -317,7 +317,7 @@ make test make clean ``` -`make test` 会构建主题并将压缩包解压到 `dist/theme-terminal-ez` +`make test` 会构建主题, 清理旧的测试目录并将压缩包解压到 `dist/theme-terminal-ez` ### 使用 pnpm