diff options
| author | sb <sb@openoffice.org> | 2010-01-12 18:49:59 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-01-12 18:49:59 +0100 |
| commit | f38e1f3d17b1a7d9b748ab02ad634306418f20a4 (patch) | |
| tree | 6b7acace97e32624bc090079f204f514bc9fd3de | |
| parent | d76449b6ee387ccf3a4d0281c138ccec7391bc94 (diff) | |
sb118: #i108269# first step of removing tcsh support
| -rw-r--r-- | helpcontent2/helpers/update_tree.pl | 12 | ||||
| -rw-r--r-- | helpcontent2/source/auxiliary/makefile.mk | 4 |
2 files changed, 2 insertions, 14 deletions
diff --git a/helpcontent2/helpers/update_tree.pl b/helpcontent2/helpers/update_tree.pl index 23795168c1..ab6b835277 100644 --- a/helpcontent2/helpers/update_tree.pl +++ b/helpcontent2/helpers/update_tree.pl @@ -38,10 +38,6 @@ use File::Copy qw/cp mv/; use File::Basename; use Benchmark; -my $is_win = "false"; - -$is_win = "true" , if ( defined $ENV{USE_SHELL} && $ENV{USE_SHELL} eq "4nt" ); - $t0 = new Benchmark; # update the tree files in <platform>/misc/* @@ -83,9 +79,7 @@ if ( ! defined $prj ) { { $source_dir = $ENV{LOCALIZESDF}; } - if( $is_win eq "false" ) { $source_dir =~ s/\/auxiliary\/localize.sdf$// ; } - else { $source_dir =~ s/\\auxiliary\\localize.sdf$// ; } - + $source_dir =~ s/\/auxiliary\/localize.sdf$// ; } #else {die "ERROR: The env variables TRYSDF LOCALIZATION_FOUND LOCALIZESDF not found ... something is wrong!\n";} @@ -106,8 +100,7 @@ if ( ! defined $prj ) { { $source_dir = $ENV{LOCALIZESDF}; } - if( $is_win eq "false" ) { $source_dir =~ s/\/auxiliary\/localize.sdf$// ; } - else { $source_dir =~ s/\\auxiliary\\localize.sdf$// ; } + $source_dir =~ s/\/auxiliary\/localize.sdf$// ; #else {die "ERROR: The env variables TRYSDF LOCALIZATION_FOUND LOCALIZESDF not found ... something is wrong!\n";} } @@ -347,7 +340,6 @@ sub read_loc { print "\n\nReading localized titles..."; $/ = "\n"; my $path = "$source_dir/text"; - $path =~ s/\//\\/g , if $is_win eq "true"; print " in $source_dir/text\n"; @files = `find $source_dir/text -name localize.sdf`; for my $fname (@files) { diff --git a/helpcontent2/source/auxiliary/makefile.mk b/helpcontent2/source/auxiliary/makefile.mk index 1155e80369..29a085070e 100644 --- a/helpcontent2/source/auxiliary/makefile.mk +++ b/helpcontent2/source/auxiliary/makefile.mk @@ -38,11 +38,7 @@ TREEFILES = \ ALLTAR : aux_dirs $(COMMONMISC)$/treefiles.done $(COMMONBIN)$/helpimg.ilst .IF "$(WITH_LANG)"!="" -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" t_aux_langdirs:=$(shell @find ./ -name "*.cfg" | sed "s/\.\/\///" | sed "s/\.\///" ) -.ELSE # "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -t_aux_langdirs:=$(subst,./, $(shell @$(FIND) ./ -name "*.cfg")) -.ENDIF # "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" aux_langdirs:=$(uniq $(t_aux_langdirs:d:d)) |