Add support for iOS Frameworks with header maps.

Add support for iOS Frameworks with header maps.

iOS frameworks have a different output structure with normal
frameworks, and often require header maps.

BUG=583736
R=sdefresne@chromium.org

Committed: https://chromium.googlesource.com/external/gyp/+/133eaf70b3720b7413017ef3f9c42f6811ef9347

[justincohen, 2016-02-29 19:18:45]

Description was changed from

==========
iOS Framework hmap support

BUG=
==========

to

==========
iOS Frameworks with .hmap support

BUG=
==========

[justincohen, 2016-03-11 19:46:41]

Description was changed from

==========
iOS Frameworks with .hmap support

BUG=
==========

to

==========
Add support for iOS Frameworks with header maps.

iOS frameworks have a different output structure with normal 
frameworks, and often require header maps.

BUG=
==========

[justincohen, 2016-03-11 19:48:15]

justincohen@chromium.org changed reviewers:
+ sdefresne@chromium.org

[justincohen, 2016-03-11 19:48:15]

wdyt?

[sdefresne, 2016-03-15 14:14:33]

L-G-T-M

I don't think there would be any problem implementing this with gn (should be
just a couple of templates and using get_path_info).

https://codereview.chromium.org/1745173002/diff/120001/pylib/gyp/mac_tool.py
File pylib/gyp/mac_tool.py (right):

https://codereview.chromium.org/1745173002/diff/120001/pylib/gyp/mac_tool.py#...
pylib/gyp/mac_tool.py:640: def _next_greater_power_of_2(self, x):
This does not need to be an instance method, can be a free function. Please
rename to NextGreaterPowerOf2 to respect naming convention (Google != Python).

https://codereview.chromium.org/1745173002/diff/120001/pylib/gyp/mac_tool.py#...
pylib/gyp/mac_tool.py:643: def _writeHmap(self, output_name, filelist):
This does not need to be an instance method, can be a free function. Please
rename to WriteHmap to respect naming convention (Google != Python). Please add
docstring to explain what this does (and how you found how to implement, you can
say this is based on inspecting the output of xcodebuild version x.y.z).

[justincohen, 2016-03-17 02:49:05]

justincohen@chromium.org changed reviewers:
+ thakis@chromium.org

[justincohen, 2016-03-17 02:49:06]

added unit tests, ptal!

https://codereview.chromium.org/1745173002/diff/120001/pylib/gyp/mac_tool.py
File pylib/gyp/mac_tool.py (right):

https://codereview.chromium.org/1745173002/diff/120001/pylib/gyp/mac_tool.py#...
pylib/gyp/mac_tool.py:640: def _next_greater_power_of_2(self, x):
On 2016/03/15 14:14:33, sdefresne wrote:
> This does not need to be an instance method, can be a free function. Please
> rename to NextGreaterPowerOf2 to respect naming convention (Google != Python).

Done.

https://codereview.chromium.org/1745173002/diff/120001/pylib/gyp/mac_tool.py#...
pylib/gyp/mac_tool.py:643: def _writeHmap(self, output_name, filelist):
On 2016/03/15 14:14:33, sdefresne wrote:
> This does not need to be an instance method, can be a free function. Please
> rename to WriteHmap to respect naming convention (Google != Python). Please
add
> docstring to explain what this does (and how you found how to implement, you
can
> say this is based on inspecting the output of xcodebuild version x.y.z).

Done.

[sdefresne, 2016-03-18 15:59:00]

lgtm with nits/comments

https://codereview.chromium.org/1745173002/diff/160001/pylib/gyp/mac_tool.py
File pylib/gyp/mac_tool.py (right):

https://codereview.chromium.org/1745173002/diff/160001/pylib/gyp/mac_tool.py#...
pylib/gyp/mac_tool.py:345: shutil.copy2(header, os.path.join(header_path,
os.path.basename(header)))
nit: why do you need copy2? Is it really important to copy attributes too?

https://codereview.chromium.org/1745173002/diff/160001/pylib/gyp/mac_tool.py#...
pylib/gyp/mac_tool.py:644: print "hi"
Debug?

https://codereview.chromium.org/1745173002/diff/160001/test/ios/framework/iOS...
File test/ios/framework/iOSFramework/iOSFramework.h (right):

https://codereview.chromium.org/1745173002/diff/160001/test/ios/framework/iOS...
test/ios/framework/iOSFramework/iOSFramework.h:4: FOUNDATION_EXPORT double
iOSFrameworkVersionNumber;
Can you define your own export macros instead of reusing those from
Foundation/Foundation.h.

See
https://code.google.com/p/chromium/codesearch#chromium/src/base/base_export.h...
for an example (you can probably remove all Win32 support).

https://codereview.chromium.org/1745173002/diff/160001/test/ios/gyptest-frame...
File test/ios/gyptest-framework.py (right):

https://codereview.chromium.org/1745173002/diff/160001/test/ios/gyptest-frame...
test/ios/gyptest-framework.py:3: # Copyright (c) 2016 Google Inc. All rights
reserved.
nit: remove "(c)"

[sdefresne, 2016-03-18 15:59:42]

Can you update BUG=? I guess we can point to the bug to integrate EG in Chromium
at least.

[Nico, 2016-03-18 18:35:08]

If sdefresne and you like this, go ahead and land, that's good enough for me :-)

[justincohen, 2016-03-19 03:50:35]

Description was changed from

==========
Add support for iOS Frameworks with header maps.

