From cc24e7ebd9cf536bad6ae5a9f4983ac9e4e87686 Mon Sep 17 00:00:00 2001 From: Adam Mróz Date: Mon, 10 Feb 2014 19:41:50 +0100 Subject: Fixes for kdevelop IDE integration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Script bin/gbuild-to-ide is parsing messages basing on regular expressions. First problem appears when used language is not English - that's why setting LC_MESSAGES variable in Makefile. Second problem appears with quote symbol. For me (Archlinux) script was not working. After some investigation I found out that reason was that my output from make included ' symbol when regular expression assumed that it should be `. That's why using [\'`]. Example: recipe to execute (from '/home/sadam/libreoffice/core/idlc/Executable_idlc.mk', line 28): Conflicts: bin/gbuild-to-ide Change-Id: I0083c69820bd58ce2ac296f21985408c69840639 Reviewed-on: https://gerrit.libreoffice.org/7979 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara --- bin/gbuild-to-ide | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin/gbuild-to-ide') diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide index 4fa6bd78f1a4..0f08d7123fe9 100755 --- a/bin/gbuild-to-ide +++ b/bin/gbuild-to-ide @@ -70,8 +70,8 @@ class GbuildParser: builddirpattern = re.compile('^BUILDDIR = (.*)') instdirpattern = re.compile('^INSTDIR = (.*)') binpathpattern = re.compile('LS = (.*)ls(.exe)?') - libpattern = re.compile('# [a-z]+ to execute \(from `(.*)/Library_(.*)\.mk\', line [0-9]*\):') - exepattern = re.compile('# [a-z]+ to execute \(from `(.*)/Executable_(.*)\.mk\', line [0-9]*\):') + libpattern = re.compile('# [a-z]+ to execute \(from [\'`](.*)/Library_(.*)\.mk\', line [0-9]*\):') + exepattern = re.compile('# [a-z]+ to execute \(from [\'`](.*)/Executable_(.*)\.mk\', line [0-9]*\):') includepattern = re.compile('# INCLUDE := (.*)') defspattern = re.compile('# DEFS := (.*)') cxxpattern = re.compile('# CXXOBJECTS := (.*)') -- cgit