ooo-build r12221 - in trunk: . patches/src680

[tml svn gnome org]

Author: tml
Date: Fri Apr 18 11:38:51 2008
New Revision: 12221
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12221&view=rev

Log:
2008-04-18  Tor Lillqvist  <tml novell com>

	* patches/src680/localize-pl-cygwin-paths.diff: New patch. Fixes
	localize.pl so that it doesn't pass Cygwin pathnames to the
	non-Cygwin programs it runs.

	* patches/src680/apply: Add it to Fixes.



Added:
   trunk/patches/src680/localize-pl-cygwin-paths.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Fri Apr 18 11:38:51 2008
@@ -477,6 +477,8 @@
 # screws things up
 userform-scrollleftandtop.diff, i#87007, noelpwer
 
+localize-pl-cygwin-paths.diff, tml
+
 [ RadioButtons ]
 # Add a GroupName property to RadioButtons so that RadioButtons don't need to
 # share the same name to be part of the same group.

Added: trunk/patches/src680/localize-pl-cygwin-paths.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/localize-pl-cygwin-paths.diff	Fri Apr 18 11:38:51 2008
@@ -0,0 +1,51 @@
+--- transex3/scripts/localize.pl.ORIG	2007-04-24 18:08:18.000000000 +0200
++++ transex3/scripts/localize.pl	2008-04-18 13:30:52.068500000 +0200
+@@ -375,8 +375,9 @@
+         $command = "gsicheck";
+     }
+     my $errfile = $sdffile.".err";
+-    $command .= " -k -c -wcf $tmpfile -wef $errfile -l \"\" $sdffile";
++    $command .= " -k -c -wcf $tmpfile -wef ".fix_cygwin_path($errfile)." -l \"\" ".fix_cygwin_path($sdffile);
+     #my $rc = system( $command );
++    if ($bVerbose) { print STDOUT "localize.pl running $command\n"; }
+     my $output = `$command`;
+     my $rc = $? << 8;
+     if ( $output ne "" ){
+@@ -444,7 +445,7 @@
+         # if ( -x $command ){
+         if( $command ){
+             if( !$bVerbose  ){ $args .= " -QQ -skip_links "; }
+-            $args .= " -e -f $localizeSDF -l ";
++            $args .= " -e -f ".fix_cygwin_path($localizeSDF)." -l ";
+             my $bFlag="";
+             if( $bAll ) {$args .= " en-US";}
+             else{
+@@ -481,7 +482,7 @@
+ #            if ( $WIN eq "TRUE" ) { $args .= " > $my_localize_log";  }
+ #            else                  { $args .= " >& $my_localize_log"; }
+ #        }
+-        if ( $bVerbose ) { print STDOUT $command.$args."\n"; }
++        if ( $bVerbose ) { print STDOUT "localize.pl running $command.$args.\n"; }
+         
+         my $rc = system( $command.$args );
+ 
+@@ -1105,6 +1106,19 @@
+     print STDERR "\nlocalize -m -l cs -f my.sdf\n( Merge cs translation into the sourcecode ) \n";
+ }
+ 
++sub fix_cygwin_path
++{
++    my ( $path ) = @_;
++
++    if ( $^O eq 'cygwin' )
++    {
++	$path = qx{cygpath -m "$path"};
++	chomp($path);
++    }
++
++    return $path;
++}
++
+ #            my $line           = defined $_ ? $_ : '';
+ #            my $leftpart       = defined $2 ? $2 : '';
+ #            my $prj            = defined $3 ? $3 : '';