Kaydet (Commit) cc24e7eb authored tarafından Adam Mróz's avatar Adam Mróz Kaydeden (comit) Caolán McNamara

Fixes for kdevelop IDE integration

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/7979Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst e79c381f
......@@ -330,7 +330,7 @@ dump-deps-png:
define gb_Top_GbuildToIdeIntegration
$(1)-ide-integration:
cd $(SRCDIR) && ($(GNUMAKE) cmd="$(GNUMAKE) -npf Makefile.gbuild all" cmd || true) | $(SRCDIR)/bin/gbuild-to-ide --ide $(1)
cd $(SRCDIR) && (LC_MESSAGES=C $(GNUMAKE) cmd="$(GNUMAKE) -npf Makefile.gbuild all" cmd || true) | $(SRCDIR)/bin/gbuild-to-ide --ide $(1)
endef
......
......@@ -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 := (.*)')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment