Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(660)

Issue 14296005: Make the build work with speech-dispatcher >= 0.8. (Closed)

Created:
7 years, 8 months ago by Raphael Kubo da Costa (rakuco)
Modified:
7 years, 8 months ago
CC:
chromium-reviews
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Visibility:
Public.

Description

Make the build work with speech-dispatcher >= 0.8. speech-dispatcher 0.8 has changed the location where the libspeechd.h header file is installed, and users are expected to reference it from the top-level directory, ie. #include <speech-dispatcher/libspeechd.h> Version 0.8 also installs a .pc pkg-config file. Since speech-dispatcher 0.7 is still very widespread, we cannot assume this new structure and .pc file are always available, so resort to adding the "speech-dispatcher/" prefix to the #include based on whether `pkg-config --exists' does not fail. Arguably, we should also start calling `pkg-config --{cflags,libs-only-l,etc}', but not having the .pc file always available would make the changes more complicated. Since everything has worked so far without that, keeping the status quo for now should be fine. BUG= TEST=Build with speech-dispatcher >= 0.8 installed. Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=195204

Patch Set 1 #

Patch Set 2 : Add myself to AUTHORS #

Total comments: 1

Patch Set 3 : Bundle libspeechd.h #

Total comments: 1

Patch Set 4 : Make checklicenses.py pass, update TODO #

Total comments: 2

Patch Set 5 : Fifth time is a charm #

Patch Set 6 : I am already an AUTHOR now #

Unified diffs Side-by-side diffs Delta from patch set Stats (+675 lines, -67 lines) Patch
M build/linux/system.gyp View 1 2 3 4 2 chunks +18 lines, -1 line 0 comments Download
A + third_party/speech-dispatcher/COPYING View 1 2 12 chunks +359 lines, -66 lines 0 comments Download
A third_party/speech-dispatcher/README.chromium View 1 2 3 1 chunk +19 lines, -0 lines 0 comments Download
A third_party/speech-dispatcher/libspeechd.h View 1 2 1 chunk +276 lines, -0 lines 0 comments Download
M tools/checklicenses/checklicenses.py View 1 2 3 4 1 chunk +3 lines, -0 lines 0 comments Download

Messages

