sb118: #i108269# first step of removing tcsh support

4 files changed, 14 insertions, 37 deletions

diff --git a/cli_ure/source/basetypes/makefile.mk b/cli_ure/source/basetypes/makefile.mk
index 3e2e199b52fa..7ee254cb4e80 100644
--- a/cli_ure/source/basetypes/makefile.mk
+++ b/cli_ure/source/basetypes/makefile.mk
@@ -41,13 +41,6 @@ TARGET = basetypes
 .INCLUDE : $(PRJ)$/util$/target.pmk
 .INCLUDE : target.mk
 
-
-.IF "$(USE_SHELL)"!="4nt"
-ECHOQUOTE='
-.ELSE
-ECHOQUOTE=
-.ENDIF
-
 .IF "$(BUILD_FOR_CLI)" != ""
 
 .INCLUDE : $(BIN)$/cliureversion.mk
@@ -77,15 +70,15 @@ CSFILES = \
 .IF "$(CCNUMVER)" <= "001399999999"
 $(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk 
     $(GNUCOPY) -p assembly.cs $@
-    echo $(ECHOQUOTE) \
-    [assembly:System.Reflection.AssemblyVersion( "$(CLI_BASETYPES_NEW_VERSION)")] \
-    [assembly:System.Reflection.AssemblyKeyFile(@"$(BIN)$/cliuno.snk")]$(ECHOQUOTE) \
+    echo \
+    '[assembly:System.Reflection.AssemblyVersion( "$(CLI_BASETYPES_NEW_VERSION)")] \
+    [assembly:System.Reflection.AssemblyKeyFile(@"$(BIN)$/cliuno.snk")]' \
     >> $@
 .ELSE
 $(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk 
     $(GNUCOPY) -p assembly.cs $@
-    echo $(ECHOQUOTE) \
-    [assembly:System.Reflection.AssemblyVersion( "$(CLI_BASETYPES_NEW_VERSION)")]$(ECHOQUOTE) \
+    echo \
+    '[assembly:System.Reflection.AssemblyVersion( "$(CLI_BASETYPES_NEW_VERSION)")]' \
     >> $@
 .ENDIF
 
diff --git a/cli_ure/source/climaker/makefile.mk b/cli_ure/source/climaker/makefile.mk
index dd67d2600c84..3983875c8786 100644
--- a/cli_ure/source/climaker/makefile.mk
+++ b/cli_ure/source/climaker/makefile.mk
@@ -126,9 +126,7 @@ ALLTAR: \
 #Create the config file that is used with the policy assembly
 $(CLIMAKER_CONFIG): climaker.exe.config
     $(COPY) $< $@
-.IF "$(USE_SHELL)"!="4nt"
     chmod +x $@
-.ENDIF          # "$(USE_SHELL)"!="4nt"
 
 
 .IF "$(BUILD_FOR_CLI)" != ""
diff --git a/cli_ure/source/native/makefile.mk b/cli_ure/source/native/makefile.mk
index 16eeedb25c31..2de874e645cf 100644
--- a/cli_ure/source/native/makefile.mk
+++ b/cli_ure/source/native/makefile.mk
@@ -48,13 +48,6 @@ CCACHE_DISABLE=TRUE
 
 use_shl_versions=
 
-.IF "$(USE_SHELL)"!="4nt"
-ECHOQUOTE='
-.ELSE
-ECHOQUOTE=
-.ENDIF
-
-
 .IF "$(BUILD_FOR_CLI)" == ""
 #do not even build the cxx files because they contain cli cpp
 all:
@@ -146,11 +139,11 @@ CFLAGSCXX += -clr:oldSyntax
 $(ASSEMBLY_ATTRIBUTES) : assembly.cxx $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk
     @echo $(ASSEMBLY_KEY_X)
     $(GNUCOPY) -p assembly.cxx $@
-    echo $(ECHOQUOTE) \
-    [assembly:System::Reflection::AssemblyVersion( "$(CLI_CPPUHELPER_NEW_VERSION)" )]; $(ECHOQUOTE) \
+    echo \
+    '[assembly:System::Reflection::AssemblyVersion( "$(CLI_CPPUHELPER_NEW_VERSION)" )];' \
     >> $(OUT)$/misc$/assembly_cppuhelper.cxx
-    echo $(ECHOQUOTE) \
-    [assembly:System::Reflection::AssemblyKeyFile($(ASSEMBLY_KEY_X))]; $(ECHOQUOTE) \
+    echo \
+    '[assembly:System::Reflection::AssemblyKeyFile($(ASSEMBLY_KEY_X))];' \
     >> $(OUT)$/misc$/assembly_cppuhelper.cxx
     
     
diff --git a/cli_ure/source/ure/makefile.mk b/cli_ure/source/ure/makefile.mk
index 1bdbadadcaf2..2109e3c61fce 100644
--- a/cli_ure/source/ure/makefile.mk
+++ b/cli_ure/source/ure/makefile.mk
@@ -41,13 +41,6 @@ TARGET = ure
 .INCLUDE : $(PRJ)$/util$/target.pmk
 .INCLUDE : target.mk
 
-
-.IF "$(USE_SHELL)"!="4nt"
-ECHOQUOTE='
-.ELSE
-ECHOQUOTE=
-.ENDIF
-
 .IF "$(BUILD_FOR_CLI)" != ""
 
 .INCLUDE : $(BIN)$/cliureversion.mk
@@ -73,15 +66,15 @@ CSFILES = \
 .IF "$(CCNUMVER)" <= "001399999999"
 $(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk 
     $(GNUCOPY) -p assembly.cs $@
-    echo $(ECHOQUOTE) \
-    [assembly:System.Reflection.AssemblyVersion( "$(CLI_URE_NEW_VERSION)")] \
-    [assembly:System.Reflection.AssemblyKeyFile(@"$(BIN)$/cliuno.snk")]$(ECHOQUOTE) \
+    echo \
+    '[assembly:System.Reflection.AssemblyVersion( "$(CLI_URE_NEW_VERSION)")] \
+    [assembly:System.Reflection.AssemblyKeyFile(@"$(BIN)$/cliuno.snk")]' \
     >> $@
 .ELSE
 $(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk 
     $(GNUCOPY) -p assembly.cs $@
-    echo $(ECHOQUOTE) \
-    [assembly:System.Reflection.AssemblyVersion( "$(CLI_URE_NEW_VERSION)")]$(ECHOQUOTE) \
+    echo \
+    '[assembly:System.Reflection.AssemblyVersion( "$(CLI_URE_NEW_VERSION)")]' \
     >> $@
 .ENDIF