diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-09-07 13:35:07 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-09-07 13:35:07 +0000 |
| commit | ae0228cdb340de85f42c25024986ce0e557503a3 (patch) | |
| tree | 55439cdf267c7cd8eef9a0ce6fa0c1775b3a133f /solenv/inc/startup | |
| parent | 9d7d35bce00ec0b2676d0428872300cc257e3288 (diff) | |
CWS-TOOLING: integrate CWS kick4nt
Diffstat (limited to 'solenv/inc/startup')
| -rw-r--r-- | solenv/inc/startup/wnt/macros.mk | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/solenv/inc/startup/wnt/macros.mk b/solenv/inc/startup/wnt/macros.mk index 58b00978e910..35f903f60922 100644 --- a/solenv/inc/startup/wnt/macros.mk +++ b/solenv/inc/startup/wnt/macros.mk @@ -17,26 +17,6 @@ E *:= .exe # Executables # Now set the remaining arguments depending on which SHELL we # are going to use. -.IF $(USE_SHELL) == 4nt - -.IMPORT : COMSPEC - -SHELL *:= $(COMSPEC) - - SHELLFLAGS *:= $(SWITCHAR)c - GROUPFLAGS *:= $(SHELLFLAGS) - SHELLMETAS *:= "<>|&%^ -# Fix syntax highlighting: " - GROUPSUFFIX *:= .bat - DIVFILE *= $(TMPFILE:s,/,\,) - RM *= +del - RMFLAGS *= /y /E - MV *= +rename - __.DIVSEP-sh-yes *:= \\ - __.DIVSEP-sh-no *:= \\ - DIRSEPSTR := \\ - -.ELSE # Non 4nt case .IF $(USE_SHELL) == bash SHELLFLAGS *:= -c @@ -59,30 +39,14 @@ SHELL *:= $(COMSPEC) __.DIVSEP-sh-no *:= \\ DIRSEPSTR :=/ -.ENDIF - .EXPORT : GUWCMD -.IF $(USE_SHELL) == 4nt - -my4ver:=$(shell @echo %_4ver) - -.IF "$(my4ver:s/.//:s/,//)" >= "400" -.ELSE # "$(my4ver:s/.//:s/,//)" >= "400" -.ERROR : ; @echo Forced error: 4NT version too old! Version 4.0 or newer is required. -4NT_version_too_old -.ENDIF # "$(my4ver:s/.//:s/,//)" >= "400" - -.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. |