diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:03:05 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:03:05 +0000 |
| commit | 4a4787573e8a715f43cedb48abd8af995768a553 (patch) | |
| tree | 229e8636a36bbda2f4b4453ed16957dc249be664 /dmake/vextern.h | |
| parent | 1cc6fe421efc03f5362ee4a85387e5fb9741bda8 (diff) | |
INTEGRATION: CWS dmake43p01 (1.1.1.1.132); FILE MERGED
2006/02/01 23:28:55 vq 1.1.1.1.132.7: #i60948# Add -m option family to generate timing information for targets
and/or recipes. (Autotools files were regenerated.)
2005/10/11 17:39:39 vq 1.1.1.1.132.6: #i54938# Fix problem when building infered .INCLUDE makefiles and doing
parallel builds.
2005/09/05 20:56:45 vq 1.1.1.1.132.5: #i53148# Move redirection of stdout from parent to child and avoid
capturing spurious output from other process queues.
2005/09/05 17:23:45 vq 1.1.1.1.132.4: #i53148# Additional patch to make sure that the shell escapes is executed
after all previous recipe lines from the same target have finished.
2005/09/04 19:38:15 vq 1.1.1.1.132.3: #i53148# Fix $(shell ...) handling for parallel builds with MAXPROCESS > 1.
This certainly includes the -P# switch with # > 1.
2005/04/11 03:28:54 vq 1.1.1.1.132.2: #i43252# Introduce the macro ABSMAKECMD that's value for a native Windows
dmake executable (compiled with MS Visual C++ or MinGW) is the absolute
filename and NULL for other operating systems or dmake build with other
compilers.
If DMAKEROOT is not changed and only for native Windows dmake versions the
value of DMAKEROOT now defaults to "$(ABSMAKECMD:d)startup".
2004/11/20 01:05:55 vq 1.1.1.1.132.1: #i37491# Add a predefined SPACECHAR macro.
Diffstat (limited to 'dmake/vextern.h')
| -rw-r--r-- | dmake/vextern.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/dmake/vextern.h b/dmake/vextern.h index 84ded883d4c7..853ff1b87114 100644 --- a/dmake/vextern.h +++ b/dmake/vextern.h @@ -1,4 +1,4 @@ -/* RCS $Id: vextern.h,v 1.1.1.1 2000-09-22 15:33:26 hr Exp $ +/* RCS $Id: vextern.h,v 1.2 2006-04-20 12:03:05 hr Exp $ -- -- SYNOPSIS -- Global variable declarations. @@ -47,9 +47,11 @@ EXTERN char* GShell_flags; /* pointer to macro value for GROUPFLAGS */ EXTERN char* Shell_metas; /* pointer to macro value for SHELLMETAS */ EXTERN char* Grp_suff; /* pointer to macro value for GROUPSUFFIX */ EXTERN char* DirSepStr; /* pointer to macro value for DIRSEPSTR */ +EXTERN char* AbsPname; /* pointer to macro value for ABSMAKECMD */ EXTERN char* Pname; /* dmake process invoke name */ EXTERN char* Pwd; /* current working dir, value of PWD */ EXTERN char* Tmd; /* path to directory where dmake started */ +EXTERN char* Spacechar; /* pointer to macro value for SPACECHAR */ EXTERN char* Keep_state; /* current .KEEP_STATE file */ EXTERN char* Escape_char; /* Current escape character */ EXTERN char* LastMacName; /* Last macro successfully parsed */ @@ -72,8 +74,12 @@ EXTERN CELLPTR Root; /* Root of the make graph */ EXTERN CELLPTR Targets; /* Targets in makefile */ EXTERN CELLPTR Current_target; /* cell of current target being made */ -EXTERN int Wait_for_completion; -EXTERN int Doing_bang; +EXTERN int Wait_for_completion; /* Wait for subprocess to finish */ +EXTERN int Is_exec_shell; /* Indicate shell escape */ +EXTERN CELLPTR Shell_exec_target; /* Keep Current_target for _exec__shell */ +EXTERN FILE* stdout_redir; /* For _exec_shell client redirects */ +EXTERN int Doing_bang; /* TRUE if target timestamp needs not to be + * updated immediately. */ EXTERN int Packed_shell; /* TRUE if packed args to use a shell */ EXTERN int Swap_on_exec; /* TRUE if going to swap on exec call */ EXTERN int State; /* parser state */ @@ -94,6 +100,7 @@ EXTERN int Trace; /* -n */ EXTERN int Touch; /* -t */ EXTERN int Check; /* -q */ EXTERN uint16 Verbose; /* -v */ +EXTERN uint16 Measure; /* -m */ EXTERN int Microsoft; /* -M */ EXTERN int Transitive; /* -T */ EXTERN int No_exec; /* -X */ |