Attachment 349579 Details for Bug 189552 – Proposed patch.

[patch] Proposed patch.

rename.patch (text/plain), 22.81 KB, created by Mike Gorse on 2018-09-12 14:15:53 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Gorse

Created: 2018-09-12 14:15:53 PDT

Size: 22.81 KB

patch

obsolete

>From 37aefc44ee7e7e3c40d208aae4f99f46c5c91e9c 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               | 146 ++++++++++++++++++
> Source/JavaScriptCore/DerivedSources.make     |  26 ++--
> .../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 +-
> 20 files changed, 179 insertions(+), 20 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 9305648c558..cdf6da66cc6 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 38c6e670298..66fac5e3d80 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,149 @@
>+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!).
>+
>+        * 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.
>+        (BuiltinsCombinedHeaderGenerator):
>+        (BuiltinsCombinedHeaderGenerator.__init__):
>+        (BuiltinsCombinedHeaderGenerator.output_filename):
>+        (BuiltinsCombinedHeaderGenerator.generate_output):
>+        (BuiltinsCombinedHeaderGenerator.generate_forward_declarations):
>+        (FunctionExecutable):
>+        (VM):
>+        (ConstructAbility):
>+        (generate_section_for_object):
>+        (generate_externs_for_object):
>+        (generate_macros_for_object):
>+        (generate_section_for_code_table_macro):
>+        (generate_section_for_code_name_macro):
>+        (generate_section_for_global_private_code_name_macro):
>+        * Scripts/wkbuiltins/builtins_generate_combined_implementation.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_implementation.py.
>+        (BuiltinsCombinedImplementationGenerator):
>+        (BuiltinsCombinedImplementationGenerator.__init__):
>+        (BuiltinsCombinedImplementationGenerator.output_filename):
>+        (BuiltinsCombinedImplementationGenerator.generate_output):
>+        (BuiltinsCombinedImplementationGenerator.generate_secondary_header_includes):
>+        * Scripts/wkbuiltins/builtins_generate_internals_wrapper_header.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_header.py.
>+        (BuiltinsInternalsWrapperHeaderGenerator):
>+        (BuiltinsInternalsWrapperHeaderGenerator.__init__):
>+        (BuiltinsInternalsWrapperHeaderGenerator.output_filename):
>+        (BuiltinsInternalsWrapperHeaderGenerator.generate_output):
>+        (BuiltinsInternalsWrapperHeaderGenerator.generate_secondary_header_includes):
>+        (BuiltinsInternalsWrapperHeaderGenerator.generate_section_for_object):
>+        (BuiltinsInternalsWrapperHeaderGenerator.generate_section_for_object.JSDOMGlobalObject):
>+        (BuiltinsInternalsWrapperHeaderGenerator.accessor_name):
>+        (BuiltinsInternalsWrapperHeaderGenerator.member_name):
>+        (BuiltinsInternalsWrapperHeaderGenerator.member_type):
>+        (BuiltinsInternalsWrapperHeaderGenerator.generate_methods):
>+        * Scripts/wkbuiltins/builtins_generate_internals_wrapper_implementation.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py.
>+        (BuiltinsInternalsWrapperImplementationGenerator):
>+        (BuiltinsInternalsWrapperImplementationGenerator.__init__):
>+        (BuiltinsInternalsWrapperImplementationGenerator.output_filename):
>+        (BuiltinsInternalsWrapperImplementationGenerator.generate_output):
>+        (BuiltinsInternalsWrapperImplementationGenerator.generate_secondary_header_includes):
>+        (BuiltinsInternalsWrapperImplementationGenerator.generate_section_for_object):
>+        (BuiltinsInternalsWrapperImplementationGenerator.accessor_name):
>+        (BuiltinsInternalsWrapperImplementationGenerator.member_name):
>+        (BuiltinsInternalsWrapperImplementationGenerator.member_type):
>+        (BuiltinsInternalsWrapperImplementationGenerator.generate_constructor):
>+        (BuiltinsInternalsWrapperImplementationGenerator.property_macro):
>+        (BuiltinsInternalsWrapperImplementationGenerator.property_macro.DECLARE_GLOBAL_STATIC):
>+        (BuiltinsInternalsWrapperImplementationGenerator.generate_visit_method):
>+        (BuiltinsInternalsWrapperImplementationGenerator._generate_initialize_static_globals):
>+        (BuiltinsInternalsWrapperImplementationGenerator.generate_initialize_method):
>+        * Scripts/wkbuiltins/builtins_generate_separate_header.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_header.py.
>+        (BuiltinsSeparateHeaderGenerator):
>+        (BuiltinsSeparateHeaderGenerator.__init__):
>+        (BuiltinsSeparateHeaderGenerator.output_filename):
>+        (BuiltinsSeparateHeaderGenerator.macro_prefix):
>+        (BuiltinsSeparateHeaderGenerator.generate_output):
>+        (BuiltinsSeparateHeaderGenerator.generate_forward_declarations):
>+        (FunctionExecutable):
>+        (generate_secondary_header_includes):
>+        (generate_section_for_object):
>+        (generate_externs_for_object):
>+        (generate_macros_for_object):
>+        (generate_defines_for_object):
>+        (generate_section_for_code_table_macro):
>+        (generate_section_for_code_name_macro):
>+        * Scripts/wkbuiltins/builtins_generate_separate_implementation.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_implementation.py.
>+        (BuiltinsSeparateImplementationGenerator):
>+        (BuiltinsSeparateImplementationGenerator.__init__):
>+        (BuiltinsSeparateImplementationGenerator.output_filename):
>+        (BuiltinsSeparateImplementationGenerator.macro_prefix):
>+        (BuiltinsSeparateImplementationGenerator.generate_output):
>+        (BuiltinsSeparateImplementationGenerator.generate_secondary_header_includes):
>+        * Scripts/wkbuiltins/builtins_generate_wrapper_header.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generate_wrapper_header.py.
>+        (BuiltinsWrapperHeaderGenerator):
>+        (BuiltinsWrapperHeaderGenerator.__init__):
>+        (BuiltinsWrapperHeaderGenerator.output_filename):
>+        (BuiltinsWrapperHeaderGenerator.generate_output):
>+        (BuiltinsWrapperHeaderGenerator.generate_secondary_header_includes):
>+        (BuiltinsWrapperHeaderGenerator.generate_section_for_object):
>+        (BuiltinsWrapperHeaderGenerator.generate_section_for_object.JSBuiltinFunctions):
>+        (BuiltinsWrapperHeaderGenerator.accessor_name):
>+        (BuiltinsWrapperHeaderGenerator.member_name):
>+        (BuiltinsWrapperHeaderGenerator.member_type):
>+        (BuiltinsWrapperHeaderGenerator.generate_constructor):
>+        (BuiltinsWrapperHeaderGenerator.generate_accessors):
>+        (BuiltinsWrapperHeaderGenerator.generate_members):
>+        * Scripts/wkbuiltins/builtins_generate_wrapper_implementation.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generate_wrapper_implementation.py.
>+        (BuiltinsWrapperImplementationGenerator):
>+        (BuiltinsWrapperImplementationGenerator.__init__):
>+        (BuiltinsWrapperImplementationGenerator.output_filename):
>+        (BuiltinsWrapperImplementationGenerator.generate_output):
>+        (BuiltinsWrapperImplementationGenerator.generate_section_for_object):
>+        * Scripts/wkbuiltins/builtins_generator.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generator.py.
>+        (WK_lcfirst):
>+        (WK_ucfirst):
>+        (BuiltinsGenerator):
>+        (BuiltinsGenerator.__init__):
>+        (BuiltinsGenerator.model):
>+        (BuiltinsGenerator.generate_output):
>+        (BuiltinsGenerator.output_filename):
>+        (BuiltinsGenerator.generate_license):
>+        (BuiltinsGenerator.generate_includes_from_entries):
>+        (BuiltinsGenerator.generate_primary_header_includes):
>+        (BuiltinsGenerator.generate_embedded_code_string_section_for_function):
>+        (BuiltinsGenerator.wrap_with_guard):
>+        (BuiltinsGenerator.mangledNameForObject):
>+        (BuiltinsGenerator.mangledNameForObject.toCamel):
>+        (BuiltinsGenerator.mangledNameForFunction):
>+        (BuiltinsGenerator.mangledNameForFunction.toCamel):
>+        * Scripts/wkbuiltins/builtins_model.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_model.py.
>+        (ParseException):
>+        (Framework):
>+        (Framework.__init__):
>+        (Framework.setting):
>+        (Framework.fromString):
>+        (Frameworks):
>+        (BuiltinObject):
>+        (BuiltinObject.__init__):
>+        (BuiltinFunction):
>+        (BuiltinFunction.__init__):
>+        (BuiltinFunction.fromString):
>+        (BuiltinFunction.__str__):
>+        (BuiltinsCollection):
>+        (BuiltinsCollection.__init__):
>+        (BuiltinsCollection.parse_builtins_file):
>+        (BuiltinsCollection.copyrights):
>+        (BuiltinsCollection.all_functions):
>+        (BuiltinsCollection.all_internal_functions):
>+        (BuiltinsCollection._parse_copyright_lines):
>+        (BuiltinsCollection._parse_annotations):
>+        (BuiltinsCollection._parse_functions):
>+        * Scripts/wkbuiltins/builtins_templates.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_templates.py.
>+        (BuiltinsGeneratorTemplates):
>+        * Scripts/wkbuiltins/wkbuiltins.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins.py.
>+
> 2018-09-12  Guillaume Emont  <guijemont@igalia.com>
> 
>         Add IGNORE_WARNING_.* macros
>diff --git a/Source/JavaScriptCore/DerivedSources.make b/Source/JavaScriptCore/DerivedSources.make
>index 173ecaefd9d..0ce14ddc575 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/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 741be35f9df..9360e369f0b 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -1869,7 +1869,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 7c0dc8e774e..9bb5ab18d36 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 (OOPS!).
>+
>+        * CMakeLists.txt: builtins -> wkbuiltins.
>+        * DerivedSources.make: builtins -> wkbuiltins.
>+
> 2018-09-12  Basuke Suzuki  <Basuke.Suzuki@sony.com>
> 
>         [Curl] Implement correct total received bytes.
>diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make
>index 47355fe1e4b..197b15d051f 100644
>--- a/Source/WebCore/DerivedSources.make
>+++ b/Source/WebCore/DerivedSources.make
>@@ -1549,7 +1549,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
>

Flags:

mcatanzaro: review-
mcatanzaro: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 189552: 349579 | 349724