iOS frameworks have a different output structure with normal 
frameworks, and often require header maps.

BUG=
==========

to

==========
Add support for iOS Frameworks with header maps.

iOS frameworks have a different output structure with normal 
frameworks, and often require header maps.

BUG=583736
==========

[justincohen, 2016-03-19 03:57:00]

https://codereview.chromium.org/1745173002/diff/160001/pylib/gyp/mac_tool.py
File pylib/gyp/mac_tool.py (right):

https://codereview.chromium.org/1745173002/diff/160001/pylib/gyp/mac_tool.py#...
pylib/gyp/mac_tool.py:345: shutil.copy2(header, os.path.join(header_path,
os.path.basename(header)))
On 2016/03/18 15:59:00, sdefresne wrote:
> nit: why do you need copy2? Is it really important to copy attributes too?

Done.

https://codereview.chromium.org/1745173002/diff/160001/pylib/gyp/mac_tool.py#...
pylib/gyp/mac_tool.py:644: print "hi"
On 2016/03/18 15:59:00, sdefresne wrote:
> Debug?

oooof.

https://codereview.chromium.org/1745173002/diff/160001/test/ios/framework/iOS...
File test/ios/framework/iOSFramework/iOSFramework.h (right):

https://codereview.chromium.org/1745173002/diff/160001/test/ios/framework/iOS...
test/ios/framework/iOSFramework/iOSFramework.h:4: FOUNDATION_EXPORT double
iOSFrameworkVersionNumber;
On 2016/03/18 15:59:00, sdefresne wrote:
> Can you define your own export macros instead of reusing those from
> Foundation/Foundation.h.
> 
> See
>
https://code.google.com/p/chromium/codesearch#chromium/src/base/base_export.h...
> for an example (you can probably remove all Win32 support).

This is a template file generated by Xcode based on the framework name
(iOSFramework).  I'm going to leave as is since this is exactly what Xcode does.

https://codereview.chromium.org/1745173002/diff/160001/test/ios/gyptest-frame...
File test/ios/gyptest-framework.py (right):

https://codereview.chromium.org/1745173002/diff/160001/test/ios/gyptest-frame...
test/ios/gyptest-framework.py:3: # Copyright (c) 2016 Google Inc. All rights
reserved.
On 2016/03/18 15:59:00, sdefresne wrote:
> nit: remove "(c)"

Done.

[justincohen, 2016-03-20 23:43:14]

Description was changed from

==========
Add support for iOS Frameworks with header maps.

iOS frameworks have a different output structure with normal 
frameworks, and often require header maps.

BUG=583736
==========

to

==========
Add support for iOS Frameworks with header maps.

iOS frameworks have a different output structure with normal
frameworks, and often require header maps.

BUG=583736
R=sdefresne@chromium.org

Committed:
https://chromium.googlesource.com/external/gyp/+/133eaf70b3720b7413017ef3f9c4...
==========

[justincohen, 2016-03-20 23:43:15]

Committed patchset #13 (id:240001) manually as
133eaf70b3720b7413017ef3f9c42f6811ef9347 (presubmit successful).

[nicholss, 2016-03-31 16:05:10]

On 2016/03/20 23:43:15, justincohen wrote:
> Committed patchset #13 (id:240001) manually as
> 133eaf70b3720b7413017ef3f9c42f6811ef9347 (presubmit successful).

This change seems to break my build in the following way:

________ running '/usr/bin/python src/build/gyp_chromium' in
'/Users/nicholss/chromoting/ios'
Updating projects from gyp files...
Traceback (most recent call last):
  File "src/build/gyp_chromium", line 12, in <module>
    execfile(__file__ + '.py')
  File "src/build/gyp_chromium.py", line 340, in <module>
    sys.exit(main())
  File "src/build/gyp_chromium.py", line 327, in main
    gyp_rc = gyp.main(args)
  File "/Users/nicholss/chromoting/ios/src/tools/gyp/pylib/gyp/__init__.py",
line 538, in main
    return gyp_main(args)
  File "/Users/nicholss/chromoting/ios/src/tools/gyp/pylib/gyp/__init__.py",
line 523, in gyp_main
    generator.GenerateOutput(flat_list, targets, data, params)
  File
"/Users/nicholss/chromoting/ios/src/tools/gyp/pylib/gyp/generator/ninja.py",
line 2468, in GenerateOutput
    pool.map(CallGenerateOutputForConfig, arglists)
  File
"/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/multiprocessing/pool.py",
line 251, in map
    return self.map_async(func, iterable, chunksize).get()
  File
"/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/multiprocessing/pool.py",
line 567, in get
    raise self._value
KeyError: 'mac_framework_headers'
Error: Command '/usr/bin/python src/build/gyp_chromium' returned non-zero exit
status 1 in /Users/nicholss/chromoting/ios



My build is remoting, iOS app.

[Nico, 2016-03-31 16:17:03]

https://codereview.chromium.org/1745173002/diff/240001/pylib/gyp/generator/ni...
File pylib/gyp/generator/ninja.py (right):

https://codereview.chromium.org/1745173002/diff/240001/pylib/gyp/generator/ni...
pylib/gyp/generator/ninja.py:780: copy_headers = spec['mac_framework_headers']
I guess this and the thing above need to be .get() calls instead

[justincohen, 2016-03-31 16:20:06]

I'll update, although I'm curious how an iOS framework can ship without headers.
 Is that allowed?