sb118: #i108269# first step of removing tcsh support

3 files changed, 1 insertions, 41 deletions

diff --git a/odk/util/makefile.mk b/odk/util/makefile.mk
index ed836730a165..7f6517ed42a8 100644
--- a/odk/util/makefile.mk
+++ b/odk/util/makefile.mk
@@ -24,9 +24,7 @@ ALLTAR:\
 
 $(BIN)$/$(PRODUCTZIPFILE) : $(SDK_CONTENT_CHECK_FILES) $(SDK_CHECK_FLAGS)
     cd $(BIN)$/$(PRODUCT_NAME) && zip -urq ..$/$(PRODUCTZIPFILE) . $(CHECKZIPRESULT)
-.IF "$(USE_SHELL)"!="4nt"
     $(PERL) -w $(SOLARENV)$/bin$/cleanzip.pl $@
-.ENDIF			# "$(USE_SHELL)"!="4nt"
 #	cd $(BIN)$/$(PRODUCT_NAME) && zip -urq ..$/$(PRODUCTZIPFILE) . -x "idl/*" $(CHECKZIPRESULT)
 #	cd $(BIN)$/$(PRODUCT_NAME) && zip -urq ..$/odkidl.zip idl/* $(CHECKZIPRESULT)
 
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index 33ff68c90ab1..b1c690e9bb74 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -211,18 +211,8 @@ INCLUDEFILELIST=\
     $(INCOUT)$/com$/sun$/star$/uno$/Type.h \
     $(INCOUT)$/com$/sun$/star$/uno$/Type.hxx
 
-.IF "$(USE_SHELL)"=="4nt"
-# Quoted Open Bracket -QOB
-# Quoted Close Bracket -QCB
-QOB=(
-QCB=)
-.ELSE
-QOB=\(
-QCB=\)
-.ENDIF
-
 INCLUDELIST:=\
-    {$(subst,/,$/ $(shell @$(FIND) $(INCLUDETOPDIRLIST) -type f ! $(QOB) -name "*~" -o -name "*build.lst" -o -name "*deliver.log" $(QCB) -print))} \
+    {$(subst,/,$/ $(shell @$(FIND) $(INCLUDETOPDIRLIST) -type f ! \( -name "*~" -o -name "*build.lst" -o -name "*deliver.log" \) -print))} \
     $(INCLUDEFILELIST)
 
 SDK_CONTENT_CHECK_FILES= \
diff --git a/odk/util/odk_rules.pmk b/odk/util/odk_rules.pmk
index 9f987e7ae448..63d881c3bd1f 100644
--- a/odk/util/odk_rules.pmk
+++ b/odk/util/odk_rules.pmk
@@ -53,58 +53,36 @@ $(DESTDIRDOCUIMAGES)$/% : $(PRJ)$/docs$/images$/%
 $(DESTDIR)$/configure : $(PRJ)$/configure
     @@-rm -f $@
     $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/configure $(MY_TEXTCOPY_TARGETPRE) $@
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
     -chmod 755 $@
-.ENDIF
 
 $(DESTDIR)$/configure.pl : $(PRJ)$/configure.pl
     @@-rm -f $@
     $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/configure.pl $(MY_TEXTCOPY_TARGETPRE) $@
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
     -chmod 755 $@
-.ENDIF
 
 $(DESTDIR)$/config.guess : $(SRC_ROOT)$/config.guess
     @@-rm -f $@
     $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SRC_ROOT)$/config.guess $(MY_TEXTCOPY_TARGETPRE) $@
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
     -chmod 755 $@
-.ENDIF
 
 $(DESTDIR)$/config.sub : $(SRC_ROOT)$/config.sub
     @@-rm -f $@
     $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SRC_ROOT)$/config.sub $(MY_TEXTCOPY_TARGETPRE) $@
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
     -chmod 755 $@
-.ENDIF
 
 $(DESTDIR)$/setsdkenv_unix : $(PRJ)$/setsdkenv_unix
     @@-rm -f $@
     $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
     -chmod 755 $@
-.ENDIF
-
-#.IF "$(USE_SHELL)"=="4nt"
-#	$(TYPE) $< | $(SED) "s/__SDKNAME__/$(SDKDIRNAME)/" > $@
-#.ELSE
-#	$(TYPE) $< | $(SED) 's#__SDKNAME__#$(SDKDIRNAME)#' > $@
-#.ENDIF			
 
 $(DESTDIR)$/setsdkenv_unix.%.in : $(PRJ)$/setsdkenv_unix.%.in
     @@-rm -f $@
     $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
     -chmod 644 $@
-.ENDIF
 
 $(DESTDIR)$/setsdkenv_windows.bat : $(PRJ)$/setsdkenv_windows.bat
     @@-rm -f $@
-.IF "$(USE_SHELL)"=="4nt"
-    $(TYPE) $< | $(SED) "s/__SDKNAME__/$(SDKDIRNAME)/" > $@
-.ELSE
     $(TYPE) $< | $(SED) 's#__SDKNAME__#$(SDKDIRNAME)#' > $@
-.ENDIF			
 
 $(DESTDIR)$/%.bat : $(PRJ)$/%.bat
     @@-rm -f $@
@@ -144,9 +122,7 @@ $(DESTDIRBIN)$/%.bin : $(BINOUT)$/%.bin
 $(DESTDIRBIN)$/regcomp : $(BINOUT)$/regcomp
     @@-rm -f $@
     $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
     -chmod 755 $@
-.ENDIF
 
 $(DESTDIRBIN)$/unoapploader$(EXEPOSTFIX) : $(BIN)$/unoapploader$(EXEPOSTFIX)
     @@-rm -f $@
@@ -200,11 +176,7 @@ $(DESTDIRLIB)$/%.a : $(LIBOUT)$/%.a
     $(GNUCOPY) $(LIBOUT)$/$(@:f) $@
 
 $(DIR_CREATE_FLAG) :
-.IF "$(USE_SHELL)" != "4nt"
     $(TYPE) $(mktmp $(DIR_DIRECTORY_LIST)) | xargs -n 20 $(MKDIRHIER) && echo "dirs created" > $@ && touch $@
-.ELSE
-    $(TYPE) $(mktmp $(DIR_DIRECTORY_LIST:s#\#/#)) | $(XARGS) mkdir.exe -p && echo "dirs created" > $@ && touch $@
-.ENDIF
     $(DELAY) 2
 
 $(DESTDIRSETTINGS)$/component.uno.def : $(PRJ)$/settings$/component.uno.def