Changeset 220372 in webkit


Ignore:
Timestamp:
Aug 7, 2017 5:25:21 PM (7 years ago)
Author:
commit-queue@webkit.org
Message:

[XCode] webkit-patch should run sort-Xcode-project-file
​https://bugs.webkit.org/show_bug.cgi?id=174036
<rdar://problem/33732709>

Patch by Stephan Szabo <​stephan.szabo@sony.com> on 2017-08-07
Reviewed by Simon Fraser.

  • Scripts/webkitpy/common/config/ports.py:
  • Scripts/webkitpy/tool/commands/download.py:
  • Scripts/webkitpy/tool/commands/download_unittest.py:
  • Scripts/webkitpy/tool/commands/upload.py:
  • Scripts/webkitpy/tool/commands/upload_unittest.py:
  • Scripts/webkitpy/tool/steps/init.py:
  • Scripts/webkitpy/tool/steps/options.py:
  • Scripts/webkitpy/tool/steps/sortxcodeprojectfiles.py: Added.
Location:
trunk/Tools
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r220370 r220372  
     12017-08-07  Stephan Szabo  <stephan.szabo@sony.com>
     2
     3        [XCode] webkit-patch should run sort-Xcode-project-file
     4        https://bugs.webkit.org/show_bug.cgi?id=174036
     5        <rdar://problem/33732709>
     6
     7        Reviewed by Simon Fraser.
     8
     9        * Scripts/webkitpy/common/config/ports.py:
     10        * Scripts/webkitpy/tool/commands/download.py:
     11        * Scripts/webkitpy/tool/commands/download_unittest.py:
     12        * Scripts/webkitpy/tool/commands/upload.py:
     13        * Scripts/webkitpy/tool/commands/upload_unittest.py:
     14        * Scripts/webkitpy/tool/steps/__init__.py:
     15        * Scripts/webkitpy/tool/steps/options.py:
     16        * Scripts/webkitpy/tool/steps/sortxcodeprojectfiles.py: Added.
     17
    1182017-08-07  Devin Rousso  <drousso@apple.com>
    219

  • trunk/Tools/Scripts/webkitpy/common/config/ports.py

    r220328 r220372  
    135135        return self._append_build_style_flag(command, build_style)
    136136
     137    def run_sort_xcode_project_file_command(self):
     138        return self.script_shell_command("sort-Xcode-project-file")
     139
    137140
    138141class IOSPort(DeprecatedPort):

  • trunk/Tools/Scripts/webkitpy/tool/commands/download.py

    r220328 r220372  
    128128    help_text = "Prepares a ChangeLog and lands the current working directory diff."
    129129    steps = [
     130        steps.SortXcodeProjectFiles,
    130131        steps.PrepareChangeLog,
    131132        steps.EditChangeLog,

  • trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py

    r212579 r220372  
    9191        options.iterate_on_new_tests = 0
    9292        options.group = None
     93        options.sort_xcode_project = False
    9394        return options
    9495

  • trunk/Tools/Scripts/webkitpy/tool/commands/upload.py

    r220328 r220372  
    258258        steps.PromptForBugOrTitle,
    259259        steps.CreateBug,
     260        steps.SortXcodeProjectFiles,
    260261        steps.PrepareChangeLog,
    261262    ]
    … …  
    276277        steps.PromptForBugOrTitle,
    277278        steps.CreateBug,
     279        steps.SortXcodeProjectFiles,
    278280        steps.PrepareChangeLog,
    279281        steps.EditChangeLog,

  • trunk/Tools/Scripts/webkitpy/tool/commands/upload_unittest.py

    r202319 r220372  
    104104
    105105    def test_prepare_diff_with_arg(self):
    106         self.assert_execute_outputs(Prepare(), [50000])
     106        options = MockOptions()
     107        options.sort_xcode_project = False
     108        self.assert_execute_outputs(Prepare(), [50000], options=options)
    107109
    108110    def test_prepare(self):
     111        options = MockOptions()
     112        options.sort_xcode_project = False
    109113        expected_logs = "MOCK create_bug\nbug_title: Mock user response\nbug_description: Mock user response\ncomponent: MOCK component\ncc: MOCK cc\n"
    110         self.assert_execute_outputs(Prepare(), [], expected_logs=expected_logs)
     114        self.assert_execute_outputs(Prepare(), [], expected_logs=expected_logs, options=options)
    111115
    112116    def test_upload(self):
    … …  
    120124        options.request_commit = False
    121125        options.review = True
     126        options.sort_xcode_project = False
    122127        options.suggest_reviewers = False
    123128        expected_logs = """MOCK: user.open_url: file://...

  • trunk/Tools/Scripts/webkitpy/tool/steps/__init__.py

    r220328 r220372  
    6060from webkitpy.tool.steps.revertrevision import RevertRevision
    6161from webkitpy.tool.steps.runtests import RunTests
     62from webkitpy.tool.steps.sortxcodeprojectfiles import SortXcodeProjectFiles
    6263from webkitpy.tool.steps.suggestreviewers import SuggestReviewers
    6364from webkitpy.tool.steps.update import Update

  • trunk/Tools/Scripts/webkitpy/tool/steps/options.py

    r220328 r220372  
    5858    review = make_option("--no-review", action="store_false", dest="review", default=True, help="Do not mark the patch for review.")
    5959    reviewer = make_option("-r", "--reviewer", action="store", type="string", dest="reviewer", help="Update ChangeLogs to say Reviewed by REVIEWER.")
     60    sort_xcode_project = make_option("--no-sort-xcode-project", action="store_false", dest="sort_xcode_project", default=True, help="Don't sort modified xcode projects.")
    6061    suggest_reviewers = make_option("--suggest-reviewers", action="store_true", default=False, help="Offer to CC appropriate reviewers.")
    6162    test = make_option("--test", action="store_true", dest="test", default=False, help="Run run-webkit-tests before committing.")
Note: See TracChangeset for help on using the changeset viewer.