Skip to content

Commit 1aa3730

Browse files
committed
build-sys: make the result of check-genfile more readable
Signed-off-by: Masatake YAMATO <[email protected]>
1 parent f609594 commit 1aa3730

File tree

1 file changed

+20
-16
lines changed

1 file changed

+20
-16
lines changed

makefiles/testing.mak

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,10 @@ chkgen_verbose = $(chkgen_verbose_@AM_V@)
310310
chkgen_verbose_ = $(chkgen_verbose_@AM_DEFAULT_V@)
311311
chkgen_verbose_0 = @echo CHKGEN " $@";
312312

313+
cgok = echo "<ok> $@:"
314+
cgerr = echo "<ERROR> $@:"
315+
cgskip = echo "<skip> $@:"
316+
313317
recover_side_effects = cg-force-optlib2c-srcs cg-force-txt2cstr-srcs cg-force-man-docs
314318

315319
# OPTLIB2C_SRCS : committed for win32 build
@@ -325,11 +329,11 @@ endif
325329
check-genfile-optlib2c-srcs: $(recover_side_effects) cg-force-optlib2c-srcs
326330
if BUILD_IN_GIT_REPO
327331
$(chkgen_verbose)if ! git diff --exit-code $(OPTLIB2C_DIR); then \
328-
echo "Files under $(OPTLIB2C_DIR) are not up to date." ; \
329-
echo "If you change $(OPTLIB2C_DIR)/foo.ctags, don't forget to add $(OPTLIB2C_DIR)/foo.c to your commit." ; \
332+
$(cgerr) "Files under $(OPTLIB2C_DIR) are not up to date." ; \
333+
$(cgerr) "If you change $(OPTLIB2C_DIR)/foo.ctags, don't forget to add $(OPTLIB2C_DIR)/foo.c to your commit." ; \
330334
exit 1 ; \
331335
else \
332-
echo "Files under $(OPTLIB2C_DIR) are up to date." ; \
336+
$(cgok) "Files under $(OPTLIB2C_DIR) are up to date." ; \
333337
fi
334338
endif
335339

@@ -346,11 +350,11 @@ endif
346350
check-genfile-txt2cstr-srcs: $(recover_side_effects) cg-force-txt2cstr-srcs
347351
if BUILD_IN_GIT_REPO
348352
$(chkgen_verbose)if ! git diff --exit-code $(TXT2CSTR_DIR); then \
349-
echo "Files under $(TXT2CSTR_DIR) are not up to date." ; \
350-
echo "If you change $(TXT2CSTR_DIR)/foo.ps, don't forget to add $(TXT2CSTR_DIR)/foo.c to your commit." ; \
353+
$(cgerr) "Files under $(TXT2CSTR_DIR) are not up to date." ; \
354+
$(cgerr) "If you change $(TXT2CSTR_DIR)/foo.ps, don't forget to add $(TXT2CSTR_DIR)/foo.c to your commit." ; \
351355
exit 1 ; \
352356
else \
353-
echo "Files under $(TXT2CSTR_DIR) are up to date." ; \
357+
$(cgok) "Files under $(TXT2CSTR_DIR) are up to date." ; \
354358
fi
355359
endif
356360

@@ -373,11 +377,11 @@ check-genfile-man-docs: $(recover_side_effects) cg-force-man-docs
373377
if BUILD_IN_GIT_REPO
374378
if HAVE_RST2MAN
375379
$(chkgen_verbose)if ! git diff --exit-code -- man; then \
376-
echo "Files under man/ are not up to date." ; \
377-
echo "Please execute 'make -C man man-in' and commit them." ; \
380+
$(cgerr) "Files under man/ are not up to date." ; \
381+
$(cgerr) "Please execute 'make -C man man-in' and commit them." ; \
378382
exit 1 ; \
379383
else \
380-
echo "Files under man are up to date." ; \
384+
$(cgok) "Files under man are up to date." ; \
381385
fi
382386
endif
383387
endif
@@ -395,11 +399,11 @@ check-genfile-update-docs: cg-force-update-docs $(recover_side_effects)
395399
if BUILD_IN_GIT_REPO
396400
if HAVE_RST2MAN
397401
$(chkgen_verbose)if ! git diff --exit-code -- docs/man; then \
398-
echo "Files under docs/man/ are not up to date." ; \
399-
echo "Please execute 'make -C man update-docs' and commit them." ; \
402+
$(cgerr) "Files under docs/man/ are not up to date." ; \
403+
$(cgerr) "Please execute 'make -C man update-docs' and commit them." ; \
400404
exit 1 ; \
401405
else \
402-
echo "Files under docs/man are up to date." ; \
406+
$(cgok) "Files under docs/man are up to date." ; \
403407
fi
404408
endif
405409
endif
@@ -418,15 +422,15 @@ check-genfile-win32: cg-force-win32 $(recover_side_effects)
418422
if BUILD_IN_GIT_REPO
419423
$(chkgen_verbose)if ! git diff --exit-code -- win32; then \
420424
if test "$(SKIP_CHECKGEN_WIN32)" = "yes"; then \
421-
echo "Skip checking the files under win32." ; \
425+
$(cgskip) "Skip checking the files under win32." ; \
422426
exit 0 ; \
423427
else \
424-
echo "Files under win32/ are not up to date." ; \
425-
echo "Please execute 'make -BC win32' and commit them." ; \
428+
$(cgerr) "Files under win32/ are not up to date." ; \
429+
$(cgerr) "Please execute 'make -BC win32' and commit them." ; \
426430
exit 1 ; \
427431
fi \
428432
else \
429-
echo "Files under win32 are up to date." ; \
433+
$(cgok) "Files under win32 are up to date." ; \
430434
fi
431435
endif
432436

0 commit comments

Comments
 (0)