[Libreoffice-commits] core.git: bin/gbuild-to-ide

brinzing oliver.brinzing at gmx.de
Sat Aug 22 23:02:03 PDT 2015


 bin/gbuild-to-ide |   28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

New commits:
commit 93cd7b78c29c11ccc87c19c845c6617acb834630
Author: brinzing <oliver.brinzing at gmx.de>
Date:   Sat Aug 22 21:51:01 2015 +0200

    exclude unnamed Library/Executable from ide integration
    
    unnamed (None) Library/Executable will prevent correct
    vs 2013 ide integration
    
    Change-Id: Ia00c02609a83b5f891995e54fd3f365cd63cb7a4
    Reviewed-on: https://gerrit.libreoffice.org/17933
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 4ad7d4b..865a0b8 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -116,21 +116,25 @@ class GbuildParser:
         libmatch = GbuildParser.libpattern.match(line)
         if libmatch:
             libname = self.libnames.get(state.ilib, None)
-            self.libs.append(
-                GbuildLib(libmatch.group(2), libname, libmatch.group(1),
-                          state.include, state.include_sys, state.defs, state.cxxobjects,
-                          state.cxxflags, state.linked_libs))
-            state = GbuildParserState()
-            return state
+            if libname != None:
+                print('add Library: %s' % libname, end='\n')             
+                self.libs.append(
+                    GbuildLib(libmatch.group(2), libname, libmatch.group(1),
+                              state.include, state.include_sys, state.defs, state.cxxobjects,
+                              state.cxxflags, state.linked_libs))
+                state = GbuildParserState()
+                return state
         exematch = GbuildParser.exepattern.match(line)
         if exematch:
             exename = self.exenames.get(state.target, None)
-            self.exes.append(
-                GbuildExe(exematch.group(2), exename, exematch.group(1),
-                          state.include, state.include_sys, state.defs, state.cxxobjects,
-                          state.cxxflags, state.linked_libs))
-            state = GbuildParserState()
-            return state
+            if exename != None:
+                print('add Executable: %s' % exename, end='\n')                 
+                self.exes.append(
+                    GbuildExe(exematch.group(2), exename, exematch.group(1),
+                              state.include, state.include_sys, state.defs, state.cxxobjects,
+                              state.cxxflags, state.linked_libs))
+                state = GbuildParserState()
+                return state
         if line.find('# INCLUDE :=') == 0:
             isystemmatch = GbuildParser.isystempattern.findall(line)
             if isystemmatch:


More information about the Libreoffice-commits mailing list