sb118: #i108269# first step of removing tcsh support

6 files changed, 7 insertions, 60 deletions

diff --git a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
index c1909a807863..589bde2f3335 100755
--- a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
+++ b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
@@ -106,7 +106,6 @@ PRODUCTSWITCH = false
 DEBUGSWITCH = true
 .ENDIF
 
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)" != "4nt"
 $(JAVADIR)$/$(PACKAGE)$/%.java: makefile.mk
     @@-$(MKDIRHIER) $(JAVADIR)$/$(PACKAGE)
     @-echo package org.openoffice.java.accessibility\; > $@
@@ -114,16 +113,6 @@ $(JAVADIR)$/$(PACKAGE)$/%.java: makefile.mk
     @-echo public static final boolean DEBUG = $(DEBUGSWITCH)\; >> $@
     @-echo public static final boolean PRODUCT = $(PRODUCTSWITCH)\; >> $@
     @-echo } >> $@
-.ELSE
-$(JAVADIR)$/$(PACKAGE)$/%.java: makefile.mk
-    @@-$(MKDIRHIER) $(JAVADIR)$/$(PACKAGE)
-    @-echo package org.openoffice.java.accessibility; > $@
-    @-echo public class Build { >> $@
-    @-echo public static final boolean DEBUG = $(DEBUGSWITCH); >> $@
-    @-echo public static final boolean PRODUCT = $(PRODUCTSWITCH); >> $@
-    @-echo } >> $@
-.ENDIF
-
 
 $(CLASSDIR)$/$(PACKAGE)$/Build.class : $(JAVADIR)$/$(PACKAGE)$/Build.java
     -$(JAVAC) -d $(CLASSDIR) $(JAVADIR)$/$(PACKAGE)$/Build.java
diff --git a/automation/source/testtool/filter.pl b/automation/source/testtool/filter.pl
index e23d3a0f44e1..73abda2053ee 100644
--- a/automation/source/testtool/filter.pl
+++ b/automation/source/testtool/filter.pl
@@ -75,28 +75,13 @@ sub read_block {
   print "Leaving read_block at the end\n" if $debug;
 }
 
-sub convert_path {
-
-  $_ = $_[0];
-  $GUI = $ENV {"GUI"};
-  $use_shell = $ENV {"USE_SHELL"};
-  if ( $GUI eq "WNT" )
-  {
-    if ( defined( $use_shell ) && "$use_shell" eq "4nt" )
-    {
-      s/\//\\/g;
-    }
-  }
-  $_;
-}
-
 # Read a file.
 # first parameter ist the filename
 sub read_file {
 
   local ($filename,$file) = @_;
   $file++;                           # String increment
-  local $TempFileName = &convert_path( $basename."/".$filename );
+  local $TempFileName = $basename."/".$filename;
   print "reading file $TempFileName as $file\n" if $debug;
   open($file, $TempFileName) || die "error: Could not open file $TempFileName. ";
 
@@ -107,9 +92,6 @@ sub read_file {
 
 # main starts here
 
-print &convert_path ("/\n\n\n") if ( $debug );
-
-
 $basename = ".";
 $basename = $ARGV[0] if defined($ARGV[0]);
 
diff --git a/automation/source/testtool/makefile.mk b/automation/source/testtool/makefile.mk
index e72c92c3b8e1..faf78b76cd40 100644
--- a/automation/source/testtool/makefile.mk
+++ b/automation/source/testtool/makefile.mk
@@ -91,13 +91,8 @@ $(INCCOM)$/res_type.hxx : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/tools$/
 
 
 $(MISC)$/xfilter.pl : filter.pl
-.IF "$(GUI)" == "UNX" || "$(USE_SHELL)"!="4nt"
        tr  -d "\015" < filter.pl > $(MISC)$/xfilter.pl
        chmod 664 $(MISC)$/xfilter.pl
-.ELSE
-       $(COPY) filter.pl $(MISC)$/xfilter.pl
-       attrib  -r $(MISC)$/xfilter.pl
-.ENDIF
 
 
 
diff --git a/basctl/source/basicide/makefile.mk b/basctl/source/basicide/makefile.mk
index 8766473d8157..eeba05b2add4 100644
--- a/basctl/source/basicide/makefile.mk
+++ b/basctl/source/basicide/makefile.mk
@@ -93,11 +93,7 @@ $(INCCOM)$/dllname.hxx: makefile.mk
     $(RM) $@
         echo \#define DLL_NAME \"libbasctl$(DLLPOSTFIX)$(DLLPOST)\" >$@
 .ELSE
-.IF "$(USE_SHELL)"!="4nt"
         echo \#define DLL_NAME \"basctl$(DLLPOSTFIX)$(DLLPOST)\" >$@
-.ELSE          # "$(USE_SHELL)"!="4nt"
-        echo #define DLL_NAME "basctl$(DLLPOSTFIX)$(DLLPOST)" >$@
-.ENDIF          # "$(USE_SHELL)"!="4nt"
 .ENDIF
 
 $(SLO)$/basiclib.obj : $(INCCOM)$/dllname.hxx
diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk
index 6ecd7f909484..e9d2cdbef22b 100644
--- a/extensions/source/activex/main/makefile.mk
+++ b/extensions/source/activex/main/makefile.mk
@@ -156,8 +156,4 @@ VERSIONOBJ_X64=
 $(MISC)$/envsettings.h : makefile.mk
     -$(RM) $@
 # it looks wrong; but rc likes it that way...
-.IF "$(USE_SHELL)"!="4nt"
     echo "#define MISC .\..\$(INPATH)\misc" > $@
-.ELSE			# "$(USE_SHELL)"!="4nt"
-    echo #define MISC .\..\$(INPATH)\misc > $@
-.ENDIF			# "$(USE_SHELL)"!="4nt"
diff --git a/setup_native/scripts/admin.pl b/setup_native/scripts/admin.pl
index f737a6392f13..bb2f8b3a7d91 100644
--- a/setup_native/scripts/admin.pl
+++ b/setup_native/scripts/admin.pl
@@ -194,13 +194,11 @@ sub convert_stringlist_into_array
     {
         $first = $1;
         $last = $2;
-        if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $first =~ s/\//\\/g; }
         # Problem with two directly following listseparators. For example a path with two ";;" directly behind each other
         $first =~ s/^$listseparator//;
         push(@newarray, "$first\n");
     }
 
-    if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $last =~ s/\//\\/g; }
     push(@newarray, "$last\n");
 
     return \@newarray;
@@ -386,11 +384,8 @@ sub try_to_create_directory
         {
             $created_directory = 1;
 
-            if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" )
-            {
-                my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
-                system($localcall);
-            }
+            my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
+            system($localcall);
         }
         else
         {
@@ -841,20 +836,14 @@ sub create_directory_with_privileges
 
         if ($returnvalue)
         {
-            if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" )
-            {
-                my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
-                system($localcall);
-            }
+            my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
+            system($localcall);
         }
     }
     else
     {
-        if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" )
-        {
-            my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
-            system($localcall);
-        }
+        my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
+        system($localcall);
     }
 }