Bug 74981 - Extract BlackBerry CMake arguments from build-webkit into separate function
Summary: Extract BlackBerry CMake arguments from build-webkit into separate function
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Daniel Bates
URL:
Keywords:
Depends on: 74979
Blocks: 74985
  Show dependency treegraph
 
Reported: 2011-12-20 17:27 PST by Daniel Bates
Modified: 2011-12-21 14:56 PST (History)
3 users (show)

See Also:


Attachments
Patch (11.80 KB, patch)
2011-12-20 17:42 PST, Daniel Bates
no flags Details | Formatted Diff | Diff
Patch (12.31 KB, patch)
2011-12-21 11:25 PST, Daniel Bates
rwlbuis: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Daniel Bates 2011-12-20 17:27:37 PST
Towards adding support to only build JavaScriptCore for the BlackBerry port using script Tools/Script/build-jsc, we need to extract the BlackBerry CMake arguments from build-webkit into a separate function so that we can call this function when passing the CMake arguments to webkitdirs::buildCMakeProjectOrExit() from within Tools/Script/build-{webkit, jsc}.
Comment 1 Daniel Bates 2011-12-20 17:42:42 PST
Created attachment 120124 [details]
Patch
Comment 2 Daniel Bates 2011-12-21 11:25:07 PST
Created attachment 120198 [details]
Patch

Updated the patch to integrate with webkitdirs::cmakeBasedPortArguments() following the landing of the patch for bug #74983.
Comment 3 WebKit Review Bot 2011-12-21 11:26:31 PST
Attachment 120198 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9

Updating OpenSource

It seems that I cannot create a rebase-apply directory, and
I wonder if you are in the middle of patch application or another
rebase.  If that is not the case, please
	rm -fr /mnt/git/webkit-style-queue/.git/rebase-apply
and run me again.  I am stopping in case you still have something
valuable there.
rebase refs/remotes/origin/master: command returned error: 1

Died at Tools/Scripts/update-webkit line 158.


If any of these errors are false positives, please file a bug against check-webkit-style.
Comment 4 Rob Buis 2011-12-21 11:51:32 PST
Comment on attachment 120198 [details]
Patch

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

Looks good.

> Tools/Scripts/webkitdirs.pm:932
> +    push @cxxFlags, "-Wl,-rpath-link," . File::Spec->catfile($stageUsrLib, "torch-webkit");

We do not have the torch-webkit directory anymore, this needs to be removed in a follow-up patch.
Comment 5 Daniel Bates 2011-12-21 11:53:49 PST
(In reply to comment #4)
> > Tools/Scripts/webkitdirs.pm:932
> > +    push @cxxFlags, "-Wl,-rpath-link," . File::Spec->catfile($stageUsrLib, "torch-webkit");
> 
> We do not have the torch-webkit directory anymore, this needs to be removed in a follow-up patch.

Will do.
Comment 6 Daniel Bates 2011-12-21 14:56:22 PST
Committed r103461: <http://trac.webkit.org/changeset/103461>