| OLD | NEW | 
|    1 { |    1 { | 
|    2   'variables': { |    2   'variables': { | 
|    3     'version_py': '../../chrome/tools/build/version.py', |    3     'version_py': '../../chrome/tools/build/version.py', | 
|    4     'version_path': '../../chrome/VERSION', |    4     'version_path': '../../chrome/VERSION', | 
|    5     'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', |    5     'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', | 
|    6     # 'branding_dir' is set in the 'conditions' section at the bottom. |    6     # 'branding_dir' is set in the 'conditions' section at the bottom. | 
|    7   }, |    7   }, | 
|    8   'includes': [ |    8   'includes': [ | 
|    9     # Two versions of installer_util target are defined in installer_util.gypi. |    9     # Two versions of installer_util target are defined in installer_util.gypi. | 
|   10     # This allows to keep all the settings relevant to these targets in one |   10     # This allows to keep all the settings relevant to these targets in one | 
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  217             { |  217             { | 
|  218               'rule_name': 'setup_version', |  218               'rule_name': 'setup_version', | 
|  219               'extension': 'version', |  219               'extension': 'version', | 
|  220               'variables': { |  220               'variables': { | 
|  221                 'version_py': '../../chrome/tools/build/version.py', |  221                 'version_py': '../../chrome/tools/build/version.py', | 
|  222                 'template_input_path': 'setup/setup_exe_version.rc.version', |  222                 'template_input_path': 'setup/setup_exe_version.rc.version', | 
|  223               }, |  223               }, | 
|  224               'inputs': [ |  224               'inputs': [ | 
|  225                 '<(template_input_path)', |  225                 '<(template_input_path)', | 
|  226                 '<(version_path)', |  226                 '<(version_path)', | 
 |  227                 '<(lastchange_path)', | 
|  227                 '<(branding_dir)/BRANDING', |  228                 '<(branding_dir)/BRANDING', | 
|  228               ], |  229               ], | 
|  229               'outputs': [ |  230               'outputs': [ | 
|  230                 '<(SHARED_INTERMEDIATE_DIR)/setup/setup_exe_version.rc', |  231                 '<(SHARED_INTERMEDIATE_DIR)/setup/setup_exe_version.rc', | 
|  231               ], |  232               ], | 
|  232               'action': [ |  233               'action': [ | 
|  233                 'python', '<(version_py)', |  234                 'python', '<(version_py)', | 
|  234                 '-f', '<(version_path)', |  235                 '-f', '<(version_path)', | 
|  235                 '-f', '<(lastchange_path)', |  236                 '-f', '<(lastchange_path)', | 
|  236                 '-f', '<(branding_dir)/BRANDING', |  237                 '-f', '<(branding_dir)/BRANDING', | 
|  237                 '<(template_input_path)', |  238                 '<(template_input_path)', | 
|  238                 '<@(_outputs)', |  239                 '<@(_outputs)', | 
|  239               ], |  240               ], | 
|  240               'dependencies': [ |  | 
|  241                 '../../build/util/build_util.gyp:lastchange', |  | 
|  242               ], |  | 
|  243               'process_outputs_as_sources': 1, |  241               'process_outputs_as_sources': 1, | 
|  244               'message': 'Generating version information' |  242               'message': 'Generating version information' | 
|  245             }, |  243             }, | 
|  246             { |  244             { | 
|  247               'rule_name': 'server_dlls', |  245               'rule_name': 'server_dlls', | 
|  248               'extension': 'release', |  246               'extension': 'release', | 
|  249               'variables': { |  247               'variables': { | 
|  250                 'scan_server_dlls_py' : '../tools/build/win/scan_server_dlls.py'
     , |  248                 'scan_server_dlls_py' : '../tools/build/win/scan_server_dlls.py'
     , | 
|  251                 'template_file': 'mini_installer/chrome_frame.release', |  249                 'template_file': 'mini_installer/chrome_frame.release', | 
|  252               }, |  250               }, | 
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  421                 '<(branding_dir)/BRANDING', |  419                 '<(branding_dir)/BRANDING', | 
|  422               ], |  420               ], | 
|  423             }, |  421             }, | 
|  424           ], |  422           ], | 
|  425           'actions': [ |  423           'actions': [ | 
|  426             { |  424             { | 
|  427               'action_name': 'save_build_info', |  425               'action_name': 'save_build_info', | 
|  428               'inputs': [ |  426               'inputs': [ | 
|  429                 '<(branding_dir)/BRANDING', |  427                 '<(branding_dir)/BRANDING', | 
|  430                 '<(version_path)', |  428                 '<(version_path)', | 
 |  429                 '<(lastchange_path)', | 
|  431               ], |  430               ], | 
|  432               'outputs': [ |  431               'outputs': [ | 
|  433                 '<(PRODUCT_DIR)/installer/version.txt', |  432                 '<(PRODUCT_DIR)/installer/version.txt', | 
|  434               ], |  433               ], | 
|  435               # Just output the default version info variables. |  434               # Just output the default version info variables. | 
|  436               'action': [ |  435               'action': [ | 
|  437                 'python', '<(version_py)', |  436                 'python', '<(version_py)', | 
|  438                 '-f', '<(branding_dir)/BRANDING', |  437                 '-f', '<(branding_dir)/BRANDING', | 
|  439                 '-f', '<(version_path)', |  438                 '-f', '<(version_path)', | 
|  440                 '-f', '<(lastchange_path)', |  439                 '-f', '<(lastchange_path)', | 
|  441                 '-o', '<@(_outputs)' |  440                 '-o', '<@(_outputs)' | 
|  442               ], |  441               ], | 
|  443               'dependencies': [ |  | 
|  444                 '../../build/util/build_util.gyp:lastchange', |  | 
|  445               ], |  | 
|  446             }, |  442             }, | 
|  447           ], |  443           ], | 
|  448         }, |  444         }, | 
|  449         { |  445         { | 
|  450           'target_name': 'linux_packages_all', |  446           'target_name': 'linux_packages_all', | 
|  451           'suppress_wildcard': 1, |  447           'suppress_wildcard': 1, | 
|  452           'type': 'none', |  448           'type': 'none', | 
|  453           'dependencies': [ |  449           'dependencies': [ | 
|  454             'linux_packages_unstable', |  450             'linux_packages_unstable', | 
|  455             'linux_packages_beta', |  451             'linux_packages_beta', | 
| (...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  764       }, |  760       }, | 
|  765     }], |  761     }], | 
|  766   ], |  762   ], | 
|  767 } |  763 } | 
|  768  |  764  | 
|  769 # Local Variables: |  765 # Local Variables: | 
|  770 # tab-width:2 |  766 # tab-width:2 | 
|  771 # indent-tabs-mode:nil |  767 # indent-tabs-mode:nil | 
|  772 # End: |  768 # End: | 
|  773 # vim: set expandtab tabstop=2 shiftwidth=2: |  769 # vim: set expandtab tabstop=2 shiftwidth=2: | 
| OLD | NEW |