CWS-TOOLING: integrate CWS sb118

5 files changed, 17 insertions, 114 deletions

diff --git a/l10ntools/java/receditor/java/transex3/model/SdfString.java b/l10ntools/java/receditor/java/transex3/model/SdfString.java
index 7419aeb5578b..7eec2151b7c3 100644
--- a/l10ntools/java/receditor/java/transex3/model/SdfString.java
+++ b/l10ntools/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/l10ntools/scripts/fast_merge.pl b/l10ntools/scripts/fast_merge.pl
index e2980fafddda..5dc63cf95d79 100644
--- a/l10ntools/scripts/fast_merge.pl
+++ b/l10ntools/scripts/fast_merge.pl
@@ -45,12 +45,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';
 
@@ -67,7 +63,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();
@@ -247,10 +242,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/l10ntools/scripts/localize.pl b/l10ntools/scripts/localize.pl
index 8b6a8231ebce..82ef331a63d5 100755
--- a/l10ntools/scripts/localize.pl
+++ b/l10ntools/scripts/localize.pl
@@ -70,14 +70,12 @@ 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 $force_ooo_module = '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
@@ -91,23 +89,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();
@@ -187,9 +176,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";
@@ -286,7 +274,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" ){
 
@@ -430,17 +418,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"; }
         }
@@ -450,10 +438,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";
             }
@@ -530,10 +518,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/l10ntools/scripts/localize_old.pl b/l10ntools/scripts/localize_old.pl
index fe63ba9a93de..d6b66d6bb535 100755
--- a/l10ntools/scripts/localize_old.pl
+++ b/l10ntools/scripts/localize_old.pl
@@ -63,7 +63,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';
@@ -78,13 +77,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();
 
 
@@ -136,13 +128,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
@@ -182,41 +172,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;
@@ -225,8 +180,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;
@@ -471,10 +425,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/l10ntools/source/help/makefile.mk b/l10ntools/source/help/makefile.mk
index 50351913fe55..b66077501a8d 100644
--- a/l10ntools/source/help/makefile.mk
+++ b/l10ntools/source/help/makefile.mk
@@ -101,7 +101,7 @@ JAVACLASSFILES = \
     $(CLASSDIR)$/$(PACKAGE)$/HelpFileDocument.class
 
 .IF "$(SYSTEM_LUCENE)" == "YES"
-CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
+EXTRAJARFILES += $(LUCENE_CORE_JAR) $(LUCENE_ANALYZERS_JAR)
 .ELSE
 JARFILES += lucene-core-2.3.jar lucene-analyzers-2.3.jar
 .ENDIF