* upas: mkfile cleanup patch
@ 2020-11-17 1:23 Amavect
2020-11-18 0:14 ` [9front] " ori
0 siblings, 1 reply; 4+ messages in thread
From: Amavect @ 2020-11-17 1:23 UTC (permalink / raw)
To: 9front
[-- Attachment #1: Type: text/plain, Size: 371 bytes --]
All,
Cleanup in aisle upas. See attached.
Description:
upas: mkfile cleanup (thanks Amavect)
Changeset 8035 broke the libcommon rule in mkupas.
Deleting the 'mk clean' in the recipe fixes this.
Cleanup includes deleting UPDATE vars from all mkfiles,
reorganization of vars in TARG,LIB,OFILE,HFILE order,
and deletion of extra vars used for UPDATE.
Thanks,
Amavect
[-- Attachment #2: upasmkfiles.diff --]
[-- Type: text/plain, Size: 12270 bytes --]
diff -r c6e94385ea0f sys/src/cmd/upas/Mail/mkfile
--- a/sys/src/cmd/upas/Mail/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/Mail/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -2,25 +2,18 @@
<../mkupas
TARG=Mail
-OFILES=\
- html.$O\
- mail.$O\
- mesg.$O\
- reply.$O\
- util.$O\
- win.$O
+OFILES=html.$O\
+ mail.$O\
+ mesg.$O\
+ reply.$O\
+ util.$O\
+ win.$O\
HFILES=dat.h
-LIB=
# BIN=/acme/bin/$objtype
BIN=$ABIN
-UPDATE=\
- mkfile\
- $HFILES\
- ${OFILES:%.$O=%.c}\
-
</sys/src/cmd/mkone
$O.out: $OFILES
diff -r c6e94385ea0f sys/src/cmd/upas/alias/mkfile
--- a/sys/src/cmd/upas/alias/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/alias/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -2,19 +2,10 @@
<../mkupas
TARG=aliasmail
-
-OFILES=aliasmail.$O\
-
-LIB=../common/libcommon.a$O\
-
+LIB=../common/libcommon.a$O
+OFILES=aliasmail.$O
HFILES=../common/common.h\
../common/sys.h\
-
-UPDATE=\
- mkfile\
- $HFILES\
- ${OFILES:%.$O=%.c}\
-
</sys/src/cmd/mkone
CFLAGS=$CFLAGS -I../common
diff -r c6e94385ea0f sys/src/cmd/upas/bayes/mkfile
--- a/sys/src/cmd/upas/bayes/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/bayes/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -1,11 +1,8 @@
</$objtype/mkfile
+<../mkupas
TARG=addhash bayes msgtok
-HFILES=
-OFILES=
-LIB=
-BIN=/$objtype/bin/upas
</sys/src/cmd/mkmany
# msg tokenizer
diff -r c6e94385ea0f sys/src/cmd/upas/binscripts/mkfile
--- a/sys/src/cmd/upas/binscripts/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/binscripts/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -24,11 +24,5 @@
nuke:V:
rm $BIN/^($RCFILES)
-UPDATE=$RCFILES
-
-update:V:
- update $UPDATEFLAGS $UPDATE
-
$BIN/%: %.rc
cp $stem.rc $BIN/$stem
-
diff -r c6e94385ea0f sys/src/cmd/upas/binscripts/mkfile.rc
--- a/sys/src/cmd/upas/binscripts/mkfile.rc Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/binscripts/mkfile.rc Mon Nov 16 19:14:22 2020 -0600
@@ -1,5 +1,5 @@
-RCFILES=mail.rc\
+RCFILES=mail.rc
all:Q:
;
@@ -20,19 +20,3 @@
;
nuke:V:
rm /rc/bin/mail
-
-UPDATE=\
- gone.fishing\
- gone.msg\
- mail.rc\
- mail.sh\
- makefile\
- mkfile\
- namefiles\
- omail.rc\
- qmail\
- remotemail\
- rewrite\
-
-update:V:
- update $UPDATEFLAGS $UPDATE
diff -r c6e94385ea0f sys/src/cmd/upas/common/mkfile
--- a/sys/src/cmd/upas/common/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/common/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -1,8 +1,7 @@
</$objtype/mkfile
LIB=libcommon.a$O
-OFILES=\
- aux.$O\
+OFILES=aux.$O\
become.$O\
config.$O\
folder.$O\
diff -r c6e94385ea0f sys/src/cmd/upas/filterkit/mkfile
--- a/sys/src/cmd/upas/filterkit/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/filterkit/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -1,22 +1,13 @@
</$objtype/mkfile
<../mkupas
-TARG=\
- deliver\
+TARG=deliver\
list\
mbappend\
token\
-LIB=../common/libcommon.a$O\
-
+LIB=../common/libcommon.a$O
OFILES=readaddrs.$O
-UPDATE=\
- mkfile\
- ${TARG:%=%.c}\
- pipeto.sample\
- pipefrom.sample\
- pipeto.sample-hold\
</sys/src/cmd/mkmany
CFLAGS=$CFLAGS -I../common
-
diff -r c6e94385ea0f sys/src/cmd/upas/fs/mkfile
--- a/sys/src/cmd/upas/fs/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/fs/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -1,9 +1,9 @@
</$objtype/mkfile
+<../mkupas
TARG=fs
-
-OFILES=\
- cache.$O\
+LIB=../common/libcommon.a$O
+OFILES=cache.$O\
fs.$O\
header.$O\
idx.$O\
@@ -18,21 +18,11 @@
strtotm.$O\
tls.$O\
-LIB=../common/libcommon.a$O\
-
-HFILES= ../common/common.h\
+HFILES=../common/common.h\
dat.h
-UPDATE=\
- mkfile\
- $HFILES\
- ${TARG:%=%.c}\
- ${OFILES:%.$O=%.c}\
-
</sys/src/cmd/mkone
CFLAGS=$CFLAGS -I../common
-<../mkupas
-
acid:V:
$CC -a $CFLAGS fs.c>a$O
diff -r c6e94385ea0f sys/src/cmd/upas/imap4d/mkfile
--- a/sys/src/cmd/upas/imap4d/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/imap4d/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -1,7 +1,9 @@
</$objtype/mkfile
+<../mkupas
-OFILES=\
- auth.$O\
+TARG=imap4d
+
+OFILES=auth.$O\
copy.$O\
csquery.$O\
date.$O\
@@ -26,13 +28,4 @@
HFILES=imap4d.h\
fns.h\
-TARG=imap4d
-
-UPDATE=\
- mkfile\
- $HFILES\
- ${OFILES:%.$O=%.c}\
-
</sys/src/cmd/mkone
-
-<../mkupas
diff -r c6e94385ea0f sys/src/cmd/upas/marshal/mkfile
--- a/sys/src/cmd/upas/marshal/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/marshal/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -2,18 +2,10 @@
<../mkupas
TARG=marshal
+LIB=../common/libcommon.a$O
+OFILES=marshal.$O
+HFILES=../common/common.h
-LIB=../common/libcommon.a$O\
-
-HFILES= ../common/common.h\
-
-OFILES= marshal.$O
-
-UPDATE=\
- mkfile\
- $HFILES\
- ${OFILES:%.$O=%.c}\
-
</sys/src/cmd/mkone
CFLAGS=$CFLAGS -I../common
diff -r c6e94385ea0f sys/src/cmd/upas/mkfile
--- a/sys/src/cmd/upas/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -1,8 +1,7 @@
</$objtype/mkfile
LIBS=common
-PROGS=\
- Mail\
+PROGS=Mail\
alias\
bayes\
binscripts\
@@ -24,46 +23,10 @@
#libs must be made first
DIRS=$LIBS $PROGS
-UPDATE=\
- mkfile\
- /sys/man/1/mail\
-
-all:V:
+all install installall clean nuke:V:
for (i in $DIRS) @{
cd $i
- mk all
- }
-
-clean:V:
- for (i in $DIRS) @{
- cd $i
- mk clean
- }
-
-nuke:V:
- for (i in $LIBS) @{
- cd $i
- mk nuke
- }
- for (i in $PROGS) @{
- cd $i
- mk clean
- }
-
-install:V:
- for (i in $DIRS) @{
- cd $i
- mk install
- }
-
-installall:V:
- for (i in $DIRS) @{
- cd $i
- mk installall
- }
- for (i in $DIRS) @{
- cd $i
- mk clean
+ mk $target
}
safeinstallall:V:
@@ -75,15 +38,3 @@
cd $i
mk safeinstallall
}
- for (i in $DIRS) @{
- cd $i
- mk clean
- }
-
-update:V:
- update $UPDATEFLAGS $UPDATE
- for (i in $DIRS) @{
- cd $i
- echo '>>>>>>>>>>' `{pwd} '<<<<<<<<<<<'
- mk $MKFLAGS 'UPDATEFLAGS='$"UPDATEFLAGS update
- }
diff -r c6e94385ea0f sys/src/cmd/upas/ml/mkfile
--- a/sys/src/cmd/upas/ml/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/ml/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -5,27 +5,15 @@
mlowner\
mlmgr\
-OFILES=\
- common.$O\
+LIB=../common/libcommon.a$O
-LIB=../common/libcommon.a$O\
+OFILES=common.$O
-UHFILES= ../common/common.h\
+HFILES=../common/common.h\
../common/sys.h\
dat.h\
-
-HFILES=$UHFILES\
../smtp/y.tab.h\
-LIB=../common/libcommon.a$O\
-
-UPDATE=\
- mkfile\
- $UHFILES\
- ${TARG:%=%.c}\
- ${OFILES:%.$O=%.c}\
- ../smtp/rfc822.y\
-
</sys/src/cmd/mkmany
CFLAGS=$CFLAGS -I../common
diff -r c6e94385ea0f sys/src/cmd/upas/ned/mkfile
--- a/sys/src/cmd/upas/ned/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/ned/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -1,19 +1,10 @@
</$objtype/mkfile
+<../mkupas
TARG=nedmail
-
-LIB=../common/libcommon.a$O\
-
-HFILES= ../common/common.h\
-
+LIB=../common/libcommon.a$O
OFILES=nedmail.$O
-
-UPDATE=\
- mkfile\
- ${OFILES:%.$O=%.c}\
- $HFILES\
+HFILES=../common/common.h
</sys/src/cmd/mkone
CFLAGS=$CFLAGS -I../common
-
-<../mkupas
diff -r c6e94385ea0f sys/src/cmd/upas/pop3/mkfile
--- a/sys/src/cmd/upas/pop3/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/pop3/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -2,15 +2,8 @@
<../mkupas
TARG=pop3
-
+LIB=../common/libcommon.a$O
OFILES=pop3.$O
-LIB=../common/libcommon.a$O
-
-UPDATE=\
- mkfile\
- ${OFILES:%.$O=%.c}\
-
</sys/src/cmd/mkone
-
CFLAGS=$CFLAGS -I../common
diff -r c6e94385ea0f sys/src/cmd/upas/q/mkfile
--- a/sys/src/cmd/upas/q/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/q/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -1,21 +1,13 @@
</$objtype/mkfile
<../mkupas
-TARG = qer\
+TARG=qer\
runq\
+LIB=../common/libcommon.a$O
OFILES=
-
HFILES=../common/common.h\
../common/sys.h\
-LIB=../common/libcommon.a$O\
-
-UPDATE=\
- mkfile\
- $HFILES\
- ${OFILES:%.$O=%.c}\
- ${TARG:%=%.c}\
-
</sys/src/cmd/mkmany
CFLAGS=$CFLAGS -I../common
diff -r c6e94385ea0f sys/src/cmd/upas/qfrom/mkfile
--- a/sys/src/cmd/upas/qfrom/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/qfrom/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -1,13 +1,7 @@
</$objtype/mkfile
+<../mkupas
TARG=qfrom
-OFILES=qfrom.$O\
-
-BIN=/$objtype/bin/upas
-
-UPDATE=\
- mkfile\
- $HFILES\
- ${OFILES:%.$O=%.c}\
+OFILES=qfrom.$O
</sys/src/cmd/mkone
diff -r c6e94385ea0f sys/src/cmd/upas/scanmail/mkfile
--- a/sys/src/cmd/upas/scanmail/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/scanmail/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -1,25 +1,18 @@
</$objtype/mkfile
+<../mkupas
TARG=scanmail\
testscan
-OFILES= common.$O
+LIB=../common/libcommon.a$O
-HFILES= spam.h\
+OFILES=common.$O
+
+HFILES=spam.h\
../common/sys.h\
-LIB= ../common/libcommon.a$O\
-
-UPDATE=\
- mkfile\
- $HFILES\
- ${OFILES:%.$O=%.c}\
- ${TARG:%=%.c}\
-
</sys/src/cmd/mkmany
CFLAGS=$CFLAGS -I../common
-<../mkupas
-
scanmail.$O: scanmail.c
$CC $CFLAGS scanmail.c
diff -r c6e94385ea0f sys/src/cmd/upas/send/mkfile
--- a/sys/src/cmd/upas/send/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/send/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -4,17 +4,15 @@
TARG=send\
filter
-UOFILES=message.$O\
+LIB=../common/libcommon.a$O
+
+OFILES=message.$O\
dest.$O\
log.$O\
skipequiv.$O\
-
-OFILES=\
- $UOFILES\
../smtp/rfc822.tab.$O\
-SOBJ=\
- authorize.$O\
+SOBJ=authorize.$O\
bind.$O\
cat_mail.$O\
gateway.$O\
@@ -23,23 +21,12 @@
rewrite.$O\
translate.$O\
-FOBJ=\
- cat_mail.$O\
-
+FOBJ=cat_mail.$O
HFILES=send.h\
../common/common.h\
../common/sys.h\
-LIB=../common/libcommon.a$O\
-
-UPDATE=\
- mkfile\
- $HFILES\
- ${UOFILES:%.$O=%.c}\
- ${SOBJ:%.$O=%.c}\
- ${TARG:%=%.c}\
-
</sys/src/cmd/mkmany
CFLAGS=$CFLAGS -I../common
diff -r c6e94385ea0f sys/src/cmd/upas/smtp/mkfile
--- a/sys/src/cmd/upas/smtp/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/smtp/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -1,41 +1,28 @@
</$objtype/mkfile
-TARG = smtpd\
+TARG=smtpd\
smtp\
-TEST=\
- parsetest
+LIB=../common/libcommon.a$O
OFILES=
-LIB=../common/libcommon.a$O\
-
HFILES=../common/common.h\
../common/sys.h\
smtpd.h\
smtp.h\
-UPDATE=\
- greylist.c\
- mkfile\
- mxdial.c\
- rfc822.y\
- smtpd.y\
- spam.c\
- $HFILES\
- ${OFILES:%.$O=%.c}\
- ${TARG:%=%.c}\
+TEST=parsetest
</sys/src/cmd/mkmany
CFLAGS=$CFLAGS -I../common
-$O.smtpd:\
- smtpd.tab.$O\
+$O.smtpd: smtpd.tab.$O\
spam.$O\
rfc822.tab.$O\
greylist.$O\
-$O.smtp: rfc822.tab.$O mxdial.$O
+$O.smtp: rfc822.tab.$O mxdial.$O
smtpd.tab.c: smtpd.y
yacc -o xxx smtpd.y
diff -r c6e94385ea0f sys/src/cmd/upas/spf/mkfile
--- a/sys/src/cmd/upas/spf/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/spf/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -3,8 +3,7 @@
TARG=spf
-OFILES=\
- dns.$O\
+OFILES=dns.$O\
macro.$O\
spf.$O\
diff -r c6e94385ea0f sys/src/cmd/upas/unesc/mkfile
--- a/sys/src/cmd/upas/unesc/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/unesc/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -2,11 +2,6 @@
<../mkupas
TARG=unesc
-OFILES=unesc.$O\
-
-UPDATE=\
- mkfile\
- $HFILES\
- ${OFILES:%.$O=%.c}\
+OFILES=unesc.$O
</sys/src/cmd/mkone
diff -r c6e94385ea0f sys/src/cmd/upas/vf/mkfile
--- a/sys/src/cmd/upas/vf/mkfile Sun Nov 15 22:47:45 2020 +0100
+++ b/sys/src/cmd/upas/vf/mkfile Mon Nov 16 19:14:22 2020 -0600
@@ -2,18 +2,10 @@
<../mkupas
TARG=vf
-
-OFILES=vf.$O\
-
-LIB=../common/libcommon.a$O\
-
+LIB=../common/libcommon.a$O
+OFILES=vf.$O
HFILES=../common/common.h\
../common/sys.h\
-UPDATE=\
- mkfile\
- $HFILES\
- ${OFILES:%.$O=%.c}\
-
</sys/src/cmd/mkone
CFLAGS=$CFLAGS -I../common
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [9front] upas: mkfile cleanup patch 2020-11-17 1:23 upas: mkfile cleanup patch Amavect @ 2020-11-18 0:14 ` ori 2020-11-18 2:03 ` Amavect 0 siblings, 1 reply; 4+ messages in thread From: ori @ 2020-11-18 0:14 UTC (permalink / raw) To: amavect, 9front Quoth Amavect <amavect@gmail.com>: > All, > > Cleanup in aisle upas. See attached. > > > Description: > upas: mkfile cleanup (thanks Amavect) > > Changeset 8035 broke the libcommon rule in mkupas. > Deleting the 'mk clean' in the recipe fixes this. > > Cleanup includes deleting UPDATE vars from all mkfiles, > reorganization of vars in TARG,LIB,OFILE,HFILE order, > and deletion of extra vars used for UPDATE. > > > Thanks, > Amavect > Mentioned on grid, but this has 2 issues for me: First, it looks like the patch somehow had a space appended to each line; needed a: ,s/ $//g in order to apply. Second, smtp fails to build after a 'mk nuke'; it looks like we somehow fail to rebuild a y.tab.h. Weirdly, 'mk clean' fixes it for me. Also, noting the sed hacks in the mkfile to get two parsers: our yacc should grow a '%prefix' ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [9front] upas: mkfile cleanup patch 2020-11-18 0:14 ` [9front] " ori @ 2020-11-18 2:03 ` Amavect 2020-11-18 2:39 ` ori 0 siblings, 1 reply; 4+ messages in thread From: Amavect @ 2020-11-18 2:03 UTC (permalink / raw) To: ori, 9front [-- Attachment #1: Type: text/plain, Size: 1199 bytes --] > Mentioned on grid, but this has 2 issues for me: > First, it looks like the patch somehow had a space > appended to each line; needed a: > > ,s/ $//g > > in order to apply. > > Second, smtp fails to build after a 'mk nuke'; it > looks like we somehow fail to rebuild a y.tab.h. > Weirdly, 'mk clean' fixes it for me. > > Also, noting the sed hacks in the mkfile to get > two parsers: our yacc should grow a '%prefix' > Let's do this again. Description: upas: mkfile cleanup (thanks Amavect) Changeset 8035 broke the libcommon rule in mkupas. Deleting the 'mk clean' in the recipe fixes this. Fixed smtp's build after mk nuke. smtp/mkfile overrode the nuke rule, but it forgot to delete rfc822.tab.c smtp/y.tab.h would not get rebuilt because it was not specified as a dependency. Added the -s flag to rename y.tab.h to rfc822.tab.h requiring all includes to be changed. This allows rfc822.tab.h to be specified without conflict with the y.tab.h rule from </sys/src/cmd/mkmany Cleanup includes deleting UPDATE vars from all mkfiles, deletion of extra vars used for UPDATE, reorganization of vars in TARG,LIB,OFILE,HFILE order, and small style changes for consistency. Thanks, Amavect [-- Attachment #2: upas.diff --] [-- Type: text/plain, Size: 13967 bytes --] diff -r c6e94385ea0f sys/src/cmd/upas/Mail/mkfile --- a/sys/src/cmd/upas/Mail/mkfile Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/Mail/mkfile Tue Nov 17 19:48:31 2020 -0600 @@ -3,24 +3,18 @@ TARG=Mail OFILES=\ - html.$O\ - mail.$O\ - mesg.$O\ - reply.$O\ - util.$O\ - win.$O + html.$O\ + mail.$O\ + mesg.$O\ + reply.$O\ + util.$O\ + win.$O\ HFILES=dat.h -LIB= # BIN=/acme/bin/$objtype BIN=$ABIN -UPDATE=\ - mkfile\ - $HFILES\ - ${OFILES:%.$O=%.c}\ - </sys/src/cmd/mkone $O.out: $OFILES @@ -29,4 +23,3 @@ syms:V: $CC -a mail.c >syms $CC -aa mesg.c reply.c util.c win.c >>syms - diff -r c6e94385ea0f sys/src/cmd/upas/alias/mkfile --- a/sys/src/cmd/upas/alias/mkfile Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/alias/mkfile Tue Nov 17 19:48:31 2020 -0600 @@ -2,19 +2,11 @@ <../mkupas TARG=aliasmail - -OFILES=aliasmail.$O\ - -LIB=../common/libcommon.a$O\ - -HFILES=../common/common.h\ - ../common/sys.h\ - - -UPDATE=\ - mkfile\ - $HFILES\ - ${OFILES:%.$O=%.c}\ +LIB=../common/libcommon.a$O +OFILES=aliasmail.$O +HFILES=\ + ../common/common.h\ + ../common/sys.h\ </sys/src/cmd/mkone CFLAGS=$CFLAGS -I../common diff -r c6e94385ea0f sys/src/cmd/upas/bayes/mkfile --- a/sys/src/cmd/upas/bayes/mkfile Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/bayes/mkfile Tue Nov 17 19:48:31 2020 -0600 @@ -1,11 +1,8 @@ </$objtype/mkfile +<../mkupas TARG=addhash bayes msgtok -HFILES= -OFILES= -LIB= -BIN=/$objtype/bin/upas </sys/src/cmd/mkmany # msg tokenizer @@ -29,5 +26,3 @@ $O.addhash: hash.$O $O.bayes: hash.$O - - diff -r c6e94385ea0f sys/src/cmd/upas/binscripts/mkfile --- a/sys/src/cmd/upas/binscripts/mkfile Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/binscripts/mkfile Tue Nov 17 19:48:31 2020 -0600 @@ -1,7 +1,8 @@ </$objtype/mkfile <../mkupas -RCFILES=isspam\ +RCFILES=\ + isspam\ msgcat\ spam\ tfmt\ @@ -24,11 +25,5 @@ nuke:V: rm $BIN/^($RCFILES) -UPDATE=$RCFILES - -update:V: - update $UPDATEFLAGS $UPDATE - $BIN/%: %.rc cp $stem.rc $BIN/$stem - diff -r c6e94385ea0f sys/src/cmd/upas/binscripts/mkfile.rc --- a/sys/src/cmd/upas/binscripts/mkfile.rc Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/binscripts/mkfile.rc Tue Nov 17 19:48:31 2020 -0600 @@ -1,5 +1,5 @@ -RCFILES=mail.rc\ +RCFILES=mail.rc all:Q: ; @@ -20,19 +20,3 @@ ; nuke:V: rm /rc/bin/mail - -UPDATE=\ - gone.fishing\ - gone.msg\ - mail.rc\ - mail.sh\ - makefile\ - mkfile\ - namefiles\ - omail.rc\ - qmail\ - remotemail\ - rewrite\ - -update:V: - update $UPDATEFLAGS $UPDATE diff -r c6e94385ea0f sys/src/cmd/upas/common/mkfile --- a/sys/src/cmd/upas/common/mkfile Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/common/mkfile Tue Nov 17 19:48:31 2020 -0600 @@ -11,13 +11,10 @@ libsys.$O\ process.$O\ -HFILES=common.h\ +HFILES=\ + common.h\ sys.h\ -CLEANFILES=$LIB +CLEANFILES=libcommon.a[$OS] </sys/src/cmd/mklib - -nuke:V: - mk clean - rm -f libcommon.a[$OS] diff -r c6e94385ea0f sys/src/cmd/upas/filterkit/mkfile --- a/sys/src/cmd/upas/filterkit/mkfile Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/filterkit/mkfile Tue Nov 17 19:48:31 2020 -0600 @@ -7,16 +7,8 @@ mbappend\ token\ -LIB=../common/libcommon.a$O\ - +LIB=../common/libcommon.a$O OFILES=readaddrs.$O -UPDATE=\ - mkfile\ - ${TARG:%=%.c}\ - pipeto.sample\ - pipefrom.sample\ - pipeto.sample-hold\ </sys/src/cmd/mkmany CFLAGS=$CFLAGS -I../common - diff -r c6e94385ea0f sys/src/cmd/upas/fs/mkfile --- a/sys/src/cmd/upas/fs/mkfile Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/fs/mkfile Tue Nov 17 19:48:31 2020 -0600 @@ -1,7 +1,8 @@ </$objtype/mkfile +<../mkupas TARG=fs - +LIB=../common/libcommon.a$O OFILES=\ cache.$O\ fs.$O\ @@ -18,21 +19,12 @@ strtotm.$O\ tls.$O\ -LIB=../common/libcommon.a$O\ - -HFILES= ../common/common.h\ - dat.h - -UPDATE=\ - mkfile\ - $HFILES\ - ${TARG:%=%.c}\ - ${OFILES:%.$O=%.c}\ +HFILES=\ + ../common/common.h\ + dat.h\ </sys/src/cmd/mkone CFLAGS=$CFLAGS -I../common -<../mkupas - acid:V: $CC -a $CFLAGS fs.c>a$O diff -r c6e94385ea0f sys/src/cmd/upas/imap4d/mkfile --- a/sys/src/cmd/upas/imap4d/mkfile Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/imap4d/mkfile Tue Nov 17 19:48:31 2020 -0600 @@ -1,4 +1,7 @@ </$objtype/mkfile +<../mkupas + +TARG=imap4d OFILES=\ auth.$O\ @@ -23,16 +26,8 @@ store.$O\ utils.$O\ -HFILES=imap4d.h\ +HFILES=\ + imap4d.h\ fns.h\ -TARG=imap4d - -UPDATE=\ - mkfile\ - $HFILES\ - ${OFILES:%.$O=%.c}\ - </sys/src/cmd/mkone - -<../mkupas diff -r c6e94385ea0f sys/src/cmd/upas/marshal/mkfile --- a/sys/src/cmd/upas/marshal/mkfile Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/marshal/mkfile Tue Nov 17 19:48:31 2020 -0600 @@ -2,18 +2,10 @@ <../mkupas TARG=marshal +LIB=../common/libcommon.a$O +OFILES=marshal.$O +HFILES=../common/common.h -LIB=../common/libcommon.a$O\ - -HFILES= ../common/common.h\ - -OFILES= marshal.$O - -UPDATE=\ - mkfile\ - $HFILES\ - ${OFILES:%.$O=%.c}\ - </sys/src/cmd/mkone CFLAGS=$CFLAGS -I../common diff -r c6e94385ea0f sys/src/cmd/upas/mkfile --- a/sys/src/cmd/upas/mkfile Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/mkfile Tue Nov 17 19:48:31 2020 -0600 @@ -24,46 +24,10 @@ #libs must be made first DIRS=$LIBS $PROGS -UPDATE=\ - mkfile\ - /sys/man/1/mail\ - -all:V: +all install installall clean nuke:V: for (i in $DIRS) @{ cd $i - mk all - } - -clean:V: - for (i in $DIRS) @{ - cd $i - mk clean - } - -nuke:V: - for (i in $LIBS) @{ - cd $i - mk nuke - } - for (i in $PROGS) @{ - cd $i - mk clean - } - -install:V: - for (i in $DIRS) @{ - cd $i - mk install - } - -installall:V: - for (i in $DIRS) @{ - cd $i - mk installall - } - for (i in $DIRS) @{ - cd $i - mk clean + mk $target } safeinstallall:V: @@ -75,15 +39,3 @@ cd $i mk safeinstallall } - for (i in $DIRS) @{ - cd $i - mk clean - } - -update:V: - update $UPDATEFLAGS $UPDATE - for (i in $DIRS) @{ - cd $i - echo '>>>>>>>>>>' `{pwd} '<<<<<<<<<<<' - mk $MKFLAGS 'UPDATEFLAGS='$"UPDATEFLAGS update - } diff -r c6e94385ea0f sys/src/cmd/upas/mkupas --- a/sys/src/cmd/upas/mkupas Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/mkupas Tue Nov 17 19:48:31 2020 -0600 @@ -2,4 +2,4 @@ ABIN=/acme/bin/$objtype ../common/libcommon.a$O: - cd ../common; mk; mk clean + cd ../common; mk diff -r c6e94385ea0f sys/src/cmd/upas/ml/dat.h --- a/sys/src/cmd/upas/ml/dat.h Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/ml/dat.h Tue Nov 17 19:48:31 2020 -0600 @@ -1,6 +1,6 @@ #include "../smtp/smtp.h" -#include "../smtp/y.tab.h" +#include "../smtp/rfc822.tab.h" typedef struct Addr Addr; struct Addr diff -r c6e94385ea0f sys/src/cmd/upas/ml/mkfile --- a/sys/src/cmd/upas/ml/mkfile Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/ml/mkfile Tue Nov 17 19:48:31 2020 -0600 @@ -1,30 +1,20 @@ </$objtype/mkfile <../mkupas -TARG=ml\ +TARG=\ + ml\ mlowner\ mlmgr\ -OFILES=\ - common.$O\ +LIB=../common/libcommon.a$O -LIB=../common/libcommon.a$O\ +OFILES=common.$O -UHFILES= ../common/common.h\ +HFILES=\ + ../common/common.h\ ../common/sys.h\ dat.h\ - -HFILES=$UHFILES\ - ../smtp/y.tab.h\ - -LIB=../common/libcommon.a$O\ - -UPDATE=\ - mkfile\ - $UHFILES\ - ${TARG:%=%.c}\ - ${OFILES:%.$O=%.c}\ - ../smtp/rfc822.y\ + ../smtp/rfc822.tab.h\ </sys/src/cmd/mkmany CFLAGS=$CFLAGS -I../common @@ -32,5 +22,5 @@ $O.ml: ../smtp/rfc822.tab.$O $O.mlowner: ../smtp/rfc822.tab.$O -../smtp/y.tab.h ../smtp/rfc822.tab.$O: +../smtp/rfc822.tab.h ../smtp/rfc822.tab.$O: ../smtp/rfc822.y cd ../smtp && mk rfc822.tab.$O diff -r c6e94385ea0f sys/src/cmd/upas/ned/mkfile --- a/sys/src/cmd/upas/ned/mkfile Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/ned/mkfile Tue Nov 17 19:48:31 2020 -0600 @@ -1,19 +1,10 @@ </$objtype/mkfile +<../mkupas TARG=nedmail - -LIB=../common/libcommon.a$O\ - -HFILES= ../common/common.h\ - +LIB=../common/libcommon.a$O OFILES=nedmail.$O - -UPDATE=\ - mkfile\ - ${OFILES:%.$O=%.c}\ - $HFILES\ +HFILES=../common/common.h </sys/src/cmd/mkone CFLAGS=$CFLAGS -I../common - -<../mkupas diff -r c6e94385ea0f sys/src/cmd/upas/pop3/mkfile --- a/sys/src/cmd/upas/pop3/mkfile Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/pop3/mkfile Tue Nov 17 19:48:31 2020 -0600 @@ -2,15 +2,8 @@ <../mkupas TARG=pop3 - +LIB=../common/libcommon.a$O OFILES=pop3.$O -LIB=../common/libcommon.a$O - -UPDATE=\ - mkfile\ - ${OFILES:%.$O=%.c}\ - </sys/src/cmd/mkone - CFLAGS=$CFLAGS -I../common diff -r c6e94385ea0f sys/src/cmd/upas/q/mkfile --- a/sys/src/cmd/upas/q/mkfile Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/q/mkfile Tue Nov 17 19:48:31 2020 -0600 @@ -1,21 +1,15 @@ </$objtype/mkfile <../mkupas -TARG = qer\ +TARG=\ + qer\ runq\ +LIB=../common/libcommon.a$O OFILES= - -HFILES=../common/common.h\ +HFILES=\ + ../common/common.h\ ../common/sys.h\ -LIB=../common/libcommon.a$O\ - -UPDATE=\ - mkfile\ - $HFILES\ - ${OFILES:%.$O=%.c}\ - ${TARG:%=%.c}\ - </sys/src/cmd/mkmany CFLAGS=$CFLAGS -I../common diff -r c6e94385ea0f sys/src/cmd/upas/qfrom/mkfile --- a/sys/src/cmd/upas/qfrom/mkfile Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/qfrom/mkfile Tue Nov 17 19:48:31 2020 -0600 @@ -1,13 +1,7 @@ </$objtype/mkfile +<../mkupas TARG=qfrom -OFILES=qfrom.$O\ - -BIN=/$objtype/bin/upas - -UPDATE=\ - mkfile\ - $HFILES\ - ${OFILES:%.$O=%.c}\ +OFILES=qfrom.$O </sys/src/cmd/mkone diff -r c6e94385ea0f sys/src/cmd/upas/scanmail/mkfile --- a/sys/src/cmd/upas/scanmail/mkfile Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/scanmail/mkfile Tue Nov 17 19:48:31 2020 -0600 @@ -1,25 +1,20 @@ </$objtype/mkfile +<../mkupas -TARG=scanmail\ +TARG=\ + scanmail\ testscan -OFILES= common.$O +LIB=../common/libcommon.a$O -HFILES= spam.h\ +OFILES=common.$O + +HFILES=\ + spam.h\ ../common/sys.h\ -LIB= ../common/libcommon.a$O\ - -UPDATE=\ - mkfile\ - $HFILES\ - ${OFILES:%.$O=%.c}\ - ${TARG:%=%.c}\ - </sys/src/cmd/mkmany CFLAGS=$CFLAGS -I../common -<../mkupas - -scanmail.$O: scanmail.c +scanmail.$O: scanmail.c $CC $CFLAGS scanmail.c diff -r c6e94385ea0f sys/src/cmd/upas/send/message.c --- a/sys/src/cmd/upas/send/message.c Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/send/message.c Tue Nov 17 19:48:31 2020 -0600 @@ -2,7 +2,7 @@ #include "send.h" #include <regexp.h> #include "../smtp/smtp.h" -#include "../smtp/y.tab.h" +#include "../smtp/rfc822.tab.h" enum{ VMLIMIT = 64*1024, diff -r c6e94385ea0f sys/src/cmd/upas/send/mkfile --- a/sys/src/cmd/upas/send/mkfile Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/send/mkfile Tue Nov 17 19:48:31 2020 -0600 @@ -1,16 +1,17 @@ </$objtype/mkfile <../mkupas -TARG=send\ - filter +TARG=\ + send\ + filter\ -UOFILES=message.$O\ +LIB=../common/libcommon.a$O + +OFILES=\ + message.$O\ dest.$O\ log.$O\ skipequiv.$O\ - -OFILES=\ - $UOFILES\ ../smtp/rfc822.tab.$O\ SOBJ=\ @@ -23,23 +24,13 @@ rewrite.$O\ translate.$O\ -FOBJ=\ - cat_mail.$O\ +FOBJ=cat_mail.$O - -HFILES=send.h\ +HFILES=\ + send.h\ ../common/common.h\ ../common/sys.h\ -LIB=../common/libcommon.a$O\ - -UPDATE=\ - mkfile\ - $HFILES\ - ${UOFILES:%.$O=%.c}\ - ${SOBJ:%.$O=%.c}\ - ${TARG:%=%.c}\ - </sys/src/cmd/mkmany CFLAGS=$CFLAGS -I../common @@ -48,7 +39,7 @@ $O.filter: $FOBJ -message.$O: ../smtp/y.tab.h +message.$O: ../smtp/rfc822.tab.h -../smtp/y.tab.h ../smtp/rfc822.tab.$O: ../smtp/rfc822.y +../smtp/rfc822.tab.h ../smtp/rfc822.tab.$O: ../smtp/rfc822.y cd ../smtp && mk rfc822.tab.$O diff -r c6e94385ea0f sys/src/cmd/upas/smtp/mkfile --- a/sys/src/cmd/upas/smtp/mkfile Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/smtp/mkfile Tue Nov 17 19:48:31 2020 -0600 @@ -1,30 +1,22 @@ </$objtype/mkfile +<../mkupas -TARG = smtpd\ +TARG=\ + smtpd\ smtp\ -TEST=\ - parsetest - +LIB=../common/libcommon.a$O OFILES= - -LIB=../common/libcommon.a$O\ - -HFILES=../common/common.h\ +HFILES=\ + ../common/common.h\ ../common/sys.h\ smtpd.h\ smtp.h\ + rfc822.tab.h\ -UPDATE=\ - greylist.c\ - mkfile\ - mxdial.c\ - rfc822.y\ - smtpd.y\ - spam.c\ - $HFILES\ - ${OFILES:%.$O=%.c}\ - ${TARG:%=%.c}\ +TEST=parsetest + +CLEANFILES=*.tab.? </sys/src/cmd/mkmany CFLAGS=$CFLAGS -I../common @@ -35,24 +27,16 @@ rfc822.tab.$O\ greylist.$O\ -$O.smtp: rfc822.tab.$O mxdial.$O +$O.smtp: rfc822.tab.$O mxdial.$O smtpd.tab.c: smtpd.y yacc -o xxx smtpd.y sed 's/yy/zz/g' < xxx > $target rm xxx -rfc822.tab.c: rfc822.y - yacc -d -o $target rfc822.y +rfc822.tab.c rfc822.tab.h:D: rfc822.y + yacc -d -s rfc822 rfc822.y $O.parsetest: rfc822.tab.$O parsetest.$O: rfc822.tab.$O - -clean:V: - rm -f *.[$OS] [$OS].^($TARG $TEST) smtpd.tab.c rfc822.tab.c y.tab.? y.debug $TARG - -../common/libcommon.a$O: - cd ../common && mk - -<../mkupas diff -r c6e94385ea0f sys/src/cmd/upas/smtp/smtpd.c --- a/sys/src/cmd/upas/smtp/smtpd.c Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/smtp/smtpd.c Tue Nov 17 19:48:31 2020 -0600 @@ -7,7 +7,7 @@ #include <mp.h> #include <libsec.h> #include <auth.h> -#include "../smtp/y.tab.h" +#include "rfc822.tab.h" char *me; char *him=""; diff -r c6e94385ea0f sys/src/cmd/upas/unesc/mkfile --- a/sys/src/cmd/upas/unesc/mkfile Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/unesc/mkfile Tue Nov 17 19:48:31 2020 -0600 @@ -2,11 +2,6 @@ <../mkupas TARG=unesc -OFILES=unesc.$O\ - -UPDATE=\ - mkfile\ - $HFILES\ - ${OFILES:%.$O=%.c}\ +OFILES=unesc.$O </sys/src/cmd/mkone diff -r c6e94385ea0f sys/src/cmd/upas/vf/mkfile --- a/sys/src/cmd/upas/vf/mkfile Sun Nov 15 22:47:45 2020 +0100 +++ b/sys/src/cmd/upas/vf/mkfile Tue Nov 17 19:48:31 2020 -0600 @@ -2,18 +2,11 @@ <../mkupas TARG=vf - -OFILES=vf.$O\ - -LIB=../common/libcommon.a$O\ - -HFILES=../common/common.h\ - ../common/sys.h\ - -UPDATE=\ - mkfile\ - $HFILES\ - ${OFILES:%.$O=%.c}\ +LIB=../common/libcommon.a$O +OFILES=vf.$O +HFILES=\ + ../common/common.h\ + ../common/sys.h\ </sys/src/cmd/mkone CFLAGS=$CFLAGS -I../common ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [9front] upas: mkfile cleanup patch 2020-11-18 2:03 ` Amavect @ 2020-11-18 2:39 ` ori 0 siblings, 0 replies; 4+ messages in thread From: ori @ 2020-11-18 2:39 UTC (permalink / raw) To: amavect, ori, 9front Quoth Amavect <amavect@gmail.com>: > > Mentioned on grid, but this has 2 issues for me: > > First, it looks like the patch somehow had a space > > appended to each line; needed a: > > > > ,s/ $//g > > > > in order to apply. > > > > Second, smtp fails to build after a 'mk nuke'; it > > looks like we somehow fail to rebuild a y.tab.h. > > Weirdly, 'mk clean' fixes it for me. > > > > Also, noting the sed hacks in the mkfile to get > > two parsers: our yacc should grow a '%prefix' > > > > Let's do this again. > > > Description: > upas: mkfile cleanup (thanks Amavect) > > Changeset 8035 broke the libcommon rule in mkupas. > Deleting the 'mk clean' in the recipe fixes this. > > Fixed smtp's build after mk nuke. > smtp/mkfile overrode the nuke rule, > but it forgot to delete rfc822.tab.c > smtp/y.tab.h would not get rebuilt because > it was not specified as a dependency. > Added the -s flag to rename y.tab.h to rfc822.tab.h > requiring all includes to be changed. > This allows rfc822.tab.h to be specified without conflict > with the y.tab.h rule from </sys/src/cmd/mkmany > > Cleanup includes deleting UPDATE vars from all mkfiles, > deletion of extra vars used for UPDATE, > reorganization of vars in TARG,LIB,OFILE,HFILE order, > and small style changes for consistency. > > > Thanks, > Amavect > LGTM, committed. Thanks! ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-18 2:39 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-11-17 1:23 upas: mkfile cleanup patch Amavect 2020-11-18 0:14 ` [9front] " ori 2020-11-18 2:03 ` Amavect 2020-11-18 2:39 ` ori
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).