sb118: #i108269# first step of removing tcsh support

12 files changed, 23 insertions, 118 deletions

diff --git a/solenv/inc/startup/AIX/macros.mk b/solenv/inc/startup/AIX/macros.mk
deleted file mode 100644
index 5387b1940198..000000000000
--- a/solenv/inc/startup/AIX/macros.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
diff --git a/solenv/inc/startup/FREEBSD/macros.mk b/solenv/inc/startup/FREEBSD/macros.mk
deleted file mode 100644
index 5387b1940198..000000000000
--- a/solenv/inc/startup/FREEBSD/macros.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
diff --git a/solenv/inc/startup/HPUX/macros.mk b/solenv/inc/startup/HPUX/macros.mk
deleted file mode 100644
index 5387b1940198..000000000000
--- a/solenv/inc/startup/HPUX/macros.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
diff --git a/solenv/inc/startup/LINUX/macros.mk b/solenv/inc/startup/LINUX/macros.mk
deleted file mode 100644
index 5387b1940198..000000000000
--- a/solenv/inc/startup/LINUX/macros.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
diff --git a/solenv/inc/startup/MACOSX/macros.mk b/solenv/inc/startup/MACOSX/macros.mk
deleted file mode 100644
index 5387b1940198..000000000000
--- a/solenv/inc/startup/MACOSX/macros.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
diff --git a/solenv/inc/startup/NETBSD/macros.mk b/solenv/inc/startup/NETBSD/macros.mk
deleted file mode 100644
index 5387b1940198..000000000000
--- a/solenv/inc/startup/NETBSD/macros.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
diff --git a/solenv/inc/startup/OS2/macros.mk b/solenv/inc/startup/OS2/macros.mk
index 08d2be3f9a48..2f1447e6e714 100644
--- a/solenv/inc/startup/OS2/macros.mk
+++ b/solenv/inc/startup/OS2/macros.mk
@@ -4,22 +4,6 @@
 # Process release-specific refinements, if any.
 # YD .INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSRELEASE)$/macros.mk
 
-# Execution environment configuration.
-# Grab the current setting of COMSPEC.
-#
-.IMPORT .IGNORE : COMSPEC
-
-# First check if SHELL is defined to be something other than COMSPEC.
-# If it is assume that SHELL is a Korn compatible shell like MKS's
-.IF $(SHELL) == $(NULL)
-   .IF $(COMSPEC) == $(NULL)
-      SHELL *:= $(ROOTDIR)$/bin$/sh$E
-   .ELSE
-      SHELL *:= $(COMSPEC)
-   .END
-.END
-GROUPSHELL *:= $(SHELL)
-
 # Directory entries are case incensitive
 .DIRCACHERESPCASE *:= no
 
@@ -35,39 +19,12 @@ P *:= .pas	# Pascal
 S *:= .asm	# Assembler sources
 V *:= 		# RCS suffix
 
-# Now set the remaining arguments depending on which SHELL we
-# are going to use.  COMSPEC (assumed to be command.com) or
-# MKS Korn shell.
-.IF $(SHELL) == $(COMSPEC)
-   SHELLFLAGS       *:= $(SWITCHAR)c
-   GROUPFLAGS       *:= $(SHELLFLAGS)
-   SHELLMETAS       *:= <>|*?&
-   GROUPSUFFIX      *:= .bat
-   DIVFILE          *=  $(TMPFILE:s,/,\\,)
-   RM               *=  rm
-   RMFLAGS          *=  -f
-   MV	            *=  rename
-   __.DIVSEP-sh-yes *:= \\
-   __.DIVSEP-sh-no  *:= \\
-   DIRSEPSTR        := \\
-# See iz61212 for the reason why PWD is overwritten
-#   PWD:=$(shell +echo %_cwd:s,/,\\,)
-#   PWD:=$(shell +cd)
-#.EXPORT : PWD
-
-.ELSE
-   SHELLFLAGS       *:= -c
-   GROUPFLAGS       *:=
-   SHELLMETAS       *:= *"?<>|()&][$$\#`'
-   GROUPSUFFIX      *:= .ksh
-   .MKSARGS         *:= yes
-   RM               *=  $(ROOTDIR)$/bin$/rm
-   RMFLAGS          *=  -f
-   MV	            *=  $(ROOTDIR)$/bin$/mv
-   DIVFILE          *=  $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}})
-   __.DIVSEP-sh-yes !:= \\\
-   __.DIVSEP-sh-no  !:= \\
-.ENDIF
+.MKSARGS         *:= yes
+RM               *=  $(ROOTDIR)$/bin$/rm
+MV	            *=  $(ROOTDIR)$/bin$/mv
+DIVFILE          *=  $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}})
+__.DIVSEP-sh-yes !:= \\\
+__.DIVSEP-sh-no  !:= \\
 
 NAMEMAX		=	256
 
diff --git a/solenv/inc/startup/Readme b/solenv/inc/startup/Readme
index d0c38c7c75d5..63a023d10d3e 100644
--- a/solenv/inc/startup/Readme
+++ b/solenv/inc/startup/Readme
@@ -1,9 +1,6 @@
 
 here are some hints about our use of the startup directory.
 
-because our variable "OS" was already in use, we don't use the default 
-subtrees of startup. for example "wntmsci3" uses the subtree "WNT".
-
 the .INCLUDEDIRS line in startup.mk gives you the oportunity of switching
 to your own set of central makefiles.
 
