drygdryg/calc
1
0
Fork 0
mirror of https://github.com/lcn2/calc.git synced 2025-08-16 01:03:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

improve output of make prep and the #! line of update_ver

Browse Source
This commit is contained in:
Landon Curt Noll
2023-09-03 23:50:23 -07:00
parent 86f1d9e029
commit ed112997a7
2 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
Makefile
View File

@@ -2726,9 +2726,11 @@ check: all ./cal/regress.cal
chk: ./cal/regress.cal chk: ./cal/regress.cal
${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-=' ${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
${Q} echo
${CALC_ENV} ./calc${EXT} -d -q read regress 2>&1 | ${AWK} -f check.awk ${CALC_ENV} ./calc${EXT} -d -q read regress 2>&1 | ${AWK} -f check.awk
@${MAKE} -f Makefile Q= V=@ distdir >/dev/null 2>&1 @${MAKE} -f Makefile Q= V=@ distdir >/dev/null 2>&1
@${MAKE} -f Makefile Q= V=@ distlist >/dev/null 2>&1 @${MAKE} -f Makefile Q= V=@ distlist >/dev/null 2>&1
${Q} echo
${Q} echo 'chk OK' ${Q} echo 'chk OK'
${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-=' ${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
@@ -3142,33 +3144,56 @@ testfuncsort: ./calc${EXT}
@${RM} -f func.show func.sort @${RM} -f func.show func.sort
prep: prep:
echo '=-=-= start of ${MAKE} clobber =-=-=' ${Q}echo '=-=-=-=-=-= start of ${MAKE} clobber =-=-=-=-=-='
${Q}echo
${MAKE} clobber ${MAKE} clobber
echo '=-=-= end of ${MAKE} clobber =-=-=' ${Q}echo
echo '=-=-= start of ${TRAILBLANK} =-=-=' ${Q}echo '=-=-=-=-=-= end of ${MAKE} clobber =-=-=-=-=-='
${Q}echo
${Q}echo '=-=-=-=-=-= start of ${TRAILBLANK} =-=-=-=-=-='
${Q}echo
./${TRAILBLANK} ./${TRAILBLANK}
echo '=-=-= end of ${TRAILBLANK} =-=-=' ${Q}echo
echo '=-=-= start of ${MAKE} all CCWERR=-Werror =-=-=' ${Q}echo '=-=-=-=-=-= end of ${TRAILBLANK} =-=-=-=-=-='
${Q}echo
${Q}echo '=-=-=-=-=-= start of ${MAKE} all CCWERR=-Werror =-=-=-=-=-='
${Q}echo
${MAKE} all CCWERR=-Werror ${MAKE} all CCWERR=-Werror
echo '=-=-= end of ${MAKE} all CCWERR=-Werror =-=-=' ${Q}echo
echo '=-=-= start of ${MAKE} tags =-=-=' ${Q}echo '=-=-=-=-=-= end of ${MAKE} all CCWERR=-Werror =-=-=-=-=-='
${Q}echo
${Q}echo '=-=-=-=-=-= start of ${MAKE} tags =-=-=-=-=-='
${Q}echo
${MAKE} tags ${MAKE} tags
echo '=-=-= end of ${MAKE} tags =-=-=' ${Q}echo
echo '=-=-= start of ${MAKE} depend =-=-=' ${Q}echo '=-=-=-=-=-= end of ${MAKE} tags =-=-=-=-=-='
${Q}echo
${Q}echo '=-=-=-=-=-= start of ${MAKE} depend =-=-=-=-=-='
${Q}echo
${MAKE} depend ${MAKE} depend
echo '=-=-= end of ${MAKE} depend =-=-=' ${Q}echo
echo '=-=-= start of ${MAKE} testfuncsort =-=-=' ${Q}echo '=-=-=-=-=-= end of ${MAKE} depend =-=-=-=-=-='
${Q}echo
${Q}echo '=-=-=-=-=-= start of ${MAKE} testfuncsort =-=-=-=-=-='
${Q}echo
${MAKE} testfuncsort ${MAKE} testfuncsort
echo '=-=-= end of ${MAKE} testfuncsort =-=-=' ${Q}echo
echo '=-=-= start of ${UPDATE_VER} =-=-=' ${Q}echo '=-=-=-=-=-= end of ${MAKE} testfuncsort =-=-=-=-=-='
${Q}echo
${Q}echo '=-=-=-=-=-= start of ${UPDATE_VER} =-=-=-=-=-='
${Q}echo
./${UPDATE_VER} ./${UPDATE_VER}
echo '=-=-= end of ${UPDATE_VER} =-=-=' ${Q}echo
echo '=-=-= start of ${MAKE} chk =-=-=' ${Q}echo '=-=-=-=-=-= end of ${UPDATE_VER} =-=-=-=-=-='
${Q}echo
${Q}echo '=-=-=-=-=-= start of ${MAKE} chk =-=-=-=-=-='
${Q}echo
${MAKE} chk ${MAKE} chk
echo '=-=-= end of ${MAKE} chk =-=-=' ${Q}echo
@echo ${Q}echo '=-=-=-=-=-= end of ${MAKE} chk =-=-=-=-=-='
@echo All is OK ${Q}echo
@echo ${Q}echo All is OK
${Q}echo
run: run:
CALCPATH=./cal LD_LIBRARY_PATH=. DYLD_LIBRARY_PATH=. CALCHELP=./help CALCCUSTOMHELP=./custom ./calc${EXT} -q CALCPATH=./cal LD_LIBRARY_PATH=. DYLD_LIBRARY_PATH=. CALCHELP=./help CALCCUSTOMHELP=./custom ./calc${EXT} -q

2
update_ver
View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/usr/bin/env bash
# #
# update_ver - update version numbers in Makefile.config # update_ver - update version numbers in Makefile.config
# #