| OLD | NEW | 
|    1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. |    1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 
|    2 # Use of this source code is governed by a BSD-style license that can be |    2 # Use of this source code is governed by a BSD-style license that can be | 
|    3 # found in the LICENSE file. |    3 # found in the LICENSE file. | 
|    4  |    4  | 
|    5 { |    5 { | 
|    6   'includes': [ |    6   'includes': [ | 
|    7     '../third_party/WebKit/WebCore/WebCore.gypi', |    7     '../third_party/WebKit/WebCore/WebCore.gypi', | 
|    8   ], |    8   ], | 
|    9   'variables': { |    9   'variables': { | 
|   10     # TODO: remove this helper when we have loops in GYP |   10     # TODO: remove this helper when we have loops in GYP | 
|   11     'apply_locales_cmd': ['python', '../chrome/tools/build/apply_locales.py',], |   11     'apply_locales_cmd': ['python', '../chrome/tools/build/apply_locales.py'], | 
 |   12     'grit_info_cmd': ['python', '../tools/grit/grit_info.py'], | 
 |   13     'grit_cmd': ['python', '../tools/grit/grit.py'], | 
 |   14     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', | 
|   12   }, |   15   }, | 
|   13   'targets': [ |   16   'targets': [ | 
|   14     { |   17     { | 
|   15       # Currently, builders assume webkit.sln builds test_shell on windows. |   18       # Currently, builders assume webkit.sln builds test_shell on windows. | 
|   16       # We should change this, but for now allows trybot runs. |   19       # We should change this, but for now allows trybot runs. | 
|   17       # for now. |   20       # for now. | 
|   18       'target_name': 'pull_in_test_shell', |   21       'target_name': 'pull_in_test_shell', | 
|   19       'type': 'none', |   22       'type': 'none', | 
|   20       'conditions': [ |   23       'conditions': [ | 
|   21         ['OS=="win"', { |   24         ['OS=="win"', { | 
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  228           ], |  231           ], | 
|  229         }, { # else: OS!="win" |  232         }, { # else: OS!="win" | 
|  230           'sources/': [['exclude', '/win/']], |  233           'sources/': [['exclude', '/win/']], | 
|  231         }], |  234         }], | 
|  232       ], |  235       ], | 
|  233     }, |  236     }, | 
|  234     { |  237     { | 
|  235       'target_name': 'webkit_resources', |  238       'target_name': 'webkit_resources', | 
|  236       'type': 'none', |  239       'type': 'none', | 
|  237       'msvs_guid': '0B469837-3D46-484A-AFB3-C5A6C68730B9', |  240       'msvs_guid': '0B469837-3D46-484A-AFB3-C5A6C68730B9', | 
|  238       'variables': { |  | 
|  239         'grit_path': '../tools/grit/grit.py', |  | 
|  240         'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', |  | 
|  241       }, |  | 
|  242       'actions': [ |  241       'actions': [ | 
|  243         { |  242         { | 
|  244           'action_name': 'webkit_resources', |  243           'action_name': 'webkit_resources', | 
|  245           'variables': { |  244           'variables': { | 
|  246             'input_path': 'glue/webkit_resources.grd', |  245             'input_path': 'glue/webkit_resources.grd', | 
|  247           }, |  246           }, | 
|  248           'inputs': [ |  247           'inputs': [ | 
|  249             '<(input_path)', |  248             '<!@(<(grit_info_cmd) --inputs <(input_path))', | 
|  250           ], |  249           ], | 
|  251           'outputs': [ |  250           'outputs': [ | 
|  252             '<(grit_out_dir)/grit/webkit_resources.h', |  251             '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/webkit_resources\'
      <(input_path))', | 
|  253             '<(grit_out_dir)/webkit_resources.pak', |  | 
|  254             '<(grit_out_dir)/webkit_resources.rc', |  | 
|  255           ], |  252           ], | 
|  256           'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '
     -o', '<(grit_out_dir)'], |  253           'action': ['<@(grit_cmd)', '-i', '<(input_path)', 'build', | 
 |  254                      '-o', '<(grit_out_dir)/webkit_resources'], | 
|  257           'message': 'Generating resources from <(input_path)', |  255           'message': 'Generating resources from <(input_path)', | 
|  258         }, |  256         }, | 
|  259       ], |  257       ], | 
|  260       'direct_dependent_settings': { |  258       'direct_dependent_settings': { | 
|  261         'include_dirs': [ |  259         'include_dirs': [ | 
|  262           '<(SHARED_INTERMEDIATE_DIR)/webkit', |  260           '<(grit_out_dir)/webkit_resources', | 
|  263         ], |  261         ], | 
|  264       }, |  262       }, | 
|  265       'conditions': [ |  263       'conditions': [ | 
|  266         ['OS=="win"', { |  264         ['OS=="win"', { | 
|  267           'dependencies': ['../build/win/system.gyp:cygwin'], |  265           'dependencies': ['../build/win/system.gyp:cygwin'], | 
|  268         }], |  266         }], | 
|  269       ], |  267       ], | 
|  270     }, |  268     }, | 
|  271     { |  269     { | 
|  272       'target_name': 'webkit_strings', |  270       'target_name': 'webkit_strings', | 
|  273       'type': 'none', |  271       'type': 'none', | 
|  274       'msvs_guid': '60B43839-95E6-4526-A661-209F16335E0E', |  272       'msvs_guid': '60B43839-95E6-4526-A661-209F16335E0E', | 
|  275       'variables': { |  | 
|  276         'grit_path': '../tools/grit/grit.py', |  | 
|  277         'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', |  | 
|  278       }, |  | 
|  279       'actions': [ |  273       'actions': [ | 
|  280         { |  274         { | 
|  281           'action_name': 'webkit_strings', |  275           'action_name': 'webkit_strings', | 
|  282           'variables': { |  276           'variables': { | 
|  283             'input_path': 'glue/webkit_strings.grd', |  277             'input_path': 'glue/webkit_strings.grd', | 
|  284           }, |  278           }, | 
|  285           'inputs': [ |  279           'inputs': [ | 
|  286             '<(input_path)', |  280             '<!@(<(grit_info_cmd) --inputs <(input_path))', | 
|  287           ], |  281           ], | 
|  288           'outputs': [ |  282           'outputs': [ | 
|  289             '<(grit_out_dir)/grit/webkit_strings.h', |  283             '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/webkit_strings\' <
     (input_path))', | 
|  290             # TODO: remove this helper when we have loops in GYP |  | 
|  291             '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/webkit_strings_ZZLOCALE.
     pak\' <(locales))', |  | 
|  292           ], |  284           ], | 
|  293           'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '
     -o', '<(grit_out_dir)'], |  285           'action': ['<@(grit_cmd)', '-i', '<(input_path)', 'build', | 
 |  286                      '-o', '<(grit_out_dir)/webkit_strings'], | 
|  294           'message': 'Generating resources from <(input_path)', |  287           'message': 'Generating resources from <(input_path)', | 
|  295         }, |  288         }, | 
|  296       ], |  289       ], | 
|  297       'direct_dependent_settings': { |  290       'direct_dependent_settings': { | 
|  298         'include_dirs': [ |  291         'include_dirs': [ | 
|  299           '<(SHARED_INTERMEDIATE_DIR)/webkit', |  292           '<(grit_out_dir)/webkit_strings', | 
|  300         ], |  293         ], | 
|  301       }, |  294       }, | 
|  302       'conditions': [ |  295       'conditions': [ | 
|  303         ['OS=="win"', { |  296         ['OS=="win"', { | 
|  304           'dependencies': ['../build/win/system.gyp:cygwin'], |  297           'dependencies': ['../build/win/system.gyp:cygwin'], | 
|  305         }], |  298         }], | 
|  306       ], |  299       ], | 
|  307     }, |  300     }, | 
|  308     { |  301     { | 
|  309       'target_name': 'appcache', |  302       'target_name': 'appcache', | 
| (...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  650           'files': [ |  643           'files': [ | 
|  651  |  644  | 
|  652             '<@(webinspector_image_files)', |  645             '<@(webinspector_image_files)', | 
|  653  |  646  | 
|  654           ], |  647           ], | 
|  655         }, |  648         }, | 
|  656       ], |  649       ], | 
|  657     }, |  650     }, | 
|  658   ], # targets |  651   ], # targets | 
|  659 } |  652 } | 
| OLD | NEW |