summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--transex3/java/receditor/java/transex3/model/SdfString.java25
-rw-r--r--transex3/scripts/fast_merge.pl10
-rwxr-xr-xtransex3/scripts/localize.pl38
-rwxr-xr-xtransex3/scripts/localize_old.pl56
4 files changed, 16 insertions, 113 deletions
diff --git a/transex3/java/receditor/java/transex3/model/SdfString.java b/transex3/java/receditor/java/transex3/model/SdfString.java
index 7419aeb5578b..7eec2151b7c3 100644
--- a/transex3/java/receditor/java/transex3/model/SdfString.java
+++ b/transex3/java/receditor/java/transex3/model/SdfString.java
@@ -97,32 +97,7 @@ public class SdfString {
public void setModuleName(String modulename) {
this.modulename = modulename;
}
- /*
- public String getRealFileName(){
- //String srcroot = "U:\\cws01\\l10ncleanup\\SRC680\\src.m213";//java.lang.System.getProperty( "SOLARSRC");
- //String isWindows = "4nt";//java.lang.System.getProperty( "USE_SHELL");
- String srcroot = java.lang.System.getProperty( "SOLARSRC" );
- String isWindows = java.lang.System.getProperty( "USE_SHELL" );
- //System.out.println("srcroot="+srcroot+" isWindows="+isWindows );
- //if( true ) return;
- //String relpath = sourceString.getFileId().substring( sourceString.getFileId().lastIndexOf("\\")
- // , sourceString.getFileId().length() );
- String filename;
- if( isWindows != null && isWindows.compareTo( "4nt") == 0 )
- {
- filename = srcroot + "\\" + //sourceString.getProject() + "\\" +
- sourceString.getFileId() +".recommand";
- }
- else
- {
- String filepart = sourceString.getFileId();
- filepart = filepart.replaceAll( "\\\\" , "/" );
- filename = srcroot + "/" + //sourceString.getProject() + "//" +
- filepart +".recommand";
- }
- return filename;
- }*/
public String getRealFileName(){
String filepart = sourceString.getFileId();
filepart = filepart.replaceAll( "\\\\" , "_" );
diff --git a/transex3/scripts/fast_merge.pl b/transex3/scripts/fast_merge.pl
index 7321a9a42911..d2505cf79dca 100644
--- a/transex3/scripts/fast_merge.pl
+++ b/transex3/scripts/fast_merge.pl
@@ -53,12 +53,8 @@ my $last_localize_file;
my $first_run = "1";
my $sdf_filename;
my $merge_dir;
-my $WIN;
my $state = "none";
-if ( defined $ENV{USE_SHELL} && $ENV{USE_SHELL} eq '4nt' ) { $WIN = 'TRUE'; }
-else { $WIN = ''; }
-
$SIG{INT} = 'inthandler';
$SIG{QUIT} = 'quithandler';
@@ -75,7 +71,6 @@ struct ( sdf_obj =>
parse_options();
my $lock_file = $merge_dir."/lock.mk";
-$lock_file =~ s/\//\\/g , if ( $WIN ) ;
acquire_lock();
read_sdf_file_names();
init();
@@ -255,10 +250,9 @@ sub make_paths
{
my $localizeFile = $merge_dir."\\".$current[ 0 ]->module."\\".$current[ 0 ]->file;
my $path = getDir( $localizeFile );
- if ( !$WIN ) { $path =~ s/\\/\//g; }
+ $path =~ s/\\/\//g;
- $localizeFile = $path."\\localize.sdf";
- if ( !$WIN ) { $localizeFile =~ s/\\/\//g; }
+ $localizeFile = $path."/localize.sdf";
return ( $path , $localizeFile );
}
diff --git a/transex3/scripts/localize.pl b/transex3/scripts/localize.pl
index 10e8124027b1..9f733481a587 100755
--- a/transex3/scripts/localize.pl
+++ b/transex3/scripts/localize.pl
@@ -74,13 +74,11 @@ my $no_gsicheck = '';
my $mode = '';
my $bVerbose = "0";
my $srcpath = '';
-my $WIN;
my $languages;
#my %sl_modules; # Contains all modules where en-US and de is source language
my $use_default_date = '0';
my %is_ooo_module;
my %is_so_module;
-my $DELIMITER;
# ( leftpart ) ( rightpart )
# prj file dummy type gid lid helpid pform width lang text helptext qhelptext title timestamp
@@ -94,23 +92,14 @@ my @sdfparticles;
parse_options();
check_modules_scm();
-if ( defined $ENV{USE_SHELL} && $ENV{USE_SHELL} eq '4nt' ) {
- $WIN = 'TRUE';
- $DELIMITER = "\\";
-}
- else {
- $WIN = '';
- $DELIMITER = "/";
-}
-
my $binpath = '';
if( defined $ENV{UPDMINOREXT} )
{
- $binpath = $ENV{SOLARVER}.$DELIMITER.$ENV{INPATH}.$DELIMITER."bin".$ENV{UPDMINOREXT}.$DELIMITER ;
+ $binpath = $ENV{SOLARVER}."/".$ENV{INPATH}."/bin".$ENV{UPDMINOREXT}."/" ;
}
else
{
- $binpath = $ENV{SOLARVER}.$DELIMITER.$ENV{INPATH}.$DELIMITER."bin".$DELIMITER ;
+ $binpath = $ENV{SOLARVER}."/".$ENV{INPATH}."/bin/" ;
}
#%sl_modules = fetch_sourcelanguage_dirlist();
@@ -190,9 +179,8 @@ sub splitfile{
exit( -1 );
}
my $src_root = $ENV{SRC_ROOT};
- #print $WIN eq "TRUE" ? $src_root."\\l10n_so\n" : $src_root."/l10n_so\n";
- my $so_l10n_path = $WIN eq "TRUE" ? $src_root."\\l10n_so\\source" : $src_root."/l10n_so/source";
- my $ooo_l10n_path = $WIN eq "TRUE" ? $src_root."\\l10n\\source" : $src_root."/l10n/source";
+ my $so_l10n_path = $src_root."/l10n_so/source";
+ my $ooo_l10n_path = $src_root."/l10n/source";
#print "$so_l10n_path\n";
#print "$ooo_l10n_path\n";
@@ -289,7 +277,7 @@ sub write_sdf
my @sdf_file;
# mkdir!!!!
- my $current_l10n_file = $WIN eq "TRUE" ? $l10n_file."\\$lang\\localize.sdf" : $l10n_file."/$lang/localize.sdf";
+ my $current_l10n_file = $l10n_file."/$lang/localize.sdf";
print "Writing '$current_l10n_file'\n";
if( open DESTFILE , "< $current_l10n_file" ){
@@ -439,17 +427,17 @@ sub add_paths
{
my $langhash_ref = shift;
my $root_dir = $ENV{ SRC_ROOT };
- my $ooo_l10n_dir = "$root_dir"."$DELIMITER"."l10n"."$DELIMITER"."source";
- my $so_l10n_dir = "$root_dir"."$DELIMITER"."l10n_so"."$DELIMITER"."source";
+ my $ooo_l10n_dir = "$root_dir/l10n/source";
+ my $so_l10n_dir = "$root_dir/l10n_so/source";
if( -e $ooo_l10n_dir )
{
foreach my $lang ( keys( %{ $langhash_ref } ) )
{
- my $loc_file = "$ooo_l10n_dir"."$DELIMITER"."$lang"."$DELIMITER"."localize.sdf";
+ my $loc_file = "$ooo_l10n_dir/$lang/localize.sdf";
if( -e $loc_file )
{
- push @sdfparticles , "$ooo_l10n_dir"."$DELIMITER"."$lang"."$DELIMITER"."localize.sdf";
+ push @sdfparticles , "$ooo_l10n_dir/$lang/localize.sdf";
}
else { print "WARNING: $loc_file not found ....\n"; }
}
@@ -459,10 +447,10 @@ sub add_paths
{
foreach my $lang ( keys( %{ $langhash_ref } ) )
{
- my $loc_file = "$so_l10n_dir"."$DELIMITER"."$lang"."$DELIMITER"."localize.sdf";
+ my $loc_file = "$so_l10n_dir/$lang/localize.sdf";
if( -e $loc_file )
{
- push @sdfparticles , "$ooo_l10n_dir"."$DELIMITER"."$lang"."$DELIMITER"."localize.sdf";
+ push @sdfparticles , "$ooo_l10n_dir/$lang/localize.sdf";
}
else { #print "WARNING: $loc_file not found ....\n";
}
@@ -539,10 +527,6 @@ sub collectfiles{
} #foreach
} # if
} # if
-# if ( !$bVerbose ){
-# if ( $WIN eq "TRUE" ) { $args .= " > $my_localize_log"; }
-# else { $args .= " >& $my_localize_log"; }
-# }
if ( $bVerbose ) { print STDOUT $command.$args."\n"; }
my $rc = system( $command.$args );
diff --git a/transex3/scripts/localize_old.pl b/transex3/scripts/localize_old.pl
index 151399d22002..68060200145c 100755
--- a/transex3/scripts/localize_old.pl
+++ b/transex3/scripts/localize_old.pl
@@ -67,7 +67,6 @@ my $outputfile = '';
my $mode = '';
my $bVerbose="0";
my $srcpath = '';
-my $WIN;
my $languages;
#my %sl_modules; # Contains all modules where en-US and de is source language
my $use_default_date = '0';
@@ -82,13 +81,6 @@ my $default_date = "2002-02-02 02:02:02";
#### main ####
parse_options();
-if ( defined $ENV{USE_SHELL} && $ENV{USE_SHELL} eq '4nt' ) {
- $WIN = 'TRUE';
-}
- else {
- $WIN = '';
-}
-
#%sl_modules = fetch_sourcelanguage_dirlist();
@@ -140,13 +132,11 @@ sub splitfile{
next if( $prj eq "binfilter" ); # Don't merge strings into binfilter module
chomp( $line );
$currentFile = $srcpath . '\\' . $prj . '\\' . $file;
- if ( $WIN ) { $currentFile =~ s/\//\\/g; }
- else { $currentFile =~ s/\\/\//g; }
+ $currentFile =~ s/\\/\//g;
$cur_sdffile = $currentFile;
#if( $cur_sdffile =~ /\.$file_types[\s]*$/ ){
- if( $WIN ) { $cur_sdffile =~ s/\\[^\\]*\.$file_types[\s]*$/\\localize.sdf/; }
- else { $cur_sdffile =~ s/\/[^\/]*\.$file_types[\s]*$/\/localize.sdf/; }
+ $cur_sdffile =~ s/\/[^\/]*\.$file_types[\s]*$/\/localize.sdf/;
#}
# Set default date
@@ -186,41 +176,6 @@ sub splitfile{
}
#########################################################
-#sub fetch_sourcelanguage_dirlist
-#{
-#
-# my $working_path = getcwd();
-# my %sl_dirlist;
-#
-# chdir $srcpath;
-# my @all_dirs = csh_glob( "*" );
-#
-# foreach my $file ( @all_dirs )
-# {
-# if( -d $file )
-# {
-# my $module = $file;
-# $file .= "/prj/l10n";
-# $file =~ s/\//\\/ , if( $WIN ) ;
-#
-# if( -f $file ) # Test file <module>/prj/l10n
-# {
-# $sl_dirlist{ $module } = 1;
-# if( $bVerbose eq "1" ) { print STDOUT "$module: de and en-US source language detected\n"; }
-# }
-# }
-# }
-#
-# chdir $working_path;
-#
-# return %sl_dirlist;
-#}
-
-#sub has_two_sourcelanguages
-#{
-# my $module = shift;
-# return defined $sl_modules{ $module } ;
-#}
sub writesdf{
my $lastFile = shift;
@@ -229,8 +184,7 @@ sub writesdf{
my %index=();
if( $localizeFile =~ /\.$file_types[\s]*$/ ){
- if( $WIN ) { $localizeFile =~ s/\\[^\\]*\.$file_types[\s]*$/\\localize.sdf/; }
- else { $localizeFile =~ s/\/[^\/]*\.$file_types[\s]*$/\/localize.sdf/; }
+ $localizeFile =~ s/\/[^\/]*\.$file_types[\s]*$/\/localize.sdf/;
}else {
print STDERR "Strange filetype found '$localizeFile'\n";
return;
@@ -481,10 +435,6 @@ sub collectfiles{
} #foreach
} # if
} # if
-# if ( !$bVerbose ){
-# if ( $WIN eq "TRUE" ) { $args .= " > $my_localize_log"; }
-# else { $args .= " >& $my_localize_log"; }
-# }
if ( $bVerbose ) { print STDOUT $command.$args."\n"; }
my $rc = system( $command.$args );
generated by cgit (git 2.34.1) at 2025-05-05 22:33:30 +0000