diff --git a/solenv/inc/startup/SOLARIS/macros.mk b/solenv/inc/startup/SOLARIS/macros.mk
deleted file mode 100644
index 5387b1940198..000000000000
--- a/solenv/inc/startup/SOLARIS/macros.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
diff --git a/solenv/inc/startup/UNIX/macros.mk b/solenv/inc/startup/UNIX/macros.mk
deleted file mode 100644
index 7fa2f1b77d35..000000000000
--- a/solenv/inc/startup/UNIX/macros.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file is used for all $(OS)==UNX during startup
-#
-
-SHELL *:= /usr/bin/csh
-GROUPSHELL *:= $(SHELL)
-
-.IF $(USE_SHELL) == bash
-   SHELLFLAGS       *:= -c
-.ELSE
-   SHELLFLAGS       *:= -fc
-.ENDIF # $(USE_SHELL) == bash
-
-   GROUPFLAGS       *:= $(SHELLFLAGS)
-
-# incomplete - better use METAS from startup.mk
-#   SHELLMETAS       *:= "<>|/
-   RM               *=  rm
-   RMFLAGS          *=  -f
-   MV	            *=  mv
diff --git a/solenv/inc/startup/startup.mk b/solenv/inc/startup/startup.mk
index 96b6378db11f..bd9fb0f61ef3 100644
--- a/solenv/inc/startup/startup.mk
+++ b/solenv/inc/startup/startup.mk
@@ -33,7 +33,7 @@ CALLTARGETS=$(MAKETARGETS)
 .INCLUDEDIRS : $(DMAKE_INC) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) $(SOLARENV)$/inc
 
 # Grab key definitions from the environment
-# .IMPORT .IGNORE : OS TMPDIR SHELL UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME CVER GVER COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT VCL SO3 ENVCFLAGS
+# .IMPORT .IGNORE : OS TMPDIR UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME CVER GVER COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT VCL SO3 ENVCFLAGS
 
 .IF "$(OS)" == "" || "$(OS)" == "Windows_NT"
 .ERROR : ; @echo Forced error: Environment variable OS has to be set for OOo build!
@@ -42,7 +42,11 @@ OS_variable_needed
 
 # Customize macro definitions based on seting of OS.
 # This must come before the default macro definitions which follow.
-.INCLUDE .NOINFER : $(INCFILENAME:d)$(OS)$/macros.mk
+.IF "$(OS)" == "OS2"
+.INCLUDE: $(INCFILENAME:d)OS2/macros.mk
+.ELIF "$(OS)" == "WNT"
+.INCLUDE: $(INCFILENAME:d)wnt/macros.mk
+.END
 
 # ----------------- Default Control Macro definitions -----------------------
 # Select appropriate defaults for basic macros
@@ -53,15 +57,18 @@ OS_variable_needed
 MAXLINELENGTH	= 65530
 
 # Recipe execution configuration
-   SHELL	 *:= $/bin$/sh
-   SHELLFLAGS	 *:= -fc
-   GROUPSHELL	 *:= $(SHELL)
-   GROUPFLAGS	 *:=
-   SHELLMETAS	 *:= |();&<>?*][$$:\\#`'"
-   GROUPSUFFIX	 *:=
+   SHELL := $(OOO_SHELL)
+   SHELLFLAGS := -c
+   SHELLMETAS := !"\#$$%&'()*;<=>?[\]`{{|}}~
+    # the colon (":") utility is typically only available as a shell built-in,
+    # so it should be included in SHELLMETAS; however, this would result in very
+    # many false positives on Windows where ":" is used in drive letter notation
+   GROUPSHELL := $(SHELL)
+   GROUPFLAGS :=
+   GROUPSUFFIX :=
 
 # Intermediate target removal configuration
-   RM            *:= $/bin$/rm
+   RM            *:= rm
    RMFLAGS       *=  -f
    RMTARGET      *=  $<
 
@@ -80,7 +87,7 @@ NULLPRQ *:= __.NULLPRQ
 E *:= # Executables
 
 # Other Compilers, Tools and their flags
-MV *:= $/bin$/mv     # File rename command
+MV *:= mv     # File rename command
 
 
 # Finally, define the default construction strategy
diff --git a/solenv/inc/startup/wnt/macros.mk b/solenv/inc/startup/wnt/macros.mk
index 35f903f60922..2d8181439e81 100644
--- a/solenv/inc/startup/wnt/macros.mk
+++ b/solenv/inc/startup/wnt/macros.mk
@@ -15,25 +15,10 @@ GUWCMD*=guw.exe
 # Applicable suffix definitions
 E *:= .exe	# Executables
 
-# Now set the remaining arguments depending on which SHELL we
-# are going to use.
-
-.IF $(USE_SHELL) == bash
-   SHELLFLAGS       *:= -c
-.ELSE
-   # See iz50689 why -f is needed.
-   SHELLFLAGS       *:= -fc
-.ENDIF # $(USE_SHELL) == bash
-
-   GROUPFLAGS       *:=
-   SHELLMETAS       *:= *";?<>|()&][$$\#`'
-# Fix syntax highlighting: "
-   GROUPSUFFIX      *:= .csh
 # This is hopefully not used. Only in: dmake/msdos/spawn.c  
 #  .MKSARGS         *:= yes
    DIVFILE          *=  $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}})
    RM               *=  $/bin$/rm
-   RMFLAGS          *=  -f
    MV	            *=  $/bin$/mv
    __.DIVSEP-sh-yes *:= \\\
    __.DIVSEP-sh-no  *:= \\
@@ -41,14 +26,6 @@ E *:= .exe	# Executables
 
 .EXPORT : GUWCMD
 
-.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
-
-GROUPSHELL *:= $(SHELL)
-
 # Does not respect case of filenames.
 .DIRCACHERESPCASE := no
 NAMEMAX	=	256