diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-06-12 05:05:42 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-06-12 05:05:42 +0000 |
| commit | fabd0ae620b6e3821a28e06978cc2a932f3e2756 (patch) | |
| tree | 94c18c665c54d441ed9d9cde125bdc05d237728b | |
| parent | 7734b689c8deb8e808b1ac3642aebd86ea6b9f62 (diff) | |
INTEGRATION: CWS dmake48 (1.8.2); FILE MERGED
2007/03/17 19:00:37 vq 1.8.2.2: #i73499# Add new .WINPATH attribute to generate Windows style paths
(with regular slashes) instead of the default cygwin style (POSIX)
paths for dmake's dynamic macros.
This attribute is specific for cygwin dmake executables and non-cygwin
environments ignore this attribute.
The windows style paths use regular slashes ('/') instead of the
usual windows backslash ('\') as directory separator to avoid quoting
problems (It still is a cygwin dmake!) and cygwin as well as native
windows programs should have no problems using this (c:/foo/bar) path
representation.
The affected macros are $@, $*, $>, $?, $<, $&, $^ and $(PWD),
$(MAKEDIR) and $(TMD).
Examples:
Content of $(PWD) without .WINPATH (default): /cygdrive/c/temp
Content of $(PWD) with .WINPATH set: c:/temp
2007/01/23 02:25:52 vq 1.8.2.1: #i10000# Small cosmetic changes.
| -rw-r--r-- | dmake/getinp.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/dmake/getinp.c b/dmake/getinp.c index 87ae29bd5652..280021935d2e 100644 --- a/dmake/getinp.c +++ b/dmake/getinp.c @@ -1,4 +1,4 @@ -/* RCS $Id: getinp.c,v 1.8 2007-01-18 09:30:18 vg Exp $ +/* RCS $Id: getinp.c,v 1.9 2007-06-12 06:05:42 obo Exp $ -- -- SYNOPSIS -- Handle reading of input. @@ -305,10 +305,16 @@ int keep; cmnd = Expand(c+2); cmnd[strlen(cmnd)-1] = '\0'; /* strip last newline */ Current_target = Root; +#if defined(MSDOS) Swap_on_exec = TRUE; +#endif Wait_for_completion = TRUE; Do_cmnd(cmnd, FALSE, TRUE, Current_target, A_DEFAULT, TRUE); +#if defined(MSDOS) + Swap_on_exec = FALSE; +#endif Wait_for_completion = FALSE; + FREE(cmnd); } *c = '\0'; /* a true comment so break */ |