diff options
| author | Adam Mróz <sadam36@gmail.com> | 2014-02-10 19:41:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-12 13:08:09 +0000 |
| commit | cc24e7ebd9cf536bad6ae5a9f4983ac9e4e87686 (patch) | |
| tree | fb2b5e18e885d8fec17360039324de8c15495fc0 | |
| parent | e79c381f4d4906d5ba6c02bb84b7a40475a5399b (diff) | |
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/7979
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rwxr-xr-x | bin/gbuild-to-ide | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 29d76e190973..503f74acefb8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 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 := (.*)') |