⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 236005 in webkit


Ignore:
Timestamp:
Sep 14, 2018, 8:16:09 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

builtins directory causes name conflict on Python 3
​https://bugs.webkit.org/show_bug.cgi?id=189552

Patch by Mike Gorse <​mgorse@suse.com> on 2018-09-14
Reviewed by Michael Catanzaro.

Source/JavaScriptCore:

  • 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.

Source/WebCore:

No new tests (No behavior change).

  • CMakeLists.txt: builtins -> wkbuiltins.
  • DerivedSources.make: builtins -> wkbuiltins.
Location:
trunk/Source
Files:
1 added
1 deleted
8 edited
13 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r235972 r236005  
    137137    ${JavaScriptCore_SCRIPTS_SOURCES_DIR}/*.pl
    138138    ${JavaScriptCore_SCRIPTS_SOURCES_DIR}/*.py
    139     ${JavaScriptCore_SCRIPTS_SOURCES_DIR}/builtins/builtins*.py
     139    ${JavaScriptCore_SCRIPTS_SOURCES_DIR}/wkbuiltins/builtins*.py
     140    ${JavaScriptCore_SCRIPTS_SOURCES_DIR}/wkbuiltins/wkbuiltins.py
    140141)
    141142
    … …  
    10891090
    10901091set(BUILTINS_GENERATOR_SCRIPTS
    1091     ${JavaScriptCore_SCRIPTS_DIR}/builtins.py
     1092    ${JavaScriptCore_SCRIPTS_DIR}/wkbuiltins.py
    10921093    ${JavaScriptCore_SCRIPTS_DIR}/builtins_generator.py
    10931094    ${JavaScriptCore_SCRIPTS_DIR}/builtins_model.py

  • trunk/Source/JavaScriptCore/ChangeLog

    r235989 r236005  
     12018-09-14  Mike Gorse  <mgorse@suse.com>
     2
     3        builtins directory causes name conflict on Python 3
     4        https://bugs.webkit.org/show_bug.cgi?id=189552
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * CMakeLists.txt: builtins -> wkbuiltins.
     9        * DerivedSources.make: builtins -> wkbuiltins.
     10        * Scripts/generate-js-builtins.py: import wkbuiltins, rather than
     11          builtins.
     12        * Scripts/wkbuiltins/__init__.py: Renamed from Source/JavaScriptCore/Scripts/builtins/__init__.py.
     13        * Scripts/wkbuiltins/builtins_generate_combined_header.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_header.py.
     14        * Scripts/wkbuiltins/builtins_generate_internals_wrapper_implementation.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py.
     15        * Scripts/wkbuiltins/builtins_generate_separate_header.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_header.py.
     16        * Scripts/wkbuiltins/builtins_generate_separate_implementation.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_implementation.py.
     17        * Scripts/wkbuiltins/builtins_generate_wrapper_header.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generate_wrapper_header.py.
     18        * Scripts/wkbuiltins/builtins_generate_wrapper_implementation.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generate_wrapper_implementation.py.
     19        * Scripts/wkbuiltins/builtins_generator.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_generator.py.
     20        * Scripts/wkbuiltins/builtins_model.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_model.py.
     21        * Scripts/wkbuiltins/builtins_templates.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins_templates.py.
     22        * Scripts/wkbuiltins/wkbuiltins.py: Renamed from Source/JavaScriptCore/Scripts/builtins/builtins.py.
     23        * JavaScriptCore.xcodeproj/project.pbxproj: Update for the renaming.
     24
    1252018-09-13  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
    226

  • trunk/Source/JavaScriptCore/DerivedSources.make

    r235972 r236005  
    7474
    7575BUILTINS_GENERATOR_SCRIPTS = \
    76     $(JavaScriptCore_SCRIPTS_DIR)/builtins/__init__.py \
    77     $(JavaScriptCore_SCRIPTS_DIR)/builtins/builtins.py \
    78     $(JavaScriptCore_SCRIPTS_DIR)/builtins/builtins_generator.py \
    79     $(JavaScriptCore_SCRIPTS_DIR)/builtins/builtins_model.py \
    80     $(JavaScriptCore_SCRIPTS_DIR)/builtins/builtins_templates.py \
    81     $(JavaScriptCore_SCRIPTS_DIR)/builtins/builtins_generate_combined_header.py \
    82     $(JavaScriptCore_SCRIPTS_DIR)/builtins/builtins_generate_combined_implementation.py \
    83     $(JavaScriptCore_SCRIPTS_DIR)/builtins/builtins_generate_separate_header.py \
    84     $(JavaScriptCore_SCRIPTS_DIR)/builtins/builtins_generate_separate_implementation.py \
    85     ${JavaScriptCore_SCRIPTS_DIR}/builtins/builtins_generate_wrapper_header.py \
    86     ${JavaScriptCore_SCRIPTS_DIR}/builtins/builtins_generate_wrapper_implementation.py \
    87     ${JavaScriptCore_SCRIPTS_DIR}/builtins/builtins_generate_internals_wrapper_header.py \
    88     ${JavaScriptCore_SCRIPTS_DIR}/builtins/builtins_generate_internals_wrapper_implementation.py \
     76    $(JavaScriptCore_SCRIPTS_DIR)/wkbuiltins/__init__.py \
     77    $(JavaScriptCore_SCRIPTS_DIR)/wkbuiltins/wkbuiltins.py \
     78    $(JavaScriptCore_SCRIPTS_DIR)/wkbuiltins/builtins_generator.py \
     79    $(JavaScriptCore_SCRIPTS_DIR)/wkbuiltins/builtins_model.py \
     80    $(JavaScriptCore_SCRIPTS_DIR)/wkbuiltins/builtins_templates.py \
     81    $(JavaScriptCore_SCRIPTS_DIR)/wkbuiltins/builtins_generate_combined_header.py \
     82    $(JavaScriptCore_SCRIPTS_DIR)/wkbuiltins/builtins_generate_combined_implementation.py \
     83    $(JavaScriptCore_SCRIPTS_DIR)/wkbuiltins/builtins_generate_separate_header.py \
     84    $(JavaScriptCore_SCRIPTS_DIR)/wkbuiltins/builtins_generate_separate_implementation.py \
     85    ${JavaScriptCore_SCRIPTS_DIR}/wkbuiltins/builtins_generate_wrapper_header.py \
     86    ${JavaScriptCore_SCRIPTS_DIR}/wkbuiltins/builtins_generate_wrapper_implementation.py \
     87    ${JavaScriptCore_SCRIPTS_DIR}/wkbuiltins/builtins_generate_internals_wrapper_header.py \
     88    ${JavaScriptCore_SCRIPTS_DIR}/wkbuiltins/builtins_generate_internals_wrapper_implementation.py \
    8989    $(JavaScriptCore_SCRIPTS_DIR)/generate-js-builtins.py \
    9090    $(JavaScriptCore_SCRIPTS_DIR)/lazywriter.py \

  • trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r235989 r236005  
    12751275                99DA00A41BD5993100F4575C /* builtins_model.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA009B1BD5992700F4575C /* builtins_model.py */; settings = {ATTRIBUTES = (Private, ); }; };
    12761276                99DA00A51BD5993100F4575C /* builtins_templates.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA009C1BD5992700F4575C /* builtins_templates.py */; settings = {ATTRIBUTES = (Private, ); }; };
    1277                 99DA00A61BD5993100F4575C /* builtins.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA009D1BD5992700F4575C /* builtins.py */; settings = {ATTRIBUTES = (Private, ); }; };
     1277                99DA00A61BD5993100F4575C /* wkbuiltins.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA009D1BD5992700F4575C /* wkbuiltins.py */; settings = {ATTRIBUTES = (Private, ); }; };
    12781278                99DA00A71BD5993100F4575C /* builtins_generate_combined_header.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA009E1BD5992700F4575C /* builtins_generate_combined_header.py */; settings = {ATTRIBUTES = (Private, ); }; };
    12791279                99DA00A81BD5993100F4575C /* builtins_generate_combined_implementation.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA009F1BD5992700F4575C /* builtins_generate_combined_implementation.py */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    39493949                99DA009B1BD5992700F4575C /* builtins_model.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins_model.py; sourceTree = "<group>"; };
    39503950                99DA009C1BD5992700F4575C /* builtins_templates.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins_templates.py; sourceTree = "<group>"; };
    3951                 99DA009D1BD5992700F4575C /* builtins.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins.py; sourceTree = "<group>"; };
     3951                99DA009D1BD5992700F4575C /* wkbuiltins.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = wkbuiltins.py; sourceTree = "<group>"; };
    39523952                99DA009E1BD5992700F4575C /* builtins_generate_combined_header.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins_generate_combined_header.py; sourceTree = "<group>"; };
    39533953                99DA009F1BD5992700F4575C /* builtins_generate_combined_implementation.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins_generate_combined_implementation.py; sourceTree = "<group>"; };
    … …  
    78277827                        sourceTree = "<group>";
    78287828                };
    7829                 99DA00971BD598E000F4575C /* builtins */ = {
     7829                99DA00971BD598E000F4575C /* wkbuiltins */ = {
    78307830                        isa = PBXGroup;
    78317831                        children = (
    78327832                                99DA00991BD5992700F4575C /* __init__.py */,
    7833                                 99DA009D1BD5992700F4575C /* builtins.py */,
     7833                                99DA009D1BD5992700F4575C /* wkbuiltins.py */,
    78347834                                99DA009E1BD5992700F4575C /* builtins_generate_combined_header.py */,
    78357835                                99DA009F1BD5992700F4575C /* builtins_generate_combined_implementation.py */,
    … …  
    78447844                                99DA009C1BD5992700F4575C /* builtins_templates.py */,
    78457845                        );
    7846                         path = builtins;
     7846                        path = wkbuiltins;
    78477847                        sourceTree = "<group>";
    78487848                };
    … …  
    84408440                                A7D801A51880D66E0026C39B /* BuiltinExecutables.h in Headers */,
    84418441                                A75EE9B218AAB7E200AAD043 /* BuiltinNames.h in Headers */,
    8442                                 99DA00A61BD5993100F4575C /* builtins.py in Headers */,
     8442                                99DA00A61BD5993100F4575C /* wkbuiltins.py in Headers */,
    84438443                                99DA00A71BD5993100F4575C /* builtins_generate_combined_header.py in Headers */,
    84448444                                99DA00A81BD5993100F4575C /* builtins_generate_combined_implementation.py in Headers */,

  • trunk/Source/JavaScriptCore/Scripts/generate-js-builtins.py

    r204979 r236005  
    3838from lazywriter import LazyFileWriter
    3939
    40 from builtins import *
     40from wkbuiltins import *
    4141
    4242

  • trunk/Source/JavaScriptCore/Scripts/wkbuiltins/__init__.py

    r236004 r236005  
    11# Required for Python to search this directory for module files
    22
    3 from builtins import *
     3from wkbuiltins import *

  • trunk/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_combined_header.py

    • Property svn:executable deleted

  • trunk/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_internals_wrapper_header.py

    • Property svn:executable deleted

  • trunk/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_internals_wrapper_implementation.py

    • Property svn:executable deleted

  • trunk/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_separate_header.py

    • Property svn:executable deleted

  • trunk/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_wrapper_header.py

    • Property svn:executable deleted

  • trunk/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_wrapper_implementation.py

    • Property svn:executable deleted

  • trunk/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_model.py

    • Property svn:executable deleted

  • trunk/Source/JavaScriptCore/Scripts/wkbuiltins/wkbuiltins.py

    r236004 r236005  
    1 # This file is used to simulate the builtins/ directory when generate-js-builtins.py
     1# This file is used to simulate the wkbuiltins/ directory when generate-js-builtins.py
    22# is run from JavaScriptCore framework's private headers directory, which is flattened.
    33

  • trunk/Source/WebCore/CMakeLists.txt

    r235973 r236005  
    18711871
    18721872set(BUILTINS_GENERATOR_SCRIPTS
    1873     ${JavaScriptCore_SCRIPTS_DIR}/builtins.py
     1873    ${JavaScriptCore_SCRIPTS_DIR}/wkbuiltins.py
    18741874    ${JavaScriptCore_SCRIPTS_DIR}/builtins_generator.py
    18751875    ${JavaScriptCore_SCRIPTS_DIR}/builtins_model.py

  • trunk/Source/WebCore/ChangeLog

    r236002 r236005  
     12018-09-14  Mike Gorse  <mgorse@suse.com>
     2
     3        builtins directory causes name conflict on Python 3
     4        https://bugs.webkit.org/show_bug.cgi?id=189552
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        No new tests (No behavior change).
     9
     10        * CMakeLists.txt: builtins -> wkbuiltins.
     11        * DerivedSources.make: builtins -> wkbuiltins.
     12
    1132018-09-13  Ryosuke Niwa  <rniwa@webkit.org>
    214

  • trunk/Source/WebCore/DerivedSources.make

    r235973 r236005  
    15511551
    15521552BUILTINS_GENERATOR_SCRIPTS = \
    1553     $(JavaScriptCore_SCRIPTS_DIR)/builtins.py \
     1553    $(JavaScriptCore_SCRIPTS_DIR)/wkbuiltins.py \
    15541554    $(JavaScriptCore_SCRIPTS_DIR)/builtins_generator.py \
    15551555    $(JavaScriptCore_SCRIPTS_DIR)/builtins_model.py \
Note: See TracChangeset for help on using the changeset viewer.