Skip to content

fix: stop make run recompiling the dictionary on every source edit #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
widgetii merged 2 commits into from
Oct 20, 2026
Merged

fix: stop make run recompiling the dictionary on every source edit #40

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
041bd50
fix: stop `make run` recompiling the dictionary on every source edit
widgetii Oct 20, 2026
ca2d67a
fix: answer the review on the dictionary build
widgetii Oct 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 40 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,19 @@ CEDICT_DEPS := $(CEDICT_SOURCE) Package.swift Package.resolved \
$(shell find Sources/HanReaderCore Sources/HanReaderPersistence \
Sources/hanreader-dictgen -name '*.swift' 2>/dev/null)

# Written beside the destination and moved into place only once it has been
# verified. Compiling straight to the destination left a container that had
# failed its own check sitting on disk, newer than its sources -- so the next
# `make run` saw a file, asked no further questions and bundled it.
$(CEDICT_OUTPUT): $(CEDICT_DEPS)
@mkdir -p Resources/Generated
@rm -f "$(CEDICT_OUTPUT).tmp"
@printf 'Compiling the bundled dictionary...\n'
@swift run -q -c release hanreader-dictgen cedict "$(CEDICT_SOURCE)" -o "$(CEDICT_OUTPUT)" --verbose
@swift run -q -c release hanreader-dictgen verify "$(CEDICT_OUTPUT)"
@swift run -q -c release hanreader-dictgen cedict "$(CEDICT_SOURCE)" \
-o "$(CEDICT_OUTPUT).tmp" --verbose
@swift run -q -c release hanreader-dictgen verify "$(CEDICT_OUTPUT).tmp" \
|| { rm -f "$(CEDICT_OUTPUT).tmp"; exit 1; }
@mv -f "$(CEDICT_OUTPUT).tmp" "$(CEDICT_OUTPUT)"

dict-check: ## Report whether the pinned CC-CEDICT snapshot is out of date
@./Scripts/update-cedict.sh --check
Expand All @@ -110,7 +118,20 @@ dict-force: ## Recompile the bundled dictionary unconditionally

# ── Xcode project ────────────────────────────────────────────────────────────

generate: $(TOOLS_STAMP) $(CEDICT_OUTPUT) ## Regenerate the Xcode project from project.yml
# The dictionary is built here only when it is **missing**, through a test in
# the recipe rather than a prerequisite -- including an order-only one, which
# still updates the container it names and only stops the timestamp
# propagating.
#
# Running the app is the command that happens dozens of times an hour, and the
# generator links three whole modules: an edit to anything in HanReaderCore,
# HanReaderPersistence or the generator itself made every `make run` spend
# fifteen seconds recompiling a container whose bytes almost never change.
# `make dict` keeps the strict dependency and CI has a job of its own, so a
# stale container still cannot ship -- and `make run` says so when the one on
# disk is older than its sources.
generate: $(TOOLS_STAMP) ## Regenerate the Xcode project from project.yml
@[ -f $(CEDICT_OUTPUT) ] || $(MAKE) --no-print-directory dict
Comment thread
widgetii marked this conversation as resolved.
@# One shell block on purpose. Make runs each recipe line in its own shell,
@# so an early `exit 0` in a guard would end only that line and the
@# following commands would still run.
Expand All @@ -132,6 +153,14 @@ open: generate ## Generate the project and open it in Xcode
# ── Build and run ────────────────────────────────────────────────────────────

run: generate ## Build and launch the macOS app
@# `|| true` is load-bearing: a missing pinned snapshot makes `find` exit
@# non-zero, and under this file's `-euo pipefail` that aborted the recipe
@# before the dictionary rule could print how to fetch it. A courtesy line
@# must not be the thing that stops a build.
@stale=$$(find $(CEDICT_DEPS) -newer $(CEDICT_OUTPUT) 2>/dev/null | head -1 || true); \
[ -z "$$stale" ] || printf \
'note: the bundled dictionary is older than %s -- run `make dict` to rebuild it.\n' \
"$$stale"
@if [ ! -d $(PROJECT) ]; then \
printf 'No app target yet. Until milestone M1 PR 3, use: make test\n'; \
exit 1; \
Expand All @@ -142,6 +171,14 @@ run: generate ## Build and launch the macOS app
@open "$(BUILD_DIR)/Build/Products/Debug/HanReader.app"

run-ios: generate ## Build and launch the app in the iOS Simulator
@# `|| true` is load-bearing: a missing pinned snapshot makes `find` exit
@# non-zero, and under this file's `-euo pipefail` that aborted the recipe
@# before the dictionary rule could print how to fetch it. A courtesy line
@# must not be the thing that stops a build.
@stale=$$(find $(CEDICT_DEPS) -newer $(CEDICT_OUTPUT) 2>/dev/null | head -1 || true); \
[ -z "$$stale" ] || printf \
'note: the bundled dictionary is older than %s -- run `make dict` to rebuild it.\n' \
"$$stale"
@# Captured before grepping. Piping into `grep -q` lets it close the pipe on
@# the first match, simctl takes SIGPIPE, and under pipefail the probe reports
@# failure -- telling a machine that HAS a runtime that it has none.
Expand Down
Loading