sb118: #i108269# first step of removing tcsh support

bridges/test/java_uno/acquire/makefile.mk

@@ -56,10 +56,10 @@ JARFILES = OOoRunner.jar juh.jar jurt.jar ridl.jar
 .INCLUDE: target.mk
 
 ALLTAR: \
-    $(BIN)$/testacquire-java-client$(SCRIPTEXT) \
-    $(BIN)$/testacquire-java-server$(SCRIPTEXT) \
-    $(BIN)$/testacquire-native-client$(SCRIPTEXT) \
-    $(BIN)$/testacquire-native-server$(SCRIPTEXT)
+    $(BIN)$/testacquire-java-client \
+    $(BIN)$/testacquire-java-server \
+    $(BIN)$/testacquire-native-client \
+    $(BIN)$/testacquire-native-server
 
 .IF "$(GUI)" == "WNT"
 GIVE_EXEC_RIGHTS = @echo
@@ -90,7 +90,7 @@ $(SLOFILES) $(JAVACLASSFILES): $(BIN)$/$(TARGET).rdb
 TEST_JAVAUNO_ACQUIRE_UNO_URL := \
     \"'uno:socket,host=127.0.0.1,port=2002;urp;test'\"
 
-$(BIN)$/testacquire-java-client$(SCRIPTEXT):
+$(BIN)$/testacquire-java-client:
     echo java -classpath \
         ..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)\
 ..$/class$/java_uno.jar$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
@@ -98,7 +98,7 @@ $(BIN)$/testacquire-java-client$(SCRIPTEXT):
         $(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@
     $(GIVE_EXEC_RIGHTS) $@
 
-$(BIN)$/testacquire-java-server$(SCRIPTEXT):
+$(BIN)$/testacquire-java-server:
     echo java -classpath \
         ..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)\
 ..$/class$/java_uno.jar$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
@@ -106,14 +106,14 @@ $(BIN)$/testacquire-java-server$(SCRIPTEXT):
         $(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@
     $(GIVE_EXEC_RIGHTS) $@
 
-$(BIN)$/testacquire-native-client$(SCRIPTEXT):
+$(BIN)$/testacquire-native-client:
     echo '$(AUGMENT_LIBRARY_PATH)' uno \
         -c com.sun.star.test.bridges.testacquire.impl \
         -l ../lib/$(SHL1TARGETN:f) -ro $(TARGET).rdb -- \
         $(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@
     $(GIVE_EXEC_RIGHTS) $@
 
-$(BIN)$/testacquire-native-server$(SCRIPTEXT):
+$(BIN)$/testacquire-native-server:
     echo '$(AUGMENT_LIBRARY_PATH)' uno \
         -c com.sun.star.test.bridges.testacquire.impl \
         -l ../lib/$(SHL1TARGETN:f) -ro $(TARGET).rdb \

bridges/test/java_uno/any/makefile.mk

@@ -104,16 +104,16 @@ $(SLOFILES) : $(MISC)$/gen_files.flag
 $(JAVACLASSFILES) : $(MISC)$/gen_files.flag
 
 ALLTAR : \
-    $(OUT)$/bin$/TestRemote$(SCRIPTEXT) \
-    $(OUT)$/bin$/TestJni$(SCRIPTEXT)
+    $(OUT)$/bin$/TestRemote \
+    $(OUT)$/bin$/TestJni
 
-$(OUT)$/bin$/TestRemote$(SCRIPTEXT) : $(JAVACLASSFILES)
+$(OUT)$/bin$/TestRemote : $(JAVACLASSFILES)
     -rm -f $@
     echo java -classpath ..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
         test.java_uno.anytest.TestRemote > $@
     $(GIVE_EXEC_RIGHTS) $@
 
-$(OUT)$/bin$/TestJni$(SCRIPTEXT) : $(JAVACLASSFILES)
+$(OUT)$/bin$/TestJni : $(JAVACLASSFILES)
     -rm -f $@
     echo '$(AUGMENT_LIBRARY_PATH)' java -classpath \
         .$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \

bridges/test/java_uno/equals/makefile.mk

@@ -62,7 +62,7 @@ JARFILES = juh.jar jurt.jar ridl.jar
 
 .INCLUDE: target.mk
 
-ALLTAR: $(BIN)$/testequals$(SCRIPTEXT)
+ALLTAR: $(BIN)$/testequals
 
 .IF "$(GUI)" == "WNT"
 GIVE_EXEC_RIGHTS = @echo
@@ -85,7 +85,7 @@ $(MISC)$/$(TARGET).rdb: types.idl
 
 $(SLOFILES) $(JAVACLASSFILES): $(MISC)$/$(TARGET).rdb
 
-$(BIN)$/testequals$(SCRIPTEXT): $(BIN)$/testequals_services.rdb
+$(BIN)$/testequals: $(BIN)$/testequals_services.rdb
     echo '$(AUGMENT_LIBRARY_PATH)' java -classpath \
         ..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)\
 ..$/class$/java_uno.jar$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \

bridges/test/java_uno/nativethreadpool/makefile.mk

@@ -101,7 +101,7 @@ $(BIN)$/$(TARGET).rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.rdb \
     $(REGCOMP) -register -r $(MISC)$/$(TARGET)$/bootstrap.rdb \
         -c javaloader.uno$(DLLPOST) -c javavm.uno$(DLLPOST) \
         -c stocservices.uno$(DLLPOST)
-.IF "$(GUI)" == "WNT" || "$(USE_SHELL)" != "bash"
+.IF "$(GUI)" == "WNT"
     ERROR -- missing platform
 .ELSE # GUI, WNT
     + export OO_JAVA_PROPERTIES='RuntimeLib=$(JVM_LIB_URL)' && \
@@ -111,7 +111,7 @@ $(BIN)$/$(TARGET).rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.rdb \
 .ENDIF # GUI, WNT
 
 test .PHONY: $(SHL1TARGETN) $(BIN)$/$(TARGET).uno.jar $(BIN)$/$(TARGET).rdb
-.IF "$(GUI)" == "WNT" || "$(USE_SHELL)" != "bash"
+.IF "$(GUI)" == "WNT"
     ERROR -- missing platform
 .ELSE # GUI, WNT
     $(AUGMENT_LIBRARY_PATH) uno -c test.javauno.nativethreadpool.server \

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
 

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)" != ""

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
     
     

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
 

