mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
This takes another step towards cleaning up the build system. We now do not even pretend to be theoretically compatible with pre-1989 K&R C compilers or with C++ compilers. In practice, this had already been broken for many years due to bit rot. Commit46593a89already removed the license handling enormity that depended on proto, so now we can cleanly remove it altogether. But we do need to leave some backwards compatibility stubs to keep the build system compatible with older AST code; it should remain possible to build older ksh versions with the current build system (the bin/ and src/cmd/INIT/ directories) for testing purposes. So as of now there is no more __MANGLE__d rubbish in your generated header files. This is only about a quarter of a century overdue... This commit also includes a huge amount of code cleanup to remove thousands of unused K&R C fallbacks and other cruft, particularly in libast. This code base should now be a little easier to understand for people who are familiar with a modern(ish) C standard. ratz is now also removed; this was a standalone and simplified 2005 version of gunzip. As of6137b99a, none of our code uses it, even theoretically. And the real g(un)zip is now everywhere. src/cmd/INIT/proto.c, src/cmd/INIT/ratz.c: - Removed. COPYRIGHT: - Remove zlib license; this only applied to ratz. bin/package, src/cmd/INIT/package.sh: - Related cleanups. - Unset LC_ALL before invoking a new shell, respecting the user's locale again and avoiding multibyte character corruption on the command line. src/cmd/INIT/proto.sh: - Add stub for backwards compatibility with Mamfiles that depend on proto. It does nothing but pass input without modification and is now installed as the new arch/*/bin/proto by src/cmd/INIT/Mamfile. src/cmd/INIT/iffe.sh: - Ignore the proto-related -e (--package) and -p (--prototyped) options; keep parsing them for backwards compatibility. - Trim the macros passed to every test to their standard C versions, removing K&R C and C++ versions. These are now considered to be for backwards compatibility only. src/cmd/INIT/iffe.tst: - Remove proto(1) mangling code. By the way, iffe can be regression-tested as follows: $ bin/package use # set up environment in a child shell $ regress src/cmd/INIT/iffe.tst $ exit # leave package environment src/cmd/INIT/make.probe, src/cmd/INIT/probe.win32: - Remove code to handle C++. src/lib/libast/features/common: - As in iffe.sh above, trim macros designed for compatibility with C++ and ancient C compilers to their standard C versions and comment that they are for backwards compatibility with AST code. This is needed to keep all the old ast and ksh code compiling. src/cmd/ksh93/sh/init.c, src/cmd/ksh93/sh/name.c: - Clarify libshell ABI compatibility function versions of macros. A "proto workaround" comment in the original code mislead me into thinking this had something to do with the removed proto(1), but it's unrelated. Call the workaround macro BYPASS_MACRO instead. src/cmd/ksh93/include/defs.h: - sh_sigcheck() macro: allow &sh as an argument: parenthesise shp. src/cmd/ksh93/sh/nvtype.c: - Remove unused nv_mkstruct() function. (re:d0a5cab1) **/features/*: - Remove obsolete iffe 'set prototyped' option. **/Mamfile: - Remove all references to the ast/prototyped.h header. - Remove all use of the proto command. Simply copy instead. *** 850-ish source files: *** - Remove all '#pragma prototyped' directives. - Remove all C++ compat code conditional upon defined(__cplusplus). - Remove all use of the _ARG_ macro, which on standard C expands to its argument: #define _ARG_(x) x (on K&R C, it expanded to nothing) - Remove all use of _BEGIN_EXTERNS_ and _END_EXTERNS_ macros (empty on standard C; this was for C++ compatibility) - Reduce all #if __STD_C (standard code) #else (K&R code) #endif blocks to the standard code only, without use of the macro. - Same for _STD_ macro which seems to have had the same function. - Change all instances of 'Void_t' to standard 'void'.
This commit is contained in:
Martijn Dekker
parent
3785a0685c
commit
a1f5c99204
869 changed files with 1853 additions and 14292 deletions
153
bin/package
153
bin/package
|
|
@ -108,7 +108,7 @@ command=${0##*/}
|
|||
case $(getopts '[-][123:xyz]' opt --xyz 2>/dev/null; echo 0$opt) in
|
||||
0123) USAGE=$'
|
||||
[-?
|
||||
@(#)$Id: '$command$' (ksh 93u+m) 2021-12-15 $
|
||||
@(#)$Id: '$command$' (ksh 93u+m) 2021-12-22 $
|
||||
]
|
||||
[-author?Glenn Fowler <gsf@research.att.com>]
|
||||
[-author?Contributors to https://github.com/ksh93/ksh]
|
||||
|
|
@ -252,13 +252,6 @@ case $(getopts '[-][123:xyz]' opt --xyz 2>/dev/null; echo 0$opt) in
|
|||
file (\bMamfile\b). A Mamfile contains a portable makefile description
|
||||
written in a simple dependency tree language using indented
|
||||
\bmake\b...\bdone\b blocks.]
|
||||
[+?Most component C source is prototyped. If \b$CC\b (default value
|
||||
\bcc\b) is not a prototyping C compiler then \b'$command$' make\b runs
|
||||
\bproto\b(1) on portions of the \b$PACKAGEROOT/src\b tree and places
|
||||
the converted output files in the \b$PACKAGEROOT/proto/src\b tree.
|
||||
Converted files are then viewpathed over the original source.
|
||||
\bproto\b(1) converts an ANSI C subset to code that is compatible with
|
||||
K&R, ANSI, and C++ dialects.]
|
||||
[+?All scripts and commands under \b$PACKAGEROOT\b use \b$PATH\b
|
||||
relative pathnames (via the \bAST\b \bpathpath\b(3) function); there
|
||||
are no embedded absolute pathnames. This means that binaries generated
|
||||
|
|
@ -271,7 +264,7 @@ case $(getopts '[-][123:xyz]' opt --xyz 2>/dev/null; echo 0$opt) in
|
|||
|
||||
[+SEE ALSO?\bautoconfig\b(1), \bcksum\b(1), \bexecrate\b(1), \bexpmake\b(1),
|
||||
\bgzip\b(1), \bmake\b(1), \bmamake\b(1), \bpax\b(1),
|
||||
\bpkgadd\b(1), \bpkgmk\b(1), \bproto\b(1), \bratz\b(1), \brpm\b(1),
|
||||
\bpkgadd\b(1), \bpkgmk\b(1), \brpm\b(1),
|
||||
\bsh\b(1), \btar\b(1), \boptget\b(3)]
|
||||
'
|
||||
case $* in
|
||||
|
|
@ -321,7 +314,6 @@ tab=" "
|
|||
verbose=0
|
||||
AUTHORIZE=
|
||||
DEBUG=
|
||||
PROTOROOT=-
|
||||
SHELLMAGIC=-
|
||||
|
||||
unset FIGNORE BINDIR DLLDIR ETCDIR FUNDIR INCLUDEDIR LIBDIR LOCALEDIR MANDIR SHAREDIR 2>/dev/null || true
|
||||
|
|
@ -507,13 +499,6 @@ DETAILS
|
|||
Mamfile contains a portable makefile description written in a simple
|
||||
dependency tree language using indented make...done blocks.
|
||||
|
||||
Most component C source is prototyped. If $CC (default value cc) is not a
|
||||
prototyping C compiler then package make runs proto(1) on portions of the
|
||||
$PACKAGEROOT/src tree and places the converted output files in the
|
||||
$PACKAGEROOT/proto/src tree. Converted files are then viewpathed over the
|
||||
original source. proto(1) converts an ANSI C subset to code that is
|
||||
compatible with K&R, ANSI, and C++ dialects.
|
||||
|
||||
All scripts and commands under $PACKAGEROOT use $PATH relative pathnames (via
|
||||
the AST pathpath(3) function); there are no embedded absolute pathnames. This
|
||||
means that binaries generated under $PACKAGEROOT may be copied to a different
|
||||
|
|
@ -523,11 +508,10 @@ DETAILS
|
|||
|
||||
SEE ALSO
|
||||
autoconfig(1), cksum(1), execrate(1), expmake(1), gzip(1), make(1),
|
||||
mamake(1), pax(1), pkgadd(1), pkgmk(1), proto(1), ratz(1), rpm(1), sh(1),
|
||||
tar(1), optget(3)
|
||||
mamake(1), pax(1), pkgadd(1), pkgmk(1), rpm(1), sh(1), tar(1), optget(3)
|
||||
|
||||
IMPLEMENTATION
|
||||
version package (ksh 93u+m) 2021-12-15
|
||||
version package (ksh 93u+m) 2021-12-22
|
||||
author Glenn Fowler <gsf@research.att.com>
|
||||
author Contributors to https://github.com/ksh93/ksh
|
||||
copyright (c) 1994-2012 AT&T Intellectual Property
|
||||
|
|
@ -2257,7 +2241,7 @@ cat $INITROOT/$i.sh
|
|||
$show export PATH
|
||||
export PATH
|
||||
;;
|
||||
*) for i in package proto
|
||||
*) for i in package
|
||||
do if onpath $i
|
||||
then EXECROOT=$(echo $_onpath_ | sed -e 's,//*[^/]*//*[^/]*$,,')
|
||||
EXECTYPE=$(echo $EXECROOT | sed -e 's,.*/,,')
|
||||
|
|
@ -2375,9 +2359,6 @@ cat $INITROOT/$i.sh
|
|||
?*) USER_VPATH=$USER_VPATH:$i
|
||||
USER_VPATH_CHAIN="$USER_VPATH_CHAIN $p $i"
|
||||
p=$i
|
||||
case $PROTOROOT in
|
||||
-) executable $i/bin/mamake && PROTOROOT= ;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
|
@ -2533,87 +2514,18 @@ esac
|
|||
|
||||
checkaout() # cmd ...
|
||||
{
|
||||
case $PROTOROOT in
|
||||
-) PROTOROOT=
|
||||
case $* in
|
||||
ratz) if test -f $INITROOT/ratz.c -a -w $PACKAGEROOT
|
||||
then test -f $INITROOT/hello.c || {
|
||||
cat > $INITROOT/hello.c <<'!'
|
||||
#ifndef printf
|
||||
#include <stdio.h>
|
||||
#endif
|
||||
int main() { int new = 0; printf("hello world\n"); return new;}
|
||||
!
|
||||
}
|
||||
test -f $INITROOT/p.c || {
|
||||
cat > $INITROOT/p.c <<'!'
|
||||
/*
|
||||
* small test for prototyping cc
|
||||
*/
|
||||
|
||||
int main(int argc, char** argv) { return argc || argv; }
|
||||
!
|
||||
}
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
test -f $INITROOT/hello.c -a -f $INITROOT/p.c -a -w $PACKAGEROOT || {
|
||||
for i
|
||||
do onpath $i || {
|
||||
note "$i: command not found"
|
||||
return 1
|
||||
}
|
||||
done
|
||||
return 0
|
||||
case $cc in
|
||||
'') _PACKAGE_cc=0
|
||||
;;
|
||||
*) _PACKAGE_cc=1
|
||||
test -f $INITROOT/hello.c -a -f $INITROOT/p.c || {
|
||||
note "$INITROOT: INIT package source not found"
|
||||
return 1
|
||||
}
|
||||
case $cc in
|
||||
'') _PACKAGE_cc=0
|
||||
;;
|
||||
*) _PACKAGE_cc=1
|
||||
test -f $INITROOT/hello.c -a -f $INITROOT/p.c || {
|
||||
note "$INITROOT: INIT package source not found"
|
||||
return 1
|
||||
}
|
||||
|
||||
# check for prototyping cc
|
||||
# NOTE: proto.c must be K&R compatible
|
||||
|
||||
$CC -c $INITROOT/p.c >/dev/null 2>&1
|
||||
c=$?
|
||||
rm -f p.*
|
||||
test 0 != "$c" && {
|
||||
checkaout proto || return
|
||||
PROTOROOT=$PACKAGEROOT/proto
|
||||
$show PROTOROOT=$PACKAGEROOT/proto
|
||||
export PROTOROOT
|
||||
INITPROTO=$PROTOROOT/src/cmd/INIT
|
||||
note "proto convert $PACKAGEROOT/src into $PROTOROOT/src"
|
||||
dirs="src"
|
||||
(
|
||||
if test -f $PROTOROOT/UPDATE
|
||||
then newer="-newer $PROTOROOT/UPDATE"
|
||||
else newer=""
|
||||
fi
|
||||
case $exec in
|
||||
'') cd $PACKAGEROOT
|
||||
find $dirs -name '*.[CcHh]' $newer -print | proto -v -L - -C proto
|
||||
;;
|
||||
*) $exec cd $PACKAGEROOT
|
||||
$exec "find $dirs -name '*.[CcHh]' $newer -print | proto -L - -C proto"
|
||||
;;
|
||||
esac
|
||||
$exec touch $PROTOROOT/UPDATE
|
||||
)
|
||||
VPATH=$INSTALLROOT:$PROTOROOT:$PACKAGEROOT$USER_VPATH
|
||||
$show VPATH=$VPATH
|
||||
export VPATH
|
||||
}
|
||||
|
||||
for i in arch arch/$HOSTTYPE arch/$HOSTTYPE/bin
|
||||
do test -d $PACKAGEROOT/$i || $exec mkdir $PACKAGEROOT/$i || return
|
||||
done
|
||||
;;
|
||||
esac
|
||||
for i in arch arch/$HOSTTYPE arch/$HOSTTYPE/bin
|
||||
do test -d $PACKAGEROOT/$i || $exec mkdir $PACKAGEROOT/$i || return
|
||||
done
|
||||
;;
|
||||
esac
|
||||
case $_PACKAGE_cc in
|
||||
|
|
@ -2672,30 +2584,12 @@ int main(int argc, char** argv) { return argc || argv; }
|
|||
case $(ls -t $INITROOT/$i.c $INSTALLROOT/bin/$i 2>/dev/null) in
|
||||
"$INITROOT/$i.c"*)
|
||||
note "update $INSTALLROOT/bin/$i"
|
||||
if test proto != "$i" && executable $INSTALLROOT/bin/proto
|
||||
then case $exec in
|
||||
'') $INSTALLROOT/bin/proto -p $INITROOT/$i.c > $i.c || return ;;
|
||||
*) $exec "$INSTALLROOT/bin/proto -p $INITROOT/$i.c > $i.c" ;;
|
||||
esac
|
||||
$exec $CC $CCFLAGS -o $INSTALLROOT/bin/$i $i.c || return
|
||||
$exec rm -f $i.c
|
||||
else if test ! -d $INSTALLROOT/bin
|
||||
then for j in arch arch/$HOSTTYPE arch/$HOSTTYPE/bin
|
||||
do test -d $PACKAGEROOT/$j || $exec mkdir $PACKAGEROOT/$j || return
|
||||
done
|
||||
fi
|
||||
if test '' != "$PROTOROOT" -a -f $INITPROTO/$i.c
|
||||
then $exec $CC $CCFLAGS -o $INSTALLROOT/bin/$i $INITPROTO/$i.c || return
|
||||
else $exec $CC $CCFLAGS -o $INSTALLROOT/bin/$i $INITROOT/$i.c || return
|
||||
fi
|
||||
case $i:$exec in
|
||||
proto:) test -d $INSTALLROOT/include || mkdir $INSTALLROOT/include
|
||||
$INSTALLROOT/bin/proto -f /dev/null > $i.c
|
||||
cmp -s $i.c $INSTALLROOT/include/prototyped.h 2>/dev/null || cp $i.c $INSTALLROOT/include/prototyped.h
|
||||
rm $i.c
|
||||
;;
|
||||
esac
|
||||
if test ! -d $INSTALLROOT/bin
|
||||
then for j in arch arch/$HOSTTYPE arch/$HOSTTYPE/bin
|
||||
do test -d $PACKAGEROOT/$j || $exec mkdir $PACKAGEROOT/$j || return
|
||||
done
|
||||
fi
|
||||
$exec $CC $CCFLAGS -o $INSTALLROOT/bin/$i $INITROOT/$i.c || return
|
||||
test -f $i.o && $exec rm -f $i.o
|
||||
i=$PATH
|
||||
PATH=/bin
|
||||
|
|
@ -3172,9 +3066,9 @@ cat $j $k
|
|||
esac
|
||||
fi
|
||||
|
||||
# initialize a few mamake related commands
|
||||
# initialize mamake
|
||||
|
||||
checkaout mamake proto ratz || exit
|
||||
checkaout mamake || exit
|
||||
|
||||
# execrate if necessary
|
||||
|
||||
|
|
@ -3529,7 +3423,7 @@ results)set '' $target
|
|||
case $filter in
|
||||
errors) $exeg egrep '^pax:|\*\*\*' $j
|
||||
;;
|
||||
*) $exec egrep -iv '^($||[\+\[]|cc[^-:]|kill |make.*(file system time|has been replaced)|so|[0123456789]+ error|uncrate |[0123456789]+ block|ar: creat|iffe: test: |conf: (check|generate|test)|[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789]*=|gsf@research|ar:.*warning|cpio:|ld:.*(duplicate symbol|to obtain more information)|[0123456789]*$|(checking|creating|touch) [/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789])| obsolete predefined symbol | is (almost always misused|dangerous|deprecated|not implemented)| trigraph| assigned to | cast .* different size| integer overflow .*<<| optimization may be attained | passed as |::__builtin|pragma.*prototyped|^creating.*\.a$|warning.*not optimized|exceeds size thresh|ld:.*preempts|is unchanged|with value >=|(-l|lib)\*|/(ast|sys)/(dir|limits|param|stropts)\.h.*redefined|usage|base registers|`\.\.\.` obsolete'"$i" $j |
|
||||
*) $exec egrep -iv '^($||[\+\[]|cc[^-:]|kill |make.*(file system time|has been replaced)|so|[0123456789]+ error|uncrate |[0123456789]+ block|ar: creat|iffe: test: |conf: (check|generate|test)|[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789]*=|gsf@research|ar:.*warning|cpio:|ld:.*(duplicate symbol|to obtain more information)|[0123456789]*$|(checking|creating|touch) [/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789])| obsolete predefined symbol | is (almost always misused|dangerous|deprecated|not implemented)| trigraph| assigned to | cast .* different size| integer overflow .*<<| optimization may be attained | passed as |::__builtin|^creating.*\.a$|warning.*not optimized|exceeds size thresh|ld:.*preempts|is unchanged|with value >=|(-l|lib)\*|/(ast|sys)/(dir|limits|param|stropts)\.h.*redefined|usage|base registers|`\.\.\.` obsolete'"$i" $j |
|
||||
$exec grep :
|
||||
;;
|
||||
esac
|
||||
|
|
@ -3564,6 +3458,7 @@ use) # finalize the environment
|
|||
esac
|
||||
eval PACKAGE_USE=$package_use
|
||||
export PACKAGE_USE
|
||||
unset LC_ALL # respect the user's locale again; avoids multibyte corruption
|
||||
|
||||
# run the command
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue