[Libreoffice-commits] .: l10ntools/java l10ntools/prj l10ntools/source

[Andras Timar]

 l10ntools/java/jpropex/jpropex.bat |   13 +++++++++++++
 l10ntools/prj/d.lst                |    1 +
 l10ntools/source/localize.cxx      |    3 +++
 3 files changed, 17 insertions(+)

New commits:
commit 66231974fb2e6b00621c6fa27d448f8c0f3c316b
Author: Robert Sedak <robert.sedak at roby.hr>
Date:   Sun Jan 9 00:10:26 2011 +0100

    Fixed localize jpropex launcher under Win32/Cygwin

diff --git a/l10ntools/java/jpropex/jpropex.bat b/l10ntools/java/jpropex/jpropex.bat
new file mode 100644
index 0000000..a32c977
--- /dev/null
+++ b/l10ntools/java/jpropex/jpropex.bat
@@ -0,0 +1,13 @@
+ at echo off
+
+if "x%SOLARENV%x" EQU "xx" (
+   echo No environment found, please use 'configure' or 'setsolar'
+   exit
+)
+
+if "x%JAVA_HOME%x" EQU "xx" (
+   echo echo ERROR: No java found
+   exit
+)
+
+java -DSOLARSRC=%SOLARSRC% -DWORK_STAMP=%WORK_STAMP% -DUSE_SHELL=  -jar %SOLARVER%\%INPATH%\bin%UPDMINOREXT%\jpropex.jar %*
diff --git a/l10ntools/prj/d.lst b/l10ntools/prj/d.lst
index 29dd21c..af6aa4f 100644
--- a/l10ntools/prj/d.lst
+++ b/l10ntools/prj/d.lst
@@ -42,6 +42,7 @@ mkdir: %_DEST%\bin%_EXT%\help\com\sun\star\help
 ..\%__SRC%\class\receditor\receditor.jar %_DEST%\bin%_EXT%\receditor.jar
 
 ..\java\jpropex\jpropex %_DEST%\bin%_EXT%\jpropex
+..\java\jpropex\jpropex.bat %_DEST%\bin%_EXT%\jpropex.bat
 ..\scripts\localize.pl %_DEST%\bin%_EXT%\localize.pl
 ..\scripts\localize_old.pl %_DEST%\bin%_EXT%\localize_old.pl
 ..\scripts\localize %_DEST%\bin%_EXT%\localize
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 76bb0e1..6a1b05f 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -301,6 +301,9 @@ void SourceTreeLocalizer::WorkOnFile(
             ByteString sPath3( "bin" );
             ByteString sPath4( Export::GetEnv("UPDMINOREXT") );
             ByteString sExecutable( sPath1 );
+#if defined(WNT) || defined(OS2)
+            sExecutable.SearchAndReplaceAll( "/", sDel );
+#endif
             sExecutable += sDel ;
             sExecutable += sPath2 ;
             sExecutable += sDel;