[chromium] making DumpRenderTree_resources a separate bundle breaks xcode

[Dirk Pranke]

[chromium] making DumpRenderTree_resources a separate bundle breaks xcode

[Dirk Pranke]

Created attachment 191637 [details]
Patch

[Dirk Pranke]

Committed r144866: <http://trac.webkit.org/changeset/144866>

[Dirk Pranke]

See the preceding patch in bug 111504 / r144863 .

Nico, what's the right thing to do here?

[Dirk Pranke]

argh ... I didn't actually comment out the line. Fixing.

[Dirk Pranke]

Reopening to attach new patch.

[Dirk Pranke]

Created attachment 191639 [details]
Patch

[Dirk Pranke]

Committed r144867: <http://trac.webkit.org/changeset/144867>

[Dirk Pranke]

leaving open until nico can weigh in or I revert it (and nico can still weigh in).

[Nico Weber]

Comment on attachment 191639 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=191639&action=review

> Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:396
> +                # 'process_outputs_as_mac_bundle_resources': 1,

If it's not enabled, the repacked resources probably aren't copied into the DumpRenderTree.app bundle, right?

On my system:

$ find out/Release/DumpRenderTree.app -name '*.pak'
out/Release/DumpRenderTree.app/Contents/Resources/DumpRenderTree.pak

If you do `rm -rf out/Release/DumpRenderTree.app; ninja -C out/Release DumpRenderTree` and run the above find again, I'm guessing the pak file won't be found any more (which probably means resources won't load).

You might not see this immediately if you use ninja because it doesn't remove resource files from produced bundles, but if you blow away the .app before rebuilding it should be just as visible with ninja as it is with xcode.

[Tony Chang]

I think there are a couple options here.  We could either add:

['OS=="mac"', {
  'all_dependent_settings': {
    'mac_bundle_resources': [
      '<(PRODUCT_DIR)/DumpRenderTree.pak'
    ]
  }
]

Like we have in TestRunner_resources or we could inline DumpRenderTree_resources into the DumpRenderTree target and uncomment the 'process_outputs_as_mac_bundle_resources':1 line.  The former might be better so we can fix bug 111508, but I haven't tested it.

[Tony Chang]

Created attachment 191802 [details]
Patch

[Tony Chang]

Here's my try job: http://build.chromium.org/p/tryserver.chromium/builders/mac_layout_rel/builds/1167

If you click on compile and search for DumpRenderTree.pak, you can see it being copied into DumpRenderTree.app:

CpResource ../../../../../xcodebuild/Release/DumpRenderTree.pak ../../../../../xcodebuild/Release/DumpRenderTree.app/Contents/Resources/DumpRenderTree.pak
    cd /Volumes/data/b/build/slave/mac_layout/build/src/third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp
    builtin-copy -exclude .DS_Store -exclude CVS -exclude .svn -exclude .git -exclude .hg -strip-debug-symbols -resolve-src-symlinks /Volumes/data/b/build/slave/mac_layout/build/src/third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/../../../../../xcodebuild/Release/DumpRenderTree.pak /Volumes/data/b/build/slave/mac_layout/build/src/third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/../../../../../xcodebuild/Release/DumpRenderTree.app/Contents/Resources

[Dirk Pranke]

Comment on attachment 191802 [details]
Patch

This seems like the right way to do things. Nice!

[WebKit Review Bot]

Comment on attachment 191802 [details]
Patch

Clearing flags on attachment: 191802

Committed r144966: <http://trac.webkit.org/changeset/144966>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.