summaryrefslogtreecommitdiff
path: root/helpcontent2/helpers
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-12-09 11:15:25 +0000
committerOliver Bolte <obo@openoffice.org>2009-12-09 11:15:25 +0000
commit2a7c5b0370f7c861f39849fef2cc1249c0ec3940 (patch)
treecf47097c856fe3618e02dfe91cf2ed6caea8cb11 /helpcontent2/helpers
parent13f9c2f9694dc882cc8c6bab9c69424ebe89fcb6 (diff)
CWS-TOOLING: integrate CWS localization37fix
2009-12-03 18:32:31 +0100 ihi r277718 : fix a bizarr rebuild error of the *.tree files 2009-12-03 18:31:26 +0100 ihi r277717 : fix a bizarr rebuild error of the *.tree files 2009-12-03 14:18:01 +0100 ihi r277712 : #i107407# removed sysui as < char handling is broken 2009-12-03 13:01:51 +0100 ihi r277711 : #i107385# fixed 2 l10n errors 2009-12-02 20:22:26 +0100 ihi r277705 : #i107057# missing Irish update for OOo 3.2 2009-12-02 12:44:31 +0100 ihi r277703 : removed empty dirs 2009-12-01 18:16:38 +0100 ihi r277698 : #i106456# fixed css for bn 2009-12-01 18:02:48 +0100 ihi r277697 : #i107057# #i107024# #i106900# #i106773# langauge fixes for OOo 3.2
Diffstat (limited to 'helpcontent2/helpers')
-rw-r--r--helpcontent2/helpers/update_tree.pl21
1 files changed, 9 insertions, 12 deletions
diff --git a/helpcontent2/helpers/update_tree.pl b/helpcontent2/helpers/update_tree.pl
index 71579750ad..23795168c1 100644
--- a/helpcontent2/helpers/update_tree.pl
+++ b/helpcontent2/helpers/update_tree.pl
@@ -73,7 +73,7 @@ if ( ! defined $prj ) {
($source_dir = $scriptname) =~ s/\/update_tree.pl/\/..\/source/;
($source_dir_xhp = $scriptname) =~ s/\/update_tree.pl/\/..\/source/;
- if ( defined $ENV{TRYSDF} && defined $ENV{LOCALIZESDF} )
+ if ( defined $ENV{TRYSDF} || defined $ENV{LOCALIZESDF} )
{
if( defined $ENV{LOCALIZATION_FOUND} && $ENV{LOCALIZATION_FOUND} eq "YES" )
{
@@ -98,19 +98,16 @@ if ( ! defined $prj ) {
$source_dir_xhp = "$prj\/source";
$treestrings = "$source_dir/text/shared/tree_strings.xhp";
- if ( defined $ENV{TRYSDF} && defined $ENV{LOCALIZESDF} )
+ if( defined $ENV{LOCALIZATION_FOUND} && $ENV{LOCALIZATION_FOUND} eq "YES" )
{
- if( defined $ENV{LOCALIZATION_FOUND} && $ENV{LOCALIZATION_FOUND} eq "YES" )
- {
- $source_dir = $ENV{TRYSDF};
- }
- else
- {
- $source_dir = $ENV{LOCALIZESDF};
- }
- if( $is_win eq "false" ) { $source_dir =~ s/\/auxiliary\/localize.sdf$// ; }
- else { $source_dir =~ s/\\auxiliary\\localize.sdf$// ; }
+ $source_dir = $ENV{TRYSDF};
+ }
+ else
+ {
+ $source_dir = $ENV{LOCALIZESDF};
}
+ if( $is_win eq "false" ) { $source_dir =~ s/\/auxiliary\/localize.sdf$// ; }
+ else { $source_dir =~ s/\\auxiliary\\localize.sdf$// ; }
#else {die "ERROR: The env variables TRYSDF LOCALIZATION_FOUND LOCALIZESDF not found ... something is wrong!\n";}
}