Skip to content

Commit 8f7478f

Browse files
committed
fix(build): use alr_build.py wrapper to propagate build failures
1 parent c18dd72 commit 8f7478f

2 files changed

Lines changed: 13 additions & 8 deletions

File tree

Makefile

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,11 @@ PYTHON3 := python3
5252
# =============================================================================
5353
# Tool Flags
5454
# =============================================================================
55-
ALR_BUILD_FLAGS := -j8 | grep -E 'warning:|(style)|error:' || true
56-
ALR_TEST_FLAGS := -j8 | grep -E 'warning:|(style)|error:' || true
55+
ALR_BUILD_FLAGS := -j8
56+
57+
# Build wrapper: filters output to diagnostics only while propagating the
58+
# build exit code. See scripts/python/shared/makefile/alr_build.py.
59+
ALR_BUILD_WRAPPER := $(PYTHON3) scripts/python/shared/makefile/alr_build.py
5760

5861
# =============================================================================
5962
# Directories
@@ -141,23 +144,23 @@ build: build-dev
141144

142145
build-dev: check-arch prereqs
143146
@echo "$(GREEN)Building $(PROJECT_NAME) (development mode)...$(NC)"
144-
$(ALR) build --development -- $(ALR_BUILD_FLAGS)
147+
@$(ALR_BUILD_WRAPPER) $(ALR) build --development -- $(ALR_BUILD_FLAGS)
145148
@echo "$(GREEN)✓ Development build complete$(NC)"
146149

147150
build-opt: check-arch prereqs
148151
@echo "$(GREEN)Building $(PROJECT_NAME) (optimized -O2)...$(NC)"
149-
$(ALR) build -- -O2 $(ALR_BUILD_FLAGS)
152+
@$(ALR_BUILD_WRAPPER) $(ALR) build -- -O2 $(ALR_BUILD_FLAGS)
150153
@echo "$(GREEN)✓ Optimized build complete$(NC)"
151154

152155
build-release: check-arch prereqs
153156
@echo "$(GREEN)Building $(PROJECT_NAME) (release mode)...$(NC)"
154-
$(ALR) build --release -- $(ALR_BUILD_FLAGS)
157+
@$(ALR_BUILD_WRAPPER) $(ALR) build --release -- $(ALR_BUILD_FLAGS)
155158
@echo "$(GREEN)✓ Release build complete$(NC)"
156159

157160
build-tests: check-arch prereqs
158161
@echo "$(GREEN)Building test suites...$(NC)"
159162
@if [ -f "$(TEST_DIR)/unit/unit_tests.gpr" ]; then \
160-
$(ALR) exec -- $(GPRBUILD) -P $(TEST_DIR)/unit/unit_tests.gpr -p $(ALR_TEST_FLAGS); \
163+
$(ALR_BUILD_WRAPPER) $(ALR) exec -- $(GPRBUILD) -P $(TEST_DIR)/unit/unit_tests.gpr -p $(ALR_BUILD_FLAGS); \
161164
echo "$(GREEN)✓ Unit tests built$(NC)"; \
162165
else \
163166
echo "$(YELLOW)Unit test project not found$(NC)"; \
@@ -169,6 +172,8 @@ clean:
169172
@$(ALR) exec -- gprclean -P $(PROJECT_NAME).gpr -q 2>/dev/null || true
170173
@$(ALR) exec -- gprclean -P $(TEST_DIR)/unit/unit_tests.gpr -q 2>/dev/null || true
171174
@rm -rf $(BUILD_DIR) $(BIN_DIR) lib $(TEST_DIR)/bin $(TEST_DIR)/obj
175+
@# Delete platform-specific lock file (see README: Platform Build Constraint)
176+
@rm -f alire/alire.lock
172177
@find . -name "*.backup" -delete 2>/dev/null || true
173178
@echo "$(GREEN)✓ Project artifacts cleaned (dependencies preserved for fast rebuild)$(NC)"
174179

@@ -313,7 +318,7 @@ test-windows: ## Trigger Windows CI validation on GitHub Actions
313318

314319
check:
315320
@echo "$(GREEN)Running code checks...$(NC)"
316-
@$(ALR) build --development -- $(ALR_BUILD_FLAGS)
321+
@$(ALR_BUILD_WRAPPER) $(ALR) build --development -- $(ALR_BUILD_FLAGS)
317322
@echo "$(GREEN)✓ Code checks complete$(NC)"
318323

319324
check-arch: ## Validate architecture boundaries

scripts/python/shared

0 commit comments

Comments
 (0)