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

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: Leave enable_metro off by default. 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
« no previous file with comments | « 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 'process_outputs_as_sources': 1, 149 'process_outputs_as_sources': 1,
150 'message': 'Generating version information' 150 'message': 'Generating version information'
151 }, 151 },
152 { 152 {
153 'rule_name': 'installer_archive', 153 'rule_name': 'installer_archive',
154 'extension': 'release', 154 'extension': 'release',
155 'variables': { 155 'variables': {
156 'create_installer_archive_py_path': 156 'create_installer_archive_py_path':
157 '../tools/build/win/create_installer_archive.py', 157 '../tools/build/win/create_installer_archive.py',
158 }, 158 },
159 'conditions': [
160 ['enable_hidpi == 1', {
161 'variables': {
162 'enable_hidpi_flag': '--enable_hidpi=1',
163 },
164 }, {
165 'variables': {
166 'enable_hidpi_flag': '',
167 },
168 }],
169 ['enable_metro == 1', {
170 'variables': {
171 'enable_metro_flag': '--enable_metro=1',
172 },
173 }, {
174 'variables': {
175 'enable_metro_flag': '',
176 },
177 }],
178 ],
159 'inputs': [ 179 'inputs': [
160 '<(create_installer_archive_py_path)', 180 '<(create_installer_archive_py_path)',
161 '<(PRODUCT_DIR)/chrome.exe', 181 '<(PRODUCT_DIR)/chrome.exe',
162 '<(chrome_dll_path)', 182 '<(chrome_dll_path)',
163 '<(PRODUCT_DIR)/nacl64.exe', 183 '<(PRODUCT_DIR)/nacl64.exe',
164 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 184 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
165 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 185 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
166 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 186 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
167 '<(PRODUCT_DIR)/locales/en-US.pak', 187 '<(PRODUCT_DIR)/locales/en-US.pak',
168 '<(PRODUCT_DIR)/icudt.dll', 188 '<(PRODUCT_DIR)/icudt.dll',
169 ], 189 ],
170 'outputs': [ 190 'outputs': [
171 'xxx.out', 191 'xxx.out',
172 '<(output_dir)/<(RULE_INPUT_NAME).7z', 192 '<(output_dir)/<(RULE_INPUT_NAME).7z',
173 '<(output_dir)/<(RULE_INPUT_NAME).packed.7z', 193 '<(output_dir)/<(RULE_INPUT_NAME).packed.7z',
174 '<(output_dir)/setup.ex_', 194 '<(output_dir)/setup.ex_',
175 '<(INTERMEDIATE_DIR)/packed_files.rc', 195 '<(INTERMEDIATE_DIR)/packed_files.rc',
176 ], 196 ],
177 'action': [ 197 'action': [
178 'python', 198 'python',
179 '<(create_installer_archive_py_path)', 199 '<(create_installer_archive_py_path)',
180 '--build_dir=<(PRODUCT_DIR)', 200 '--build_dir=<(PRODUCT_DIR)',
181 '--output_dir=<(output_dir)', 201 '--output_dir=<(output_dir)',
182 '--staging_dir=<(INTERMEDIATE_DIR)', 202 '--staging_dir=<(INTERMEDIATE_DIR)',
183 '--input_file=<(RULE_INPUT_PATH)', 203 '--input_file=<(RULE_INPUT_PATH)',
184 '--resource_file_path=<(INTERMEDIATE_DIR)/packed_files.rc', 204 '--resource_file_path=<(INTERMEDIATE_DIR)/packed_files.rc',
205 '<(enable_hidpi_flag)',
206 '<(enable_metro_flag)',
185 # TODO(sgk): may just use environment variables 207 # TODO(sgk): may just use environment variables
186 #'--distribution=$(CHROMIUM_BUILD)', 208 #'--distribution=$(CHROMIUM_BUILD)',
187 '--distribution=_google_chrome', 209 '--distribution=_google_chrome',
188 # Optional arguments to generate diff installer 210 # Optional arguments to generate diff installer
189 #'--last_chrome_installer=C:/Temp/base', 211 #'--last_chrome_installer=C:/Temp/base',
190 #'--setup_exe_format=DIFF', 212 #'--setup_exe_format=DIFF',
191 #'--diff_algorithm=COURGETTE', 213 #'--diff_algorithm=COURGETTE',
192 ], 214 ],
193 'message': 'Create installer archive' 215 'message': 'Create installer archive'
194 }, 216 },
(...skipping 10 matching lines...) Expand all
205 'variables': { 227 'variables': {
206 'branding_dir': '../app/theme/google_chrome', 228 'branding_dir': '../app/theme/google_chrome',
207 }, 229 },
208 }, { # else branding!="Chrome" 230 }, { # else branding!="Chrome"
209 'variables': { 231 'variables': {
210 'branding_dir': '../app/theme/chromium', 232 'branding_dir': '../app/theme/chromium',
211 }, 233 },
212 }], 234 }],
213 ], 235 ],
214 } 236 }
OLDNEW
« no previous file with comments | « chrome/installer/mini_installer.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698