cli_ure/version/makefile.mk

@@ -41,15 +41,6 @@ TARGET = cliureversion.mk
 .INCLUDE : $(PRJ)$/util$/target.pmk
 .INCLUDE : target.mk
 
-
-.IF "$(USE_SHELL)"!="4nt"
-ECHOQUOTE='
-.ELSE
-ECHOQUOTE=
-.ENDIF
-
-
-
 ALLTAR : \
     $(BIN)$/cliureversion.mk 
 

idlc/source/makefile.mk

@@ -124,11 +124,7 @@ YACCFLAGS+=-v
 .INCLUDE :  target.mk
 
 $(MISC)$/stripped_scanner.ll : scanner.ll
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)" != "4nt"
     tr -d "\015" < scanner.ll > $(MISC)$/stripped_scanner.ll
-.ELSE
-    cat scanner.ll > $(MISC)$/stripped_scanner.ll
-.ENDIF
 
 $(MISC)$/scanner.cxx:	$(MISC)$/stripped_scanner.ll
     flex -o$(MISC)$/scanner.cxx $(MISC)$/stripped_scanner.ll

sal/util/makefile.mk

@@ -228,8 +228,6 @@ SHL1STDLIBS+=-lgcc
 $(SHL1TARGETN) : $(OUT)$/inc$/udkversion.h
 .ENDIF # "$(SHL1TARGETN)" != ""
 
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-
 $(OUT)$/inc$/udkversion.h: 
     echo '#ifndef _SAL_UDKVERSION_H_'           >  $@
     echo '#define _SAL_UDKVERSION_H_'           >> $@
@@ -239,17 +237,3 @@ $(OUT)$/inc$/udkversion.h:
     echo '#define SAL_UDK_MICRO "$(UDK_MICRO)"' >> $@
     echo ''                                     >> $@
     echo '#endif'                               >> $@
-
-.ELSE
-
-$(OUT)$/inc$/udkversion.h: 
-    echo #ifndef _SAL_UDKVERSION_H_           >  $@
-    echo #define _SAL_UDKVERSION_H_           >> $@
-    echo.                                     >> $@
-    echo #define SAL_UDK_MAJOR "$(UDK_MAJOR)" >> $@
-    echo #define SAL_UDK_MINOR "$(UDK_MINOR)" >> $@
-    echo #define SAL_UDK_MICRO "$(UDK_MICRO)" >> $@
-    echo.                                     >> $@
-    echo #endif                               >> $@
-
-.ENDIF