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

[Markus Mohrhard]

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

New commits:
commit f50eb63631c0e174165b99cd82721a7bf57b0717
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Aug 31 22:58:45 2015 +0200

    Revert "exclude unnamed Library/Executable from ide integration"
    
    This reverts commit 93cd7b78c29c11ccc87c19c845c6617acb834630.
    
    We need to generate project files for unnamed projects as they seem to
    correspond to libraries. If that causes problems for the msvc
    integration (which seems strange) then we need to handle these problems
    in the MSVC generator and not in the parser.
    
    It also includes:
    
    Revert "Clean trailing whitespace"
    
    This reverts commit 7d92b27aff3b4d1c59aef9866003f4d001c0fc25.

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index c12d48e..4ad7d4b 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -116,25 +116,21 @@ class GbuildParser:
         libmatch = GbuildParser.libpattern.match(line)
         if libmatch:
             libname = self.libnames.get(state.ilib, None)
-            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
+            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)
-            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
+            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: