builtins directory causes name conflict on Python 3
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 14 Sep 2018 15:16:09 +0000 (15:16 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 14 Sep 2018 15:16:09 +0000 (15:16 +0000)
commit5825c87633e955c886d2cb5dbf0e10a63449d1b3
tree2725c82667a5018ee71bb4c54214076e092e77d3
parent49805580e0eb6fe52516eb049d99e2fc818df39e
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@236005 268f45cc-cd09-0410-ab3c-d52691b4dbfc
21 files changed:
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/DerivedSources.make
Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
Source/JavaScriptCore/Scripts/generate-js-builtins.py
Source/JavaScriptCore/Scripts/wkbuiltins/__init__.py [moved from Source/JavaScriptCore/Scripts/builtins/__init__.py with 72% similarity]
Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_combined_header.py [moved from Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_header.py with 100% similarity, mode: 0644]
Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_combined_implementation.py [moved from Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_implementation.py with 100% similarity]
Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_internals_wrapper_header.py [moved from Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_header.py with 100% similarity, mode: 0644]
Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_internals_wrapper_implementation.py [moved from Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py with 100% similarity, mode: 0644]
Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_separate_header.py [moved from Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_header.py with 100% similarity, mode: 0644]
Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_separate_implementation.py [moved from Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_implementation.py with 100% similarity]
Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_wrapper_header.py [moved from Source/JavaScriptCore/Scripts/builtins/builtins_generate_wrapper_header.py with 100% similarity, mode: 0644]
Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_wrapper_implementation.py [moved from Source/JavaScriptCore/Scripts/builtins/builtins_generate_wrapper_implementation.py with 100% similarity, mode: 0644]
Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generator.py [moved from Source/JavaScriptCore/Scripts/builtins/builtins_generator.py with 100% similarity]
Source/JavaScriptCore/Scripts/wkbuiltins/builtins_model.py [moved from Source/JavaScriptCore/Scripts/builtins/builtins_model.py with 100% similarity, mode: 0644]
Source/JavaScriptCore/Scripts/wkbuiltins/builtins_templates.py [moved from Source/JavaScriptCore/Scripts/builtins/builtins_templates.py with 100% similarity]
Source/JavaScriptCore/Scripts/wkbuiltins/wkbuiltins.py [moved from Source/JavaScriptCore/Scripts/builtins/builtins.py with 87% similarity]
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.make