summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorbrinzing <oliver.brinzing@gmx.de>2015-08-22 21:51:01 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-08-23 06:01:43 +0000
commit93cd7b78c29c11ccc87c19c845c6617acb834630 (patch)
tree0e9e201096777f6b33cf0edd58bf3e25b155d459 /bin
parentfdafa5302df26df4f147b0d2efb6064389a1330c (diff)
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@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/gbuild-to-ide28
1 files changed, 16 insertions, 12 deletions
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 4ad7d4b025ed..865a0b86f773 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: