[Libreoffice-commits] .: 2 commits - rsc/source toolkit/AllLangResTarget_tk.mk

[Jan Holesovsky]

 rsc/source/rsc/rsc.cxx         |   18 +++++++++++-------
 toolkit/AllLangResTarget_tk.mk |    1 +
 2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 738ce720fc22c54186644f64c52afbda1a544622
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Mar 17 19:55:19 2011 +0100

    Fix build, re-introduce include path for xthrobber.hrc

diff --git a/toolkit/AllLangResTarget_tk.mk b/toolkit/AllLangResTarget_tk.mk
index 1879f43..e127bef 100644
--- a/toolkit/AllLangResTarget_tk.mk
+++ b/toolkit/AllLangResTarget_tk.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,toolkit/awt))
 
 $(eval $(call gb_SrsTarget_set_include,toolkit/awt,\
     $$(INCLUDE) \
+    -I$(SRCDIR)/toolkit/source/awt \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,toolkit/awt,\
commit 2a4ee65adbdf2eca5bb23d1d2f638e032125f28c
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Thu Mar 17 17:59:00 2011 +0000

    be more paranoid about eliding empty path params we get

diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 0f982db..e313d04 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -231,14 +231,18 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
             else if( !rsc_strnicmp( (*ppStr) + 1, "lip=", 4 ) )
             {  // additional language specific include for system dependent files
                 const ByteString    aSysSearchDir( (*ppStr)+5 );
-                DirEntry            aSysDir( String( aSysSearchDir, RTL_TEXTENCODING_ASCII_US ) );
 
-                m_aOutputFiles.back().aSysSearchDirs.push_back( ByteString( aSysDir.GetFull(), RTL_TEXTENCODING_ASCII_US ) );
-
-                if( m_aOutputFiles.back().aLangSearchPath.Len() )
-                    m_aOutputFiles.back().aLangSearchPath.Append( ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US ) );
-
-                m_aOutputFiles.back().aLangSearchPath.Append( aSysSearchDir );
+                // ignore empty -lip= arguments that we get lots of these days
+                if (aSysSearchDir.Len())
+                {
+                    DirEntry aSysDir( String( aSysSearchDir, RTL_TEXTENCODING_ASCII_US ) );
+                    m_aOutputFiles.back().aSysSearchDirs.push_back(
+                        ByteString( aSysDir.GetFull(), RTL_TEXTENCODING_ASCII_US ) );
+                    if( m_aOutputFiles.back().aLangSearchPath.Len() )
+                        m_aOutputFiles.back().aLangSearchPath.Append(
+                        ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US ) );
+                    m_aOutputFiles.back().aLangSearchPath.Append( aSysSearchDir );
+                }
             }
             else if( !rsc_strnicmp( (*ppStr) + 1, "fp=", 3 ) )
             { // anderer Name fuer .srs-file