From f38e1f3d17b1a7d9b748ab02ad634306418f20a4 Mon Sep 17 00:00:00 2001 From: sb Date: Tue, 12 Jan 2010 18:49:59 +0100 Subject: sb118: #i108269# first step of removing tcsh support --- helpcontent2/helpers/update_tree.pl | 12 ++---------- helpcontent2/source/auxiliary/makefile.mk | 4 ---- 2 files changed, 2 insertions(+), 14 deletions(-) (limited to 'helpcontent2') 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 /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)) -- cgit From 4d0cb1d88c3c6c8f325a50af97de6c5fbd32799c Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 12 Feb 2010 21:44:58 +0100 Subject: sb118: introduced JAVAIFLAGS so that Java interpreter matches OOo jnilibs --- helpcontent2/util/target.pmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'helpcontent2') diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk index 58d9de8c79..e1a63ef6f9 100755 --- a/helpcontent2/util/target.pmk +++ b/helpcontent2/util/target.pmk @@ -41,7 +41,7 @@ JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN) $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag $(PRJ)$/helpers$/hid.lst $(HELPLINKER) @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers$/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption $(PRJ)$/source$/auxiliary$/idxcaption.xsl -idxcontent $(PRJ)$/source$/auxiliary$/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@) .IF "$(SOLAR_JAVA)" == "TRUE" - $(JAVAI) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@ -checkcfsname _0 + $(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@ -checkcfsname _0 .ELSE -$(RM) $(MISC)$/ziptmp$(@:b)$/content/*.* -$(RM) $(MISC)$/ziptmp$(@:b)$/caption/*.* -- cgit