Generate debugger MOCs on the fly

Generate debugger MOCs on the fly

Added gyp rules to generate Qt MOC files at build time, and removed the pre-packaged versions.

Tested on Mac with Qt 4.6.4 & 4.8.3, and on Linux with Qt 4.8.1.

R=caryclark@google.com,robertphillips@google.com,djsollen@google.com
BUG=

Committed: https://code.google.com/p/skia/source/detail?r=5707

[caryclark1, 2012-09-26 18:50:38]

LGTM

[DerekS, 2012-09-26 19:02:08]

https://codereview.appspot.com/6561054/diff/2001/gyp/debugger.gyp
File gyp/debugger.gyp (right):

https://codereview.appspot.com/6561054/diff/2001/gyp/debugger.gyp#newcode68
gyp/debugger.gyp:68: 'error': '<!(debugger unsupported with skia_os=<(skia_os))'
this will trigger every time you run gyp with the ios target even if you never
run "make debugger".

[DerekS, 2012-09-26 19:51:32]

https://codereview.appspot.com/6561054/diff/2001/gyp/debugger.gyp
File gyp/debugger.gyp (right):

https://codereview.appspot.com/6561054/diff/2001/gyp/debugger.gyp#newcode4
gyp/debugger.gyp:4: [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris",
"android"]', {
make android an exclusion

[fmalita, 2012-09-26 21:08:05]

Updated to exclude the debugger dependency from the top level gyp for iOS,
Android and 32-bit Mac builds.

[DerekS, 2012-09-27 12:57:41]

lgtm with 1 nit.

https://codereview.appspot.com/6561054/diff/8001/gyp/debugger.gyp
File gyp/debugger.gyp (right):

https://codereview.appspot.com/6561054/diff/8001/gyp/debugger.gyp#newcode40
gyp/debugger.gyp:40: '<(qt_sdk)/QtOpenGL.framework/Headers/',
as a note I think we can possibly remove these 3 lines and the corresponding
ones on other platforms if we were to update our code to always put
QtCore/QtGui/QtOpenGL when we include those files from our source.

I'm not proposing we do that in this CL, but it would remove some redundancy in
the future.

https://codereview.appspot.com/6561054/diff/8001/skia.gyp
File skia.gyp (right):

https://codereview.appspot.com/6561054/diff/8001/skia.gyp#newcode32
skia.gyp:32: ['skia_os != "ios" and skia_os != "android"', {
why not...

'skia_os != "ios" and skia_os != "android" and (skia_os != "mac" or
skia_arch_width == 64)'

instead of 2 conditions.

[fmalita, 2012-09-27 13:26:43]

https://codereview.appspot.com/6561054/diff/8001/gyp/debugger.gyp
File gyp/debugger.gyp (right):

https://codereview.appspot.com/6561054/diff/8001/gyp/debugger.gyp#newcode40
gyp/debugger.gyp:40: '<(qt_sdk)/QtOpenGL.framework/Headers/',
On 2012/09/27 12:57:41, DerekS wrote:
> as a note I think we can possibly remove these 3 lines and the corresponding
> ones on other platforms if we were to update our code to always put
> QtCore/QtGui/QtOpenGL when we include those files from our source.
> 
> I'm not proposing we do that in this CL, but it would remove some redundancy
in
> the future.

Agreed.

https://codereview.appspot.com/6561054/diff/8001/skia.gyp
File skia.gyp (right):

https://codereview.appspot.com/6561054/diff/8001/skia.gyp#newcode32
skia.gyp:32: ['skia_os != "ios" and skia_os != "android"', {
On 2012/09/27 12:57:41, DerekS wrote:
> why not...
> 
> 'skia_os != "ios" and skia_os != "android" and (skia_os != "mac" or
> skia_arch_width == 64)'
> 
> instead of 2 conditions.

That was my first choice also, but I must have botched the syntax (compared to
string 64?) because I ended up thinking that gyp conditions don't support
parenthesized subexpressions. Seems to work fine though, thanks.

[DerekS, 2012-09-27 13:45:35]

lgtm.

Thanks for doing this!