dvadura@watdragon.waterloo.edu (Dennis Vadura) (12/01/90)
#!/bin/sh
# this is part 6 of a multipart archive
# do not concatenate these parts, unpack them in order with /bin/sh
# file dmake-3.6-patch2 continued
#
CurArch=6
if test ! -r s2_seq_.tmp
then echo "Please unpack part 1 first!"
exit 1; fi
( read Scheck
if test "$Scheck" != $CurArch
then echo "Please unpack part $Scheck next!"
exit 1;
else exit 0; fi
) < s2_seq_.tmp || exit 1
sed 's/^X//' << 'SHAR_EOF' >> dmake-3.6-patch2
XX! if( Makemkf ) {
XX! rval = -1;
XX! goto stop_making_it;
XX! }
XX! else if(how->hw_prq != NIL(LINK)||(Augmake && (cp->ce_flag&F_EXPLICIT)))
XX! /* Assume an empty recipe for a target that we have run inference on
XX! * but do not have a set of rules for but for which we have inferred
XX! * a list of prerequisites. */
XX! cp->ce_flag |= F_RULES;
XX else
XX Fatal( "`%s' not found, and can't be made", cp->CE_NAME );
XX
XX*** /u2/dvadura/src/generic/dmake/dmake36-pl2/getinp.c Sun Oct 28 13:33:48 1990
XX--- getinp.c Tue Nov 6 14:15:41 1990
XX***************
XX*** 1,4 ****
XX! /* RCS -- $Header: /u2/dvadura/src/generic/dmake/src/RCS/getinp.c,v 1.1 90/10/06 12:03:43 dvadura Exp Locker: dvadura $
XX -- SYNOPSIS -- handle reading of input.
XX --
XX -- DESCRIPTION
XX--- 1,4 ----
XX! /* RCS -- $Header: /u2/dvadura/src/generic/dmake/src/RCS/getinp.c,v 1.3 90/11/06 14:15:27 dvadura Exp $
XX -- SYNOPSIS -- handle reading of input.
XX --
XX -- DESCRIPTION
XX***************
XX*** 36,41 ****
XX--- 36,44 ----
XX --
XX -- LOG
XX -- $Log: getinp.c,v $
XX+ * Revision 1.3 90/11/06 14:15:27 dvadura
XX+ * Treat \r as white space too.
XX+ *
XX * Revision 1.1 90/10/06 12:03:43 dvadura
XX * dmake Release, Version 3.6
XX *
XX***************
XX*** 45,51 ****
XX #include "alloc.h"
XX #include "db.h"
XX
XX! #define IS_WHITE(A) ((A == ' ') || (A == '\t') || (A == '\n'))
XX #define SCAN_WHITE(A) \
XX while( IS_WHITE(*A) ) A++;
XX
XX--- 48,54 ----
XX #include "alloc.h"
XX #include "db.h"
XX
XX! #define IS_WHITE(A) ((A == ' ') || (A == '\t') || (A == '\n') || (A == '\r'))
XX #define SCAN_WHITE(A) \
XX while( IS_WHITE(*A) ) A++;
XX
XX***************
XX*** 194,200 ****
XX * see if it is a conditional expression. If it is then process it,
XX * otherwise pass it on to the parser. */
XX
XX! if( *(p = _strspn(buf, " \t")) == CONDSTART ) {
XX TKSTR token;
XX
XX SET_TOKEN( &token, p );
XX--- 197,203 ----
XX * see if it is a conditional expression. If it is then process it,
XX * otherwise pass it on to the parser. */
XX
XX! if( *(p = _strspn(buf, " \t\r\n")) == CONDSTART ) {
XX TKSTR token;
XX
XX SET_TOKEN( &token, p );
XX***************
XX*** 267,273 ****
XX * cause breaks. This includes the brk list as well as white space. */
XX
XX if( brk != NIL(char) ) {
XX! strcpy( space, " \t\n" );
XX strcat( space, brk );
XX }
XX else {
XX--- 270,276 ----
XX * cause breaks. This includes the brk list as well as white space. */
XX
XX if( brk != NIL(char) ) {
XX! strcpy( space, " \t\r\n" );
XX strcat( space, brk );
XX }
XX else {
XX*** /u2/dvadura/src/generic/dmake/dmake36-pl2/expand.c Tue Oct 23 09:19:26 1990
XX--- expand.c Tue Oct 30 23:05:35 1990
XX***************
XX*** 1,4 ****
XX! /* RCS -- $Header: /u2/dvadura/src/generic/dmake/src/RCS/expand.c,v 1.1 90/10/06 12:03:40 dvadura Exp Locker: dvadura $
XX -- SYNOPSIS -- macro expansion code.
XX --
XX -- DESCRIPTION
XX--- 1,4 ----
XX! /* RCS -- $Header: /u2/dvadura/src/generic/dmake/src/RCS/expand.c,v 1.2 90/10/30 23:05:00 dvadura Exp $
XX -- SYNOPSIS -- macro expansion code.
XX --
XX -- DESCRIPTION
XX***************
XX*** 70,75 ****
XX--- 70,79 ----
XX --
XX -- LOG
XX -- $Log: expand.c,v $
XX+ * Revision 1.2 90/10/30 23:05:00 dvadura
XX+ * Put in #include to disable optimization if _MSC_VER is defined. Optimization
XX+ * seems to break the code.
XX+ *
XX * Revision 1.1 90/10/06 12:03:40 dvadura
XX * dmake Release, Version 3.6
XX *
XX*** /u2/dvadura/src/generic/dmake/dmake36-pl2/dump.c Sat Oct 27 19:45:56 1990
XX--- dump.c Tue Oct 30 23:06:29 1990
XX***************
XX*** 1,4 ****
XX! /* RCS -- $Header: /u2/dvadura/src/generic/dmake/src/RCS/dump.c,v 1.1 90/10/06 12:03:37 dvadura Exp $
XX -- SYNOPSIS -- dump the internal dag to stdout.
XX --
XX -- DESCRIPTION
XX--- 1,4 ----
XX! /* RCS -- $Header: /u2/dvadura/src/generic/dmake/src/RCS/dump.c,v 1.2 90/10/30 23:06:05 dvadura Exp $
XX -- SYNOPSIS -- dump the internal dag to stdout.
XX --
XX -- DESCRIPTION
XX***************
XX*** 29,34 ****
XX--- 29,37 ----
XX --
XX -- LOG
XX -- $Log: dump.c,v $
XX+ * Revision 1.2 90/10/30 23:06:05 dvadura
XX+ * #include db.h after including other includes first.
XX+ *
XX * Revision 1.1 90/10/06 12:03:37 dvadura
XX * dmake Release, Version 3.6
XX *
XX*** /u2/dvadura/src/generic/dmake/dmake36-pl2/dmake.c Mon Oct 22 16:53:34 1990
XX--- dmake.c Tue Oct 30 23:04:37 1990
XX***************
XX*** 1,4 ****
XX! /* RCS -- $Header: /u2/dvadura/src/generic/dmake/src/RCS/dmake.c,v 1.1 90/10/06 12:03:35 dvadura Exp Locker: dvadura $
XX -- SYNOPSIS -- The main program.
XX --
XX -- DESCRIPTION
XX--- 1,4 ----
XX! /* RCS -- $Header: /u2/dvadura/src/generic/dmake/src/RCS/dmake.c,v 1.2 90/10/30 23:04:22 dvadura Exp $
XX -- SYNOPSIS -- The main program.
XX --
XX -- DESCRIPTION
XX***************
XX*** 68,73 ****
XX--- 68,76 ----
XX --
XX -- LOG
XX -- $Log: dmake.c,v $
XX+ * Revision 1.2 90/10/30 23:04:22 dvadura
XX+ * Add cast for last argument to Push_dir call.
XX+ *
XX * Revision 1.1 90/10/06 12:03:35 dvadura
XX * dmake Release, Version 3.6
XX *
XX*** /u2/dvadura/src/generic/dmake/dmake36-pl2/common/stdmacs.h Sun Oct 28 12:37:08 1990
XX--- common/stdmacs.h Tue Oct 30 23:02:07 1990
XX***************
XX*** 1,4 ****
XX! /* RCS -- $Header: /u2/dvadura/src/generic/dmake/src/common/RCS/stdmacs.h,v 1.1 90/10/06 12:04:47 dvadura Exp Locker: dvadura $
XX -- SYNOPSIS -- general use macros.
XX --
XX -- DESCRIPTION
XX--- 1,4 ----
XX! /* RCS -- $Header: /u2/dvadura/src/generic/dmake/src/common/RCS/stdmacs.h,v 1.2 90/10/30 23:01:58 dvadura Exp $
XX -- SYNOPSIS -- general use macros.
XX --
XX -- DESCRIPTION
XX***************
XX*** 30,35 ****
XX--- 30,38 ----
XX --
XX -- LOG
XX -- $Log: stdmacs.h,v $
XX+ * Revision 1.2 90/10/30 23:01:58 dvadura
XX+ * Don't define offsetof if Atari-ST.
XX+ *
XX * Revision 1.1 90/10/06 12:04:47 dvadura
XX * dmake Release, Version 3.6
XX *
XX*** /u2/dvadura/src/generic/dmake/dmake36-pl2/common/db.h Thu Oct 25 20:08:26 1990
XX--- common/db.h Tue Oct 30 23:01:21 1990
XX***************
XX*** 1,4 ****
XX! /* RCS -- $Header: /u2/dvadura/src/generic/dmake/src/common/RCS/db.h,v 1.1 90/10/06 12:04:41 dvadura Exp $
XX -- SYNOPSIS -- front end to DBUG macros.
XX --
XX -- DESCRIPTION
XX--- 1,4 ----
XX! /* RCS -- $Header: /u2/dvadura/src/generic/dmake/src/common/RCS/db.h,v 1.2 90/10/30 23:01:09 dvadura Exp $
XX -- SYNOPSIS -- front end to DBUG macros.
XX --
XX -- DESCRIPTION
XX***************
XX*** 32,37 ****
XX--- 32,40 ----
XX --
XX -- LOG
XX -- $Log: db.h,v $
XX+ * Revision 1.2 90/10/30 23:01:09 dvadura
XX+ * Don't include stdio.h here.
XX+ *
XX * Revision 1.1 90/10/06 12:04:41 dvadura
XX * dmake Release, Version 3.6
XX *
XX*** /u2/dvadura/src/generic/dmake/dmake36-pl2/common/alloc.h Sun Oct 28 12:36:12 1990
XX--- common/alloc.h Tue Oct 30 23:00:51 1990
XX***************
XX*** 1,4 ****
XX! /* RCS -- $Header: /u2/dvadura/src/generic/dmake/src/common/RCS/alloc.h,v 1.1 90/10/06 12:04:39 dvadura Exp $
XX -- SYNOPSIS -- macros for allocating memory.
XX --
XX -- DESCRIPTION
XX--- 1,4 ----
XX! /* RCS -- $Header: /u2/dvadura/src/generic/dmake/src/common/RCS/alloc.h,v 1.2 90/10/30 22:59:30 dvadura Exp $
XX -- SYNOPSIS -- macros for allocating memory.
XX --
XX -- DESCRIPTION
XX***************
XX*** 29,34 ****
XX--- 29,37 ----
XX --
XX -- LOG
XX -- $Log: alloc.h,v $
XX+ * Revision 1.2 90/10/30 22:59:30 dvadura
XX+ * Added !defined(atarist) to prevent defining size_t for Atari-ST.
XX+ *
XX * Revision 1.1 90/10/06 12:04:39 dvadura
XX * dmake Release, Version 3.6
XX *
XX*** /u2/dvadura/src/generic/dmake/dmake36-pl2/_install Tue Oct 30 12:25:58 1990
XX--- _install Sun Nov 11 16:40:43 1990
XX***************
XX*** 3,8 ****
XX--- 3,15 ----
XX This file contains the instructions required to install and create the
XX appropriate version of dmake.
XX
XX+ NOTE: If you use dmake to bootstrap a NEW DISTRIBUTED version or to remake
XX+ it after applying a PATCH, it may be NECESSARY to use the batch
XX+ script instead of dmake as some patches incorporate changes to the
XX+ makefile.mk file and associated config.mk files that cannot be
XX+ handled by earlier versions of dmake. The use of the batch files
XX+ is the ONLY supported method of making a new release or update
XX+ version.
XX
XX MAKING THE PROPER VERSION
XX
XX***************
XX*** 20,25 ****
XX--- 27,36 ----
XX dynix - Sequent Symmetry dynix
XX ultrix - Ultrix 3.0 system
XX mips - Any MIPS box
XX+ os2msc40 - OS/2 with MSC 4.0
XX+ os2msc50 - OS/2 with MSC 5.0
XX+ os2msc51 - OS/2 with MSC 5.1
XX+ os2msc60 - OS/2 with MSC 6.0
XX tos - Atari-ST using GCC as compiler
XX tcc - DOS with tcc 2.0
XX tccswp - swapping DOS version with tcc 2.0
XX***************
XX*** 40,53 ****
XX dmake [source for all common functions]
XX |
XX |
XX! --------------------
XX! | | |
XX! unix tos msdos [source for OS specific functions]
XX! | |
XX! ---------------------- -------------
XX! | | | | |
XX! 386ix bsd43 sysvr3 tccdos mscdos [source for OSRELEASE specific
XX! | functions]
XX --------
XX | |
XX uw vf [source for OSENVIRONMENT specific functions]
XX--- 51,64 ----
XX dmake [source for all common functions]
XX |
XX |
XX! ----------------------------
XX! | | | |
XX! unix tos os2 msdos [source for OS specific functions]
XX! | | |
XX! -------------------- mscdos -------------
XX! | | | | |
XX! 386ix bsd43 sysvr3 tccdos mscdos [source for OSRELEASE
XX! | specific functions]
XX --------
XX | |
XX uw vf [source for OSENVIRONMENT specific functions]
XSHAR_EOF
Xchmod 0640 _patches || echo "restore of _patches fails"
Xset `wc -c _patches`;Sum=$1
Xif test "$Sum" != "129059"
Xthen echo original size 129059, current size $Sum;fi
X
X# Now run patch to fix up the files
Xpatch -p0 < _patches
Xexit 0
SHAR_EOF
chmod 0640 dmake-3.6-patch2 || echo "restore of dmake-3.6-patch2 fails"
rm -f s2_seq_.tmp
echo "You have unpacked the last part"
exit 0
--
--------------------------------------------------------------------------------
"This is almost worth the HIGH blood pressure!" he |Dennis Vadura
thought as yet another mosquito exploded.-R.Patching|dvadura@dragon.uwaterloo.ca
================================================================================