diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-05-04 08:25:06 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-04 08:25:06 +0000 |
| commit | 0646d0a978b1f90cba1703150da444766da5eac2 (patch) | |
| tree | 5134e84d4a29ec83aa8012c7402d69a3ce9b12a5 /solenv/inc/startup | |
| parent | fef16bd50ee94657fc82423e3c7d8d739c5280fd (diff) | |
INTEGRATION: CWS vq30 (1.16.78); FILE MERGED
2006/04/26 16:54:04 hjs 1.16.78.3: #i64244# still got fooled; removed debug code
2006/04/26 13:40:26 hjs 1.16.78.2: #i64244# resorted initialization
2006/04/14 14:15:27 vq 1.16.78.1: #i64244# Small 4nt vs. tcsh related clean-up.
Diffstat (limited to 'solenv/inc/startup')
| -rw-r--r-- | solenv/inc/startup/wnt/macros.mk | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/solenv/inc/startup/wnt/macros.mk b/solenv/inc/startup/wnt/macros.mk index ac8593375a0c..1834bfd538c4 100644 --- a/solenv/inc/startup/wnt/macros.mk +++ b/solenv/inc/startup/wnt/macros.mk @@ -2,21 +2,6 @@ # # Execution environment configuration. -# Grab the current setting of COMSPEC. -# -.IMPORT .IGNORE : COMSPEC - -.IF $(SHELL) == $(NULL) - .IF $(COMSPEC) == $(NULL) -# SHELL has to be set in OOo build environment - .ERROR : ; @echo Forced error: Environment variable SHELL has to be set for OOo build! - SHELL_variable_needed - .ELSE - SHELL *:= $(COMSPEC) - .END -.END - -GROUPSHELL *:= $(SHELL) # Standard C-language command names and flags CC *:= cl # C compiler @@ -29,14 +14,19 @@ E *:= .exe # Executables # Now set the remaining arguments depending on which SHELL we # are going to use. -.IF $(SHELL) == $(COMSPEC) +.IF $(USE_SHELL) == 4nt + +.IMPORT : COMSPEC + +SHELL *:= $(COMSPEC) + SHELLFLAGS *:= $(SWITCHAR)c GROUPFLAGS *:= $(SHELLFLAGS) SHELLMETAS *:= "<>| GROUPSUFFIX *:= .bat DIVFILE *= $(TMPFILE:s,/,\,) RM *= del - RMFLAGS *= /y + RMFLAGS *= /y /E MV *= rename __.DIVSEP-sh-yes *:= \\ __.DIVSEP-sh-no *:= \\ @@ -54,9 +44,9 @@ E *:= .exe # Executables # This is hopefully not used. Only in: dmake/msdos/spawn.c # .MKSARGS *:= yes DIVFILE *= $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}}) - RM *= $(ROOTDIR)$/bin$/rm + RM *= $/bin$/rm RMFLAGS *= -f - MV *= $(ROOTDIR)$/bin$/mv + MV *= $/bin$/mv __.DIVSEP-sh-yes *:= \\\ __.DIVSEP-sh-no *:= \\ DIRSEPSTR :=/ @@ -64,15 +54,27 @@ E *:= .exe # Executables .ENDIF -.IF "$(GUI)$(USE_SHELL)"=="WNT4nt" +.IF $(USE_SHELL) == 4nt + my4ver:=$(shell +echo %_4ver) .IF "$(my4ver:s/.//:s/,//)" >= "400" - RMFLAGS +=/E .ELSE # "$(my4ver:s/.//:s/,//)" >= "400" -UNSUPPORTED_4nt_VERSION=TRUE +.ERROR : ; @echo Forced error: 4NT version too old! Version 4.0 or newer is required. +4NT_version_too_old .ENDIF # "$(my4ver:s/.//:s/,//)" >= "400" -.ENDIF # "$(GUI)$(USE_SHELL)"=="WNT4nt" + +.ELSE # $(USE_SHELL) == 4nt + +.IF $(SHELL) == $(NULL) +# SHELL has to be set in (non-4NT) OOobuild environment +.ERROR : ; @echo Forced error: Environment variable SHELL has to be set for OOo build! +SHELL_variable_needed +.END + +.END # $(USE_SHELL) == 4nt + +GROUPSHELL *:= $(SHELL) # Does not respect case of filenames. .DIRCACHERESPCASE := no |