summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2010-04-16 10:09:51 +0200
committerJens-Heiner Rechtien <hr@openoffice.org>2010-04-16 10:09:51 +0200
commit502f8c137795134c5c43b0bf32c85fedc3bacd13 (patch)
treebadf82e16598bd928bae80ffe018154463aafaff
parent66e3b342455dcaf2e5085702328d119211798e7c (diff)
parent80ec837ff1652182886401d8fd0bcc45533cb940 (diff)
CWS-TOOLING: integrate CWS sb118
-rw-r--r--helpcontent2/helpers/update_tree.pl12
-rw-r--r--helpcontent2/source/auxiliary/makefile.mk4
-rwxr-xr-xhelpcontent2/util/target.pmk2
3 files changed, 3 insertions, 15 deletions
diff --git a/helpcontent2/helpers/update_tree.pl b/helpcontent2/helpers/update_tree.pl
index 018d55c053..b2aa53fcb3 100644
--- a/helpcontent2/helpers/update_tree.pl
+++ b/helpcontent2/helpers/update_tree.pl
@@ -34,10 +34,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/*
@@ -79,9 +75,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";}
@@ -102,8 +96,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";}
}
@@ -343,7 +336,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))
diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk
index b597a516e9..ba39195439 100755
--- a/helpcontent2/util/target.pmk
+++ b/helpcontent2/util/target.pmk
@@ -37,7 +37,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/*.*