WebKit Bugzilla
Attachment 349724 Details for
Bug 189552
: builtins directory causes name conflict on Python 3
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Updated patch.
rename.patch (text/plain), 21.07 KB, created by
Mike Gorse
on 2018-09-13 19:22:59 PDT
(
hide
)
Description:
Updated patch.
Filename:
MIME Type:
Creator:
Mike Gorse
Created:
2018-09-13 19:22:59 PDT
Size:
21.07 KB
patch
obsolete
>From 2e65c1bd814449b7558adc70bb750d6013e4412a Mon Sep 17 00:00:00 2001 >From: Mike Gorse <mgorse@alum.wpi.edu> >Date: Wed, 12 Sep 2018 16:09:29 -0500 >Subject: [PATCH] Rename builtins to wkbuiltins (webkit#189552) > >--- > Source/JavaScriptCore/CMakeLists.txt | 5 ++-- > Source/JavaScriptCore/ChangeLog | 24 +++++++++++++++++ > Source/JavaScriptCore/DerivedSources.make | 26 +++++++++---------- > .../JavaScriptCore.xcodeproj/project.pbxproj | 12 ++++----- > .../Scripts/generate-js-builtins.py | 2 +- > .../{builtins => wkbuiltins}/__init__.py | 2 +- > .../builtins_generate_combined_header.py | 0 > ...iltins_generate_combined_implementation.py | 0 > ...ltins_generate_internals_wrapper_header.py | 0 > ...nerate_internals_wrapper_implementation.py | 0 > .../builtins_generate_separate_header.py | 0 > ...iltins_generate_separate_implementation.py | 0 > .../builtins_generate_wrapper_header.py | 0 > ...uiltins_generate_wrapper_implementation.py | 0 > .../builtins_generator.py | 0 > .../builtins_model.py | 0 > .../builtins_templates.py | 0 > .../builtins.py => wkbuiltins/wkbuiltins.py} | 2 +- > Source/WebCore/CMakeLists.txt | 2 +- > Source/WebCore/ChangeLog | 12 +++++++++ > Source/WebCore/DerivedSources.make | 2 +- > 21 files changed, 63 insertions(+), 26 deletions(-) > rename Source/JavaScriptCore/Scripts/{builtins => wkbuiltins}/__init__.py (72%) > rename Source/JavaScriptCore/Scripts/{builtins => wkbuiltins}/builtins_generate_combined_header.py (100%) > rename Source/JavaScriptCore/Scripts/{builtins => wkbuiltins}/builtins_generate_combined_implementation.py (100%) > rename Source/JavaScriptCore/Scripts/{builtins => wkbuiltins}/builtins_generate_internals_wrapper_header.py (100%) > rename Source/JavaScriptCore/Scripts/{builtins => wkbuiltins}/builtins_generate_internals_wrapper_implementation.py (100%) > rename Source/JavaScriptCore/Scripts/{builtins => wkbuiltins}/builtins_generate_separate_header.py (100%) > rename Source/JavaScriptCore/Scripts/{builtins => wkbuiltins}/builtins_generate_separate_implementation.py (100%) > rename Source/JavaScriptCore/Scripts/{builtins => wkbuiltins}/builtins_generate_wrapper_header.py (100%) > rename Source/JavaScriptCore/Scripts/{builtins => wkbuiltins}/builtins_generate_wrapper_implementation.py (100%) > rename Source/JavaScriptCore/Scripts/{builtins => wkbuiltins}/builtins_generator.py (100%) > rename Source/JavaScriptCore/Scripts/{builtins => wkbuiltins}/builtins_model.py (100%) > rename Source/JavaScriptCore/Scripts/{builtins => wkbuiltins}/builtins_templates.py (100%) > rename Source/JavaScriptCore/Scripts/{builtins/builtins.py => wkbuiltins/wkbuiltins.py} (87%) > >diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt >index 2fe76195d45..96e33a20577 100644 >--- a/Source/JavaScriptCore/CMakeLists.txt >+++ b/Source/JavaScriptCore/CMakeLists.txt >@@ -136,7 +136,8 @@ set(JavaScriptCore_SCRIPTS_SOURCES_DIR "${JAVASCRIPTCORE_DIR}/Scripts") > set(JavaScriptCore_SCRIPTS_SOURCES_PATHS > ${JavaScriptCore_SCRIPTS_SOURCES_DIR}/*.pl > ${JavaScriptCore_SCRIPTS_SOURCES_DIR}/*.py >- ${JavaScriptCore_SCRIPTS_SOURCES_DIR}/builtins/builtins*.py >+ ${JavaScriptCore_SCRIPTS_SOURCES_DIR}/wkbuiltins/builtins*.py >+ ${JavaScriptCore_SCRIPTS_SOURCES_DIR}/wkbuiltins/wkbuiltins.py > ) > > # Force JavaScriptCore to run scripts from the same staging path as WebCore. >@@ -1088,7 +1089,7 @@ add_custom_command( > # JSCBuiltins > > set(BUILTINS_GENERATOR_SCRIPTS >- ${JavaScriptCore_SCRIPTS_DIR}/builtins.py >+ ${JavaScriptCore_SCRIPTS_DIR}/wkbuiltins.py > ${JavaScriptCore_SCRIPTS_DIR}/builtins_generator.py > ${JavaScriptCore_SCRIPTS_DIR}/builtins_model.py > ${JavaScriptCore_SCRIPTS_DIR}/builtins_templates.py >diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog >index e7d4857a964..4405dd1e97f 100644 >--- a/Source/JavaScriptCore/ChangeLog >+++ b/Source/JavaScriptCore/ChangeLog >@@ -1,3 +1,27 @@ >+2018-09-13 Mike Gorse <mgorse@suse.com> >+ >+ builtins directory causes name conflict on Python 3 >+ https://bugs.webkit.org/show_bug.cgi?id=189552 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * CMakeLists.txt: builtins -> wkbuiltins. >+ * DerivedSources.make: builtins -> wkbuiltins. >+ * Scripts/generate-js-builtins.py: import wkbuiltins, rather than >+ builtins. >+ * Scripts/wkbuiltins/__init__.py: Renamed from Source/JavaScriptCore/Scripts/builtins/__init__.py. >+ * Scripts/wkbuiltins/builtins_generate_combined_header.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_header.py. >+ * Scripts/wkbuiltins/builtins_generate_internals_wrapper_implementation.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py. >+ * Scripts/wkbuiltins/builtins_generate_separate_header.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_header.py. >+ * Scripts/wkbuiltins/builtins_generate_separate_implementation.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_implementation.py. >+ * Scripts/wkbuiltins/builtins_generate_wrapper_header.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generate_wrapper_header.py. >+ * Scripts/wkbuiltins/builtins_generate_wrapper_implementation.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generate_wrapper_implementation.py. >+ * Scripts/wkbuiltins/builtins_generator.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generator.py. >+ * Scripts/wkbuiltins/builtins_model.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_model.py. >+ * Scripts/wkbuiltins/builtins_templates.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_templates.py. >+ * Scripts/wkbuiltins/wkbuiltins.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins.py. >+ * JavaScriptCore.xcodeproj/project.pbxproj: Update for the renaming. >+ > 2018-09-13 Yusuke Suzuki <yusukesuzuki@slowstart.org> > > [WebAssembly] Inline WasmContext accessor functions >diff --git a/Source/JavaScriptCore/DerivedSources.make b/Source/JavaScriptCore/DerivedSources.make >index 6e3b42c931d..d1745c35952 100644 >--- a/Source/JavaScriptCore/DerivedSources.make >+++ b/Source/JavaScriptCore/DerivedSources.make >@@ -73,19 +73,19 @@ all : \ > # JavaScript builtins. > > BUILTINS_GENERATOR_SCRIPTS = \ >- $(JavaScriptCore_SCRIPTS_DIR)/builtins/__init__.py \ >- $(JavaScriptCore_SCRIPTS_DIR)/builtins/builtins.py \ >- $(JavaScriptCore_SCRIPTS_DIR)/builtins/builtins_generator.py \ >- $(JavaScriptCore_SCRIPTS_DIR)/builtins/builtins_model.py \ >- $(JavaScriptCore_SCRIPTS_DIR)/builtins/builtins_templates.py \ >- $(JavaScriptCore_SCRIPTS_DIR)/builtins/builtins_generate_combined_header.py \ >- $(JavaScriptCore_SCRIPTS_DIR)/builtins/builtins_generate_combined_implementation.py \ >- $(JavaScriptCore_SCRIPTS_DIR)/builtins/builtins_generate_separate_header.py \ >- $(JavaScriptCore_SCRIPTS_DIR)/builtins/builtins_generate_separate_implementation.py \ >- ${JavaScriptCore_SCRIPTS_DIR}/builtins/builtins_generate_wrapper_header.py \ >- ${JavaScriptCore_SCRIPTS_DIR}/builtins/builtins_generate_wrapper_implementation.py \ >- ${JavaScriptCore_SCRIPTS_DIR}/builtins/builtins_generate_internals_wrapper_header.py \ >- ${JavaScriptCore_SCRIPTS_DIR}/builtins/builtins_generate_internals_wrapper_implementation.py \ >+ $(JavaScriptCore_SCRIPTS_DIR)/wkbuiltins/__init__.py \ >+ $(JavaScriptCore_SCRIPTS_DIR)/wkbuiltins/wkbuiltins.py \ >+ $(JavaScriptCore_SCRIPTS_DIR)/wkbuiltins/builtins_generator.py \ >+ $(JavaScriptCore_SCRIPTS_DIR)/wkbuiltins/builtins_model.py \ >+ $(JavaScriptCore_SCRIPTS_DIR)/wkbuiltins/builtins_templates.py \ >+ $(JavaScriptCore_SCRIPTS_DIR)/wkbuiltins/builtins_generate_combined_header.py \ >+ $(JavaScriptCore_SCRIPTS_DIR)/wkbuiltins/builtins_generate_combined_implementation.py \ >+ $(JavaScriptCore_SCRIPTS_DIR)/wkbuiltins/builtins_generate_separate_header.py \ >+ $(JavaScriptCore_SCRIPTS_DIR)/wkbuiltins/builtins_generate_separate_implementation.py \ >+ ${JavaScriptCore_SCRIPTS_DIR}/wkbuiltins/builtins_generate_wrapper_header.py \ >+ ${JavaScriptCore_SCRIPTS_DIR}/wkbuiltins/builtins_generate_wrapper_implementation.py \ >+ ${JavaScriptCore_SCRIPTS_DIR}/wkbuiltins/builtins_generate_internals_wrapper_header.py \ >+ ${JavaScriptCore_SCRIPTS_DIR}/wkbuiltins/builtins_generate_internals_wrapper_implementation.py \ > $(JavaScriptCore_SCRIPTS_DIR)/generate-js-builtins.py \ > $(JavaScriptCore_SCRIPTS_DIR)/lazywriter.py \ > # >diff --git a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj >index 70ca84debee..9c5c50c621b 100644 >--- a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj >+++ b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj >@@ -1274,7 +1274,7 @@ > 99DA00A31BD5993100F4575C /* builtins_generator.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA009A1BD5992700F4575C /* builtins_generator.py */; settings = {ATTRIBUTES = (Private, ); }; }; > 99DA00A41BD5993100F4575C /* builtins_model.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA009B1BD5992700F4575C /* builtins_model.py */; settings = {ATTRIBUTES = (Private, ); }; }; > 99DA00A51BD5993100F4575C /* builtins_templates.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA009C1BD5992700F4575C /* builtins_templates.py */; settings = {ATTRIBUTES = (Private, ); }; }; >- 99DA00A61BD5993100F4575C /* builtins.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA009D1BD5992700F4575C /* builtins.py */; settings = {ATTRIBUTES = (Private, ); }; }; >+ 99DA00A61BD5993100F4575C /* wkbuiltins.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA009D1BD5992700F4575C /* wkbuiltins.py */; settings = {ATTRIBUTES = (Private, ); }; }; > 99DA00A71BD5993100F4575C /* builtins_generate_combined_header.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA009E1BD5992700F4575C /* builtins_generate_combined_header.py */; settings = {ATTRIBUTES = (Private, ); }; }; > 99DA00A81BD5993100F4575C /* builtins_generate_combined_implementation.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA009F1BD5992700F4575C /* builtins_generate_combined_implementation.py */; settings = {ATTRIBUTES = (Private, ); }; }; > 99DA00A91BD5993100F4575C /* builtins_generate_separate_header.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA00A01BD5992700F4575C /* builtins_generate_separate_header.py */; settings = {ATTRIBUTES = (Private, ); }; }; >@@ -3948,7 +3948,7 @@ > 99DA009A1BD5992700F4575C /* builtins_generator.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins_generator.py; sourceTree = "<group>"; }; > 99DA009B1BD5992700F4575C /* builtins_model.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins_model.py; sourceTree = "<group>"; }; > 99DA009C1BD5992700F4575C /* builtins_templates.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins_templates.py; sourceTree = "<group>"; }; >- 99DA009D1BD5992700F4575C /* builtins.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins.py; sourceTree = "<group>"; }; >+ 99DA009D1BD5992700F4575C /* wkbuiltins.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = wkbuiltins.py; sourceTree = "<group>"; }; > 99DA009E1BD5992700F4575C /* builtins_generate_combined_header.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins_generate_combined_header.py; sourceTree = "<group>"; }; > 99DA009F1BD5992700F4575C /* builtins_generate_combined_implementation.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins_generate_combined_implementation.py; sourceTree = "<group>"; }; > 99DA00A01BD5992700F4575C /* builtins_generate_separate_header.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins_generate_separate_header.py; sourceTree = "<group>"; }; >@@ -7826,11 +7826,11 @@ > path = Scripts; > sourceTree = "<group>"; > }; >- 99DA00971BD598E000F4575C /* builtins */ = { >+ 99DA00971BD598E000F4575C /* wkbuiltins */ = { > isa = PBXGroup; > children = ( > 99DA00991BD5992700F4575C /* __init__.py */, >- 99DA009D1BD5992700F4575C /* builtins.py */, >+ 99DA009D1BD5992700F4575C /* wkbuiltins.py */, > 99DA009E1BD5992700F4575C /* builtins_generate_combined_header.py */, > 99DA009F1BD5992700F4575C /* builtins_generate_combined_implementation.py */, > 412952731D2CF6AC00E78B89 /* builtins_generate_internals_wrapper_header.py */, >@@ -7843,7 +7843,7 @@ > 99DA009B1BD5992700F4575C /* builtins_model.py */, > 99DA009C1BD5992700F4575C /* builtins_templates.py */, > ); >- path = builtins; >+ path = wkbuiltins; > sourceTree = "<group>"; > }; > A513E5CC185FB992007E95AD /* agents */ = { >@@ -8439,7 +8439,7 @@ > DE26E9031CB5DD0500D2BE82 /* BuiltinExecutableCreator.h in Headers */, > A7D801A51880D66E0026C39B /* BuiltinExecutables.h in Headers */, > A75EE9B218AAB7E200AAD043 /* BuiltinNames.h in Headers */, >- 99DA00A61BD5993100F4575C /* builtins.py in Headers */, >+ 99DA00A61BD5993100F4575C /* wkbuiltins.py in Headers */, > 99DA00A71BD5993100F4575C /* builtins_generate_combined_header.py in Headers */, > 99DA00A81BD5993100F4575C /* builtins_generate_combined_implementation.py in Headers */, > 412952771D2CF6BC00E78B89 /* builtins_generate_internals_wrapper_header.py in Headers */, >diff --git a/Source/JavaScriptCore/Scripts/generate-js-builtins.py b/Source/JavaScriptCore/Scripts/generate-js-builtins.py >index c3e498a95eb..48a9bb049c1 100644 >--- a/Source/JavaScriptCore/Scripts/generate-js-builtins.py >+++ b/Source/JavaScriptCore/Scripts/generate-js-builtins.py >@@ -37,7 +37,7 @@ log = logging.getLogger('global') > > from lazywriter import LazyFileWriter > >-from builtins import * >+from wkbuiltins import * > > > def concatenated_output_filename(builtins_files, framework_name, generate_only_wrapper_files): >diff --git a/Source/JavaScriptCore/Scripts/builtins/__init__.py b/Source/JavaScriptCore/Scripts/wkbuiltins/__init__.py >similarity index 72% >rename from Source/JavaScriptCore/Scripts/builtins/__init__.py >rename to Source/JavaScriptCore/Scripts/wkbuiltins/__init__.py >index fdfcba981d8..d6f9329b2b4 100644 >--- a/Source/JavaScriptCore/Scripts/builtins/__init__.py >+++ b/Source/JavaScriptCore/Scripts/wkbuiltins/__init__.py >@@ -1,3 +1,3 @@ > # Required for Python to search this directory for module files > >-from builtins import * >+from wkbuiltins import * >diff --git a/Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_header.py b/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_combined_header.py >similarity index 100% >rename from Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_header.py >rename to Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_combined_header.py >diff --git a/Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_implementation.py b/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_combined_implementation.py >similarity index 100% >rename from Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_implementation.py >rename to Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_combined_implementation.py >diff --git a/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_header.py b/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_internals_wrapper_header.py >similarity index 100% >rename from Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_header.py >rename to Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_internals_wrapper_header.py >diff --git a/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py b/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_internals_wrapper_implementation.py >similarity index 100% >rename from Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py >rename to Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_internals_wrapper_implementation.py >diff --git a/Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_header.py b/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_separate_header.py >similarity index 100% >rename from Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_header.py >rename to Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_separate_header.py >diff --git a/Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_implementation.py b/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_separate_implementation.py >similarity index 100% >rename from Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_implementation.py >rename to Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_separate_implementation.py >diff --git a/Source/JavaScriptCore/Scripts/builtins/builtins_generate_wrapper_header.py b/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_wrapper_header.py >similarity index 100% >rename from Source/JavaScriptCore/Scripts/builtins/builtins_generate_wrapper_header.py >rename to Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_wrapper_header.py >diff --git a/Source/JavaScriptCore/Scripts/builtins/builtins_generate_wrapper_implementation.py b/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_wrapper_implementation.py >similarity index 100% >rename from Source/JavaScriptCore/Scripts/builtins/builtins_generate_wrapper_implementation.py >rename to Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_wrapper_implementation.py >diff --git a/Source/JavaScriptCore/Scripts/builtins/builtins_generator.py b/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generator.py >similarity index 100% >rename from Source/JavaScriptCore/Scripts/builtins/builtins_generator.py >rename to Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generator.py >diff --git a/Source/JavaScriptCore/Scripts/builtins/builtins_model.py b/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_model.py >similarity index 100% >rename from Source/JavaScriptCore/Scripts/builtins/builtins_model.py >rename to Source/JavaScriptCore/Scripts/wkbuiltins/builtins_model.py >diff --git a/Source/JavaScriptCore/Scripts/builtins/builtins_templates.py b/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_templates.py >similarity index 100% >rename from Source/JavaScriptCore/Scripts/builtins/builtins_templates.py >rename to Source/JavaScriptCore/Scripts/wkbuiltins/builtins_templates.py >diff --git a/Source/JavaScriptCore/Scripts/builtins/builtins.py b/Source/JavaScriptCore/Scripts/wkbuiltins/wkbuiltins.py >similarity index 87% >rename from Source/JavaScriptCore/Scripts/builtins/builtins.py >rename to Source/JavaScriptCore/Scripts/wkbuiltins/wkbuiltins.py >index a9aff2b1cff..1570aff15d6 100644 >--- a/Source/JavaScriptCore/Scripts/builtins/builtins.py >+++ b/Source/JavaScriptCore/Scripts/wkbuiltins/wkbuiltins.py >@@ -1,4 +1,4 @@ >-# This file is used to simulate the builtins/ directory when generate-js-builtins.py >+# This file is used to simulate the wkbuiltins/ directory when generate-js-builtins.py > # is run from JavaScriptCore framework's private headers directory, which is flattened. > > from builtins_model import * >diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt >index b6ae949aa86..29cef4ab896 100644 >--- a/Source/WebCore/CMakeLists.txt >+++ b/Source/WebCore/CMakeLists.txt >@@ -1870,7 +1870,7 @@ set(WebCore_BUILTINS_SOURCES > ) > > set(BUILTINS_GENERATOR_SCRIPTS >- ${JavaScriptCore_SCRIPTS_DIR}/builtins.py >+ ${JavaScriptCore_SCRIPTS_DIR}/wkbuiltins.py > ${JavaScriptCore_SCRIPTS_DIR}/builtins_generator.py > ${JavaScriptCore_SCRIPTS_DIR}/builtins_model.py > ${JavaScriptCore_SCRIPTS_DIR}/builtins_templates.py >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 02b4b6b8688..02908c9b13b 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,15 @@ >+2018-09-12 Mike Gorse <mgorse@suse.com> >+ >+ builtins directory causes name conflict on Python 3 >+ https://bugs.webkit.org/show_bug.cgi?id=189552 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ No new tests (No behavior change). >+ >+ * CMakeLists.txt: builtins -> wkbuiltins. >+ * DerivedSources.make: builtins -> wkbuiltins. >+ > 2018-09-13 Megan Gardner <megan_gardner@apple.com> > > Fix color stop blending in conic gradients for stops past 1 >diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make >index 92cc15b5344..e6a427de4ed 100644 >--- a/Source/WebCore/DerivedSources.make >+++ b/Source/WebCore/DerivedSources.make >@@ -1550,7 +1550,7 @@ WebCore_BUILTINS_SOURCES = \ > # > > BUILTINS_GENERATOR_SCRIPTS = \ >- $(JavaScriptCore_SCRIPTS_DIR)/builtins.py \ >+ $(JavaScriptCore_SCRIPTS_DIR)/wkbuiltins.py \ > $(JavaScriptCore_SCRIPTS_DIR)/builtins_generator.py \ > $(JavaScriptCore_SCRIPTS_DIR)/builtins_model.py \ > $(JavaScriptCore_SCRIPTS_DIR)/builtins_templates.py \ >-- >2.18.0 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 189552
:
349579
| 349724