Total messages: 31 (0 generated)
Dirk Pranke
I've reuploaded this as https://codereview.chromium.org/14018024 so that I could get try jobs going. I'm not ...
7 years, 8 months ago (2013-04-16 19:04:37 UTC) #1
Paweł Hajdan Jr.
https://codereview.chromium.org/14296005/diff/2001/build/linux/system.gyp File build/linux/system.gyp (right): https://codereview.chromium.org/14296005/diff/2001/build/linux/system.gyp#newcode491 build/linux/system.gyp:491: 'header_prefix': '<!(<(pkg-config) --exists speech-dispatcher && echo "speech-dispatcher/" || echo)', ...
7 years, 8 months ago (2013-04-16 19:23:42 UTC) #2
Raphael Kubo da Costa (rakuco)
On 2013/04/16 19:23:42, Paweł Hajdan Jr. wrote: > but it may encourage actual > automagic ...
7 years, 8 months ago (2013-04-16 20:35:53 UTC) #3
Paweł Hajdan Jr.
On 2013/04/16 20:35:53, Raphael Kubo da Costa (rakuco) wrote: > On 2013/04/16 19:23:42, Paweł Hajdan ...
7 years, 8 months ago (2013-04-16 20:52:17 UTC) #4
Raphael Kubo da Costa (rakuco)
This isn't strictly related to this CL, but here we go. On 2013/04/16 20:52:17, Paweł ...
7 years, 8 months ago (2013-04-16 21:00:50 UTC) #5
Paweł Hajdan Jr.
On 2013/04/16 21:00:50, Raphael Kubo da Costa (rakuco) wrote: > Yes, I have and I ...
7 years, 8 months ago (2013-04-16 21:14:02 UTC) #6
Raphael Kubo da Costa (rakuco)
On 2013/04/16 19:23:42, Paweł Hajdan Jr. wrote: > Please rather use --bundled-header option for generate_library_loader.py ...
7 years, 8 months ago (2013-04-16 22:01:52 UTC) #7
Paweł Hajdan Jr.
On 2013/04/16 22:01:52, Raphael Kubo da Costa (rakuco) wrote: > Oh, one thing that has ...
7 years, 8 months ago (2013-04-16 22:28:16 UTC) #8
Raphael Kubo da Costa (rakuco)
Alright, new patch version up. I'm now shipping a copy of libspeechd.h from speech-dispatcher 0.7.1 ...
7 years, 8 months ago (2013-04-17 09:26:16 UTC) #9
Raphael Kubo da Costa (rakuco)
7 years, 8 months ago (2013-04-17 10:40:04 UTC) #10
Paweł Hajdan Jr.
+dannyb for third_party change Please make sure tools/checklicenses/checklicenses.py passes with this change. https://codereview.chromium.org/14296005/diff/13001/build/linux/system.gyp File build/linux/system.gyp ...
7 years, 8 months ago (2013-04-17 17:30:48 UTC) #11
Raphael Kubo da Costa (rakuco)
On 2013/04/17 17:30:48, Paweł Hajdan Jr. wrote: > +dannyb for third_party change > > Please ...
7 years, 8 months ago (2013-04-17 18:15:42 UTC) #12
cpu_(ooo_6.6-7.5)
lgtm once Daniel oks license.
7 years, 8 months ago (2013-04-17 21:19:26 UTC) #13
Daniel Berlin
I'm okay with this, since nothing here is going to make it into a compiled ...
7 years, 8 months ago (2013-04-17 21:23:00 UTC) #14
Paweł Hajdan Jr.
https://codereview.chromium.org/14296005/diff/20001/build/linux/system.gyp File build/linux/system.gyp (right): https://codereview.chromium.org/14296005/diff/20001/build/linux/system.gyp#newcode513 build/linux/system.gyp:513: '--bundled-header', '"third_party/speech-dispatcher/libspeechd.h"', nit: Please move the second argument to ...
7 years, 8 months ago (2013-04-17 21:42:53 UTC) #15
Raphael Kubo da Costa (rakuco)
All done, and the CQ is finally back.
7 years, 8 months ago (2013-04-18 07:25:15 UTC) #16
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/raphael.kubo.da.costa@intel.com/14296005/26001
7 years, 8 months ago (2013-04-18 07:25:38 UTC) #17
commit-bot: I haz the power
Presubmit check for 14296005-26001 failed and returned exit status 1. INFO:root:Found 6 file(s). Running presubmit ...
7 years, 8 months ago (2013-04-18 07:25:55 UTC) #18
Raphael Kubo da Costa (rakuco)
+thestig for the checklicenses LGTM in case he's up before phajdan.jr
7 years, 8 months ago (2013-04-18 10:39:17 UTC) #19
Paweł Hajdan Jr.
LGTM, thanks for the patch!
7 years, 8 months ago (2013-04-18 17:38:44 UTC) #20
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/raphael.kubo.da.costa@intel.com/14296005/31001
7 years, 8 months ago (2013-04-18 17:40:30 UTC) #21
commit-bot: I haz the power
Sorry for I got bad news for ya. Compile failed with a clobber build on ...
7 years, 8 months ago (2013-04-18 18:00:34 UTC) #22
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/raphael.kubo.da.costa@intel.com/14296005/31001
7 years, 8 months ago (2013-04-18 18:36:28 UTC) #23
commit-bot: I haz the power
Retried try job too often on win7_aura for step(s) browser_tests http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win7_aura&number=30364
7 years, 8 months ago (2013-04-19 00:15:03 UTC) #24
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/raphael.kubo.da.costa@intel.com/14296005/31001
7 years, 8 months ago (2013-04-19 07:48:09 UTC) #25
commit-bot: I haz the power
Change committed as 195204
7 years, 8 months ago (2013-04-19 15:16:07 UTC) #26
sL1pKn07
fail build with use system libspeechd
7 years, 8 months ago (2013-04-22 23:49:51 UTC) #27
sL1pKn07
On 2013/04/22 23:49:51, sL1pKn07 wrote: > fail build with use system libspeechd with: linux_link_libspeechd=1 \ ...
7 years, 8 months ago (2013-04-23 00:02:30 UTC) #28
Lei Zhang
On 2013/04/22 23:49:51, sL1pKn07 wrote: > fail build with use system libspeechd Please file a ...
7 years, 8 months ago (2013-04-23 00:11:49 UTC) #29
Raphael Kubo da Costa (rakuco)
<sL1pKn07@gmail.com> writes: > On 2013/04/22 23:49:51, sL1pKn07 wrote: >> fail build with use system libspeechd ...
7 years, 8 months ago (2013-04-23 09:25:11 UTC) #30
sL1pKn07
7 years, 8 months ago (2013-04-23 16:25:37 UTC) #31
Message was sent while issue was closed.
On 2013/04/23 09:25:11, Raphael Kubo da Costa (rakuco) wrote:
> <mailto:sL1pKn07@gmail.com> writes:
> 
> > On 2013/04/22 23:49:51, sL1pKn07 wrote:
> >> fail build with use system libspeechd
> > In file included from
> > out/Release/obj.target/libspeechd/geni/libspeechd_loader.cc:4:0:
> > ./out/Release/obj/gen/library_loaders/libspeechd.h:7:24: error fatal:
> > libspeechd.h: no such file or directory
> >  #include <libspeechd.h>
> 
> Hmm, too bad the original commit message ended up being picked up.
> 
> From the error message, I assume you have speech-dispatcher 0.8
> installed. If you want to use your system version, you need to set the
> `libspeechd_h_prefix' variable to something like "speech-dispatcher/".

thanks, works!

greetings

Powered by Google App Engine
This is Rietveld 408576698