Bug 136955

Summary:

Web Inspector: Remove UserInterface/Images/gtk from Apple builds

Product:

WebKit

Reporter:

Timothy Hatcher <timothy>

Component:

Web Inspector

Assignee:

Timothy Hatcher <timothy>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

commit-queue, graouts, joepeck, timothy, webkit-bug-importer

Priority:

Keywords:

InRadar

Version:

528+ (Nightly build)

Hardware:

All

OS:

All

Attachments:

Description	Flags
Patch	none

Description Timothy Hatcher 2014-09-19 10:24:05 PDT

We should remove the newly added UserInterface/Images/gtk folder from Apple's Mac and Windows builds.

Comment 1 Radar WebKit Bug Importer 2014-09-19 10:24:23 PDT

<rdar://problem/18395443>

Comment 2 Timothy Hatcher 2014-09-23 13:14:22 PDT

Created attachment 238564 [details]
Patch

Comment 3 Joseph Pecoraro 2014-09-23 13:30:48 PDT

Comment on attachment 238564 [details]
Patch

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

r=me

> Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl:185
> +    remove_tree(File::Spec->catdir($targetResourcePath, 'Images', 'gtk')) if defined $ENV{'MAC_OS_X_VERSION_MAJOR'} or defined $ENV{'OFFICIAL_BUILD'};

I feel like it would be cleaner if we checked some ENV variable like:

    export OS=MACOS
    export PLATFORM_NAME=macosx

But, I'm not sure what other OSes have set for their ENV variables when running this build phase so this is probably fine.

Comment 4 WebKit Commit Bot 2014-09-23 14:08:48 PDT

Comment on attachment 238564 [details]
Patch

Clearing flags on attachment: 238564

Committed r173889: <http://trac.webkit.org/changeset/173889>

Comment 5 WebKit Commit Bot 2014-09-23 14:08:50 PDT

All reviewed patches have been landed.  Closing bug.