Bug 157997

Summary:

[cmake] Deduplicate make-js-file-arrays usage and make it work on Windows.

Product:

WebKit

Reporter:

Konstantin Tokarev <annulen>

Component:

Tools / Tests

Assignee:

Nobody <webkit-unassigned>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

achristensen, adam.bergkvist, calvaris, commit-queue, lforschler, mcatanzaro, ossy

Priority:

Version:

WebKit Local Build

Hardware:

Unspecified

OS:

Unspecified

Attachments:

Description	Flags
Patch	none

Description Konstantin Tokarev 2016-05-23 14:26:05 PDT

On Windows setting PYTHONPATH variable requires separate command.

Comment 1 Konstantin Tokarev 2016-05-23 14:28:48 PDT

Created attachment 279584 [details]
Patch

Comment 2 Alex Christensen 2016-05-23 15:28:40 PDT

Comment on attachment 279584 [details]
Patch

WebCore_USER_AGENT_SCRIPTS and WebCore_SDP_PROCESSOR_SCRIPTS aren't used on Windows.  What does this enable?

Comment 3 Alex Christensen 2016-05-23 15:29:56 PDT

Comment on attachment 279584 [details]
Patch

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

> Source/cmake/WebKitMacros.cmake:354
> +macro(MAKE_JS_FILE_ARRAYS _output_cpp _output_h _scripts _scripts_dependencies)

This macro is only used in WebCore/CMakeLists.txt, so there's no reason to share it with other CMakeLists.txt here.

Comment 4 Konstantin Tokarev 2016-05-24 01:13:01 PDT

(In reply to comment #2)
> Comment on attachment 279584 [details]
> Patch
> 
> WebCore_USER_AGENT_SCRIPTS and WebCore_SDP_PROCESSOR_SCRIPTS aren't used on
> Windows.  What does this enable?

I'm using them in downstream port, and I think this is need for sake of completeness. Similar stuff like WebCore_USER_AGENT_STYLE_SHEETS works anywhere because perl supports -I arguments and python doesn't.

It will also be useful if someone decides to restore Windows support in WebKitGTK, or if you later decide to embed user scripts in Windows port instead of loading them from external file.

Comment 5 Alex Christensen 2016-05-25 22:09:27 PDT

Comment on attachment 279584 [details]
Patch

All right.  I guess this doesn't hurt anything.

Comment 6 WebKit Commit Bot 2016-05-25 22:30:34 PDT

Comment on attachment 279584 [details]
Patch

Clearing flags on attachment: 279584

Committed r201413: <http://trac.webkit.org/changeset/201413>

Comment 7 WebKit Commit Bot 2016-05-25 22:30:38 PDT

All reviewed patches have been landed.  Closing bug.