Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(288)

Side by Side Diff: chrome/installer/mini_installer.gypi

Issue 10262012: Fix mini_installer for Metro resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« build/common.gypi ('K') | « chrome/installer/mini_installer.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'dependencies': [ 5 'dependencies': [
6 '<(chrome_dll_project)', 6 '<(chrome_dll_project)',
7 '../chrome.gyp:chrome', 7 '../chrome.gyp:chrome',
8 '../chrome.gyp:chrome_nacl_win64', 8 '../chrome.gyp:chrome_nacl_win64',
9 '../chrome.gyp:default_extensions', 9 '../chrome.gyp:default_extensions',
10 '../chrome.gyp:setup', 10 '../chrome.gyp:setup',
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 'process_outputs_as_sources': 1, 148 'process_outputs_as_sources': 1,
149 'message': 'Generating version information' 149 'message': 'Generating version information'
150 }, 150 },
151 { 151 {
152 'rule_name': 'installer_archive', 152 'rule_name': 'installer_archive',
153 'extension': 'release', 153 'extension': 'release',
154 'variables': { 154 'variables': {
155 'create_installer_archive_py_path': 155 'create_installer_archive_py_path':
156 '../tools/build/win/create_installer_archive.py', 156 '../tools/build/win/create_installer_archive.py',
157 }, 157 },
158 'conditions': [
159 ['enable_hidpi == 1', {
160 'variables': {
161 'enable_hidpi_flag': '--enable_hidpi=1',
162 },
163 }, {
164 'variables': {
165 'enable_hidpi_flag': '',
166 },
167 }],
168 ['enable_metro == 1', {
169 'variables': {
170 'enable_metro_flag': '--enable_metro=1',
171 },
172 }, {
173 'variables': {
174 'enable_metro_flag': '',
175 },
176 }],
177 ],
158 'inputs': [ 178 'inputs': [
159 '<(create_installer_archive_py_path)', 179 '<(create_installer_archive_py_path)',
160 '<(PRODUCT_DIR)/chrome.exe', 180 '<(PRODUCT_DIR)/chrome.exe',
161 '<(chrome_dll_path)', 181 '<(chrome_dll_path)',
162 '<(PRODUCT_DIR)/nacl64.exe', 182 '<(PRODUCT_DIR)/nacl64.exe',
163 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 183 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
164 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 184 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
165 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 185 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
166 '<(PRODUCT_DIR)/locales/en-US.pak', 186 '<(PRODUCT_DIR)/locales/en-US.pak',
167 '<(PRODUCT_DIR)/icudt.dll', 187 '<(PRODUCT_DIR)/icudt.dll',
168 ], 188 ],
169 'outputs': [ 189 'outputs': [
170 'xxx.out', 190 'xxx.out',
171 '<(output_dir)/<(RULE_INPUT_NAME).7z', 191 '<(output_dir)/<(RULE_INPUT_NAME).7z',
172 '<(output_dir)/<(RULE_INPUT_NAME).packed.7z', 192 '<(output_dir)/<(RULE_INPUT_NAME).packed.7z',
173 '<(output_dir)/setup.ex_', 193 '<(output_dir)/setup.ex_',
174 '<(INTERMEDIATE_DIR)/packed_files.rc', 194 '<(INTERMEDIATE_DIR)/packed_files.rc',
175 ], 195 ],
176 'action': [ 196 'action': [
177 'python', 197 'python',
178 '<(create_installer_archive_py_path)', 198 '<(create_installer_archive_py_path)',
179 '--build_dir=<(PRODUCT_DIR)', 199 '--build_dir=<(PRODUCT_DIR)',
180 '--output_dir=<(output_dir)', 200 '--output_dir=<(output_dir)',
181 '--staging_dir=<(INTERMEDIATE_DIR)', 201 '--staging_dir=<(INTERMEDIATE_DIR)',
182 '--input_file=<(RULE_INPUT_PATH)', 202 '--input_file=<(RULE_INPUT_PATH)',
183 '--resource_file_path=<(INTERMEDIATE_DIR)/packed_files.rc', 203 '--resource_file_path=<(INTERMEDIATE_DIR)/packed_files.rc',
204 '<(enable_hidpi_flag)',
205 '<(enable_metro_flag)',
184 # TODO(sgk): may just use environment variables 206 # TODO(sgk): may just use environment variables
185 #'--distribution=$(CHROMIUM_BUILD)', 207 #'--distribution=$(CHROMIUM_BUILD)',
186 '--distribution=_google_chrome', 208 '--distribution=_google_chrome',
187 # Optional arguments to generate diff installer 209 # Optional arguments to generate diff installer
188 #'--last_chrome_installer=C:/Temp/base', 210 #'--last_chrome_installer=C:/Temp/base',
189 #'--setup_exe_format=DIFF', 211 #'--setup_exe_format=DIFF',
190 #'--diff_algorithm=COURGETTE', 212 #'--diff_algorithm=COURGETTE',
191 ], 213 ],
192 'message': 'Create installer archive' 214 'message': 'Create installer archive'
193 }, 215 },
(...skipping 10 matching lines...) Expand all
204 'variables': { 226 'variables': {
205 'branding_dir': '../app/theme/google_chrome', 227 'branding_dir': '../app/theme/google_chrome',
206 }, 228 },
207 }, { # else branding!="Chrome" 229 }, { # else branding!="Chrome"
208 'variables': { 230 'variables': {
209 'branding_dir': '../app/theme/chromium', 231 'branding_dir': '../app/theme/chromium',
210 }, 232 },
211 }], 233 }],
212 ], 234 ],
213 } 235 }
OLDNEW
« build/common.gypi ('K') | « chrome/installer/mini_installer.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698