home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
OS/2 Shareware BBS: 10 Tools
/
10-Tools.zip
/
DMAKE35X.ZIP
/
DMAKE.DIF
< prev
next >
Wrap
Text File
|
1990-08-15
|
9KB
|
331 lines
diff -cbBwr orig/dmake.c os2/dmake.c
*** orig/dmake.c Tue Jul 31 14:46:14 1990
--- os2/dmake.c Tue Jul 31 15:16:16 1990
***************
*** 88,94 ****
#ifdef HELP
#define USAGE \
! "Usage: %s [-AeEhiknpqrsStTuvVx] [-P#] [-f file] [macro=value ...] [target ...]\n"
#define COPYRIGHT "Copyright (c) 1990 by Dennis Vadura"
#endif
--- 88,94 ----
#ifdef HELP
#define USAGE \
! "\nUsage: %s [-AeEhiknpqrsStTuvVx] [-P#] [-f file]\n\t [macro=value ...] [target ...]\n\n"
#define COPYRIGHT "Copyright (c) 1990 by Dennis Vadura"
#endif
***************
*** 601,607 ****
puts(" -P# - set max number of child processes for parallel make");
puts(" -f file - use file as the makefile\n");
! puts("OPTIONS: (can be catenated, ie -irn == -i -r -n)");
puts(" -A - enable AUGMAKE special target mapping");
puts(" -e - define environment strings as macros");
puts(" -E - same as -e but done after parsing makefile");
--- 601,607 ----
puts(" -P# - set max number of child processes for parallel make");
puts(" -f file - use file as the makefile\n");
! puts("Options: (can be catenated, ie -irn == -i -r -n)");
puts(" -A - enable AUGMAKE special target mapping");
puts(" -e - define environment strings as macros");
puts(" -E - same as -e but done after parsing makefile");
***************
*** 633,639 ****
extern char **Rule_tab;
char **p;
! printf("%s - %s, ", Pname, COPYRIGHT);
printf("Version %s, Patch Level %d\n\n", VERSION, PATCHLEVEL);
puts("Default Configuration:");
--- 633,639 ----
extern char **Rule_tab;
char **p;
! printf("\n%s - %s, ", Pname, COPYRIGHT);
printf("Version %s, Patch Level %d\n\n", VERSION, PATCHLEVEL);
puts("Default Configuration:");
diff -cbBwr orig/make.c os2/make.c
*** orig/make.c Tue Jul 31 14:46:16 1990
--- os2/make.c Mon Jul 30 21:55:54 1990
***************
*** 648,654 ****
DB_ENTER( "_print_cmnd" );
! if( echo ) printf( "%s\n", cmnd );
for( p=cmnd; (n = strchr(p, CONTINUATION_CHAR)) != NIL(char); p=n+1 )
if(n[1] == '\n') {
--- 648,657 ----
DB_ENTER( "_print_cmnd" );
! if( echo ) {
! printf( "%s\n", cmnd );
! fflush( stdout );
! }
for( p=cmnd; (n = strchr(p, CONTINUATION_CHAR)) != NIL(char); p=n+1 )
if(n[1] == '\n') {
diff -cbBwr orig/msdos/_chdir.c os2/msdos/_chdir.c
*** orig/msdos/_chdir.c Tue Jul 31 14:46:18 1990
--- os2/msdos/_chdir.c Mon Jul 30 22:02:30 1990
***************
*** 36,41 ****
--- 36,46 ----
#include "sysintf.h"
#include "vextern.h"
+ #ifdef OS2
+ #define INCL_NOPM
+ #include <os2.h>
+ #endif
+
#undef chdir /* sysintf.h defines it to _chdir for DOS */
int
***************
*** 46,51 ****
--- 51,59 ----
res = chdir(path);
if (res != -1 && path[1] == ':' && *path != *Pwd) {
+ #ifdef OS2
+ DosSelectDisk((*path & ~0x20) - '@');
+ #else
union REGS reg;
/* we must change the logged drive, since the chdir worked. */
***************
*** 52,57 ****
--- 60,66 ----
reg.h.ah = 0x0E;
reg.h.dl = (*path & ~0x20) - 'A';
intdos(®, ®);
+ #endif
}
return (res);
}
diff -cbBwr orig/msdos/mscdos/config.h os2/msdos/mscdos/config.h
*** orig/msdos/mscdos/config.h Tue Jul 31 14:46:18 1990
--- os2/msdos/mscdos/config.h Tue Jul 31 10:05:54 1990
***************
*** 37,41 ****
--- 37,43 ----
* macros. */
#define coreleft() 0L
+ #ifndef OS2
/*No parallelism in DOS so don't need to explode the graph. */
#define Explode_prq(a,b,c)
+ #endif
diff -cbBwr orig/msdos/mscdos/tempnam.c os2/msdos/mscdos/tempnam.c
*** orig/msdos/mscdos/tempnam.c Tue Jul 31 14:46:18 1990
--- os2/msdos/mscdos/tempnam.c Tue Jul 31 09:47:58 1990
***************
*** 4,10 ****
--- 4,12 ----
#include <stdlib.h>
#include <time.h>
+ #ifndef max
#define max(A,B) (((A)<(B))?(B):(A))
+ #endif
extern char *mktemp();
extern int access();
***************
*** 30,36 ****
pl = strlen(P_tmpdir);
! if( (tmpdir = getenv("TMPDIR")) != NULL ) tl = strlen(tmpdir);
if( dir != NULL ) dl = strlen(dir);
if( (p = malloc((unsigned)(max(max(dl,tl),pl)+12))) == NULL )
--- 32,38 ----
pl = strlen(P_tmpdir);
! if( (tmpdir = getenv("TMP")) != NULL ) tl = strlen(tmpdir);
if( dir != NULL ) dl = strlen(dir);
if( (p = malloc((unsigned)(max(max(dl,tl),pl)+12))) == NULL )
***************
*** 60,66 ****
if( (q = strrchr(p,'.')) != NULL ) *q = '\0';
! return(p);
}
--- 62,68 ----
if( (q = strrchr(p,'.')) != NULL ) *q = '\0';
! return strlwr(p);
}
***************
*** 73,81 ****
int r;
if( name == NULL || !*name ) return(1); /* NULL dir means current dir */
- r = access( name, flag );
p = name+strlen(name)-1;
! if(*p != '/' && *p != '\\') strcat( p, "/" );
return( r );
}
--- 75,84 ----
int r;
if( name == NULL || !*name ) return(1); /* NULL dir means current dir */
p = name+strlen(name)-1;
! if(*p == ':' ) strcat( p++, "\\" );
! r = access( name, flag );
! if(*p != '/' && *p != '\\') strcat( p, "\\" );
return( r );
}
diff -cbBwr orig/msdos/ruletab.c os2/msdos/ruletab.c
*** orig/msdos/ruletab.c Tue Jul 31 14:46:18 1990
--- os2/msdos/ruletab.c Tue Jul 31 14:53:54 1990
***************
*** 40,48 ****
static char *_rules[] = {
"MAXLINELENGTH := 2046",
"MAXPROCESSLIMIT := 1",
"MAXPROCESS := 1",
! ".IMPORT .IGNORE: ROOTDIR",
".MAKEFILES : makefile.mk makefile",
".SOURCE : .NULL",
#include "startup.h"
--- 40,52 ----
static char *_rules[] = {
"MAXLINELENGTH := 2046",
+ #ifdef OS2
+ "MAXPROCESSLIMIT := 16",
+ #else
"MAXPROCESSLIMIT := 1",
"MAXPROCESS := 1",
! #endif
! ".IMPORT .IGNORE: ROOTDIR INIT",
".MAKEFILES : makefile.mk makefile",
".SOURCE : .NULL",
#include "startup.h"
diff -cbBwr orig/msdos/startup.h os2/msdos/startup.h
*** orig/msdos/startup.h Tue Jul 31 14:46:16 1990
--- os2/msdos/startup.h Mon Jul 30 22:42:36 1990
***************
*** 4,7 ****
* the path. This allows the user to customize his environment for dmake
* by setting up a new ROOTDIR environment variable. */
! "MAKESTARTUP := $(ROOTDIR)/etc/startup.mk",
--- 4,7 ----
* the path. This allows the user to customize his environment for dmake
* by setting up a new ROOTDIR environment variable. */
! "MAKESTARTUP := $(INIT)/dmake.ini",
diff -cbBwr orig/msdos/switchar.c os2/msdos/switchar.c
*** orig/msdos/switchar.c Tue Jul 31 14:46:16 1990
--- os2/msdos/switchar.c Mon Jul 30 21:58:24 1990
***************
*** 5,11 ****
getswitchar()
{
! #if defined(M_I86)
union REGS rg;
rg.h.ah = 0x37; /* switch char request */
--- 5,11 ----
getswitchar()
{
! #if defined(__M_I86)
union REGS rg;
rg.h.ah = 0x37; /* switch char request */
diff -cbBwr orig/msdos/sysintf.h os2/msdos/sysintf.h
*** orig/msdos/sysintf.h Tue Jul 31 14:46:16 1990
--- os2/msdos/sysintf.h Tue Jul 31 14:52:04 1990
***************
*** 10,18 ****
extern char * tempnam();
extern char * getcwd();
- /*No parallelism in DOS so don't need to explode the graph. */
- #define Explode_prq(a,b,c)
-
/*
** standard C items
*/
--- 10,15 ----
***************
*** 26,30 ****
** make parameters
*/
#define MAXARGV 64
! #define MAX_PATH_LEN 64
!
--- 23,26 ----
** make parameters
*/
#define MAXARGV 64
! #define MAX_PATH_LEN 256
diff -cbBwr orig/sysintf.c os2/sysintf.c
*** orig/sysintf.c Tue Jul 31 14:46:20 1990
--- os2/sysintf.c Wed Aug 01 18:54:48 1990
***************
*** 275,281 ****
--- 275,283 ----
ReadEnvironment()
{
extern char **Rule_tab;
+ #ifndef MSDOS
extern char **environ;
+ #endif
char **rsave;
rsave = Rule_tab;
***************
*** 299,306 ****
--- 301,310 ----
{
if( signal(SIGINT, SIG_IGN) != SIG_IGN )
signal( SIGINT, fn );
+ #ifdef SIGQUIT
if( signal(SIGQUIT, SIG_IGN) != SIG_IGN )
signal( SIGQUIT, fn );
+ #endif
}
***************
*** 313,320 ****
--- 317,326 ----
{
if( signal(SIGINT, SIG_IGN) != SIG_IGN )
signal( SIGINT, SIG_DFL );
+ #ifdef SIGQUIT
if( signal(SIGQUIT, SIG_IGN) != SIG_IGN )
signal( SIGQUIT, SIG_DFL );
+ #endif
}