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

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

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 | « build/common.gypi ('k') | chrome/installer/mini_installer.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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': '<(DEPTH)/build/util/LASTCHANGE', 5 'lastchange_path': '<(DEPTH)/build/util/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 'msvs_use_common_release': 0, 7 'msvs_use_common_release': 0,
8 'msvs_use_common_linker_extras': 0, 8 'msvs_use_common_linker_extras': 0,
9 }, 9 },
10 'includes': [ 10 'includes': [
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 'mini_installer/chrome_appid.cc', 186 'mini_installer/chrome_appid.cc',
187 ], 187 ],
188 'rules': [ 188 'rules': [
189 { 189 {
190 'rule_name': 'installer_archive', 190 'rule_name': 'installer_archive',
191 'extension': 'release', 191 'extension': 'release',
192 'variables': { 192 'variables': {
193 'create_installer_archive_py_path': 193 'create_installer_archive_py_path':
194 '../tools/build/win/create_installer_archive.py', 194 '../tools/build/win/create_installer_archive.py',
195 }, 195 },
196 'conditions': [
197 ['enable_hidpi == 1', {
198 'variables': {
199 'enable_hidpi_flag': '--enable_hidpi=1',
200 },
201 }, {
202 'variables': {
203 'enable_hidpi_flag': '',
204 },
205 }],
206 ['enable_metro == 1', {
207 'variables': {
208 'enable_metro_flag': '--enable_metro=1',
209 },
210 }, {
211 'variables': {
212 'enable_metro_flag': '',
213 },
214 }],
215 ],
196 'inputs': [ 216 'inputs': [
197 '<(create_installer_archive_py_path)', 217 '<(create_installer_archive_py_path)',
198 '<(PRODUCT_DIR)/chrome.exe', 218 '<(PRODUCT_DIR)/chrome.exe',
199 '<(PRODUCT_DIR)/chrome.dll', 219 '<(PRODUCT_DIR)/chrome.dll',
200 '<(PRODUCT_DIR)/nacl64.exe', 220 '<(PRODUCT_DIR)/nacl64.exe',
201 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 221 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
202 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 222 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
203 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 223 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
204 '<(PRODUCT_DIR)/locales/en-US.pak', 224 '<(PRODUCT_DIR)/locales/en-US.pak',
205 '<(PRODUCT_DIR)/icudt.dll', 225 '<(PRODUCT_DIR)/icudt.dll',
206 ], 226 ],
207 'outputs': [ 227 'outputs': [
208 'xxx2.out', 228 'xxx2.out',
209 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', 229 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z',
210 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', 230 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z',
211 '<(PRODUCT_DIR)/setup.ex_', 231 '<(PRODUCT_DIR)/setup.ex_',
212 '<(INTERMEDIATE_DIR)/packed_files.rc', 232 '<(INTERMEDIATE_DIR)/packed_files.rc',
213 ], 233 ],
214 'action': [ 234 'action': [
215 'python', 235 'python',
216 '<(create_installer_archive_py_path)', 236 '<(create_installer_archive_py_path)',
217 '--build_dir', '<(PRODUCT_DIR)', 237 '--build_dir', '<(PRODUCT_DIR)',
218 '--staging_dir', '<(INTERMEDIATE_DIR)', 238 '--staging_dir', '<(INTERMEDIATE_DIR)',
219 '--input_file', '<(RULE_INPUT_PATH)', 239 '--input_file', '<(RULE_INPUT_PATH)',
220 '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc', 240 '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc',
241 '<(enable_hidpi_flag)',
242 '<(enable_metro_flag)',
221 # TODO(sgk): may just use environment variables 243 # TODO(sgk): may just use environment variables
222 #'--distribution=$(CHROMIUM_BUILD)', 244 #'--distribution=$(CHROMIUM_BUILD)',
223 '--distribution=_google_chrome', 245 '--distribution=_google_chrome',
224 # Optional arguments to generate diff installer 246 # Optional arguments to generate diff installer
225 #'--last_chrome_installer=C:/Temp/base', 247 #'--last_chrome_installer=C:/Temp/base',
226 #'--setup_exe_format=DIFF', 248 #'--setup_exe_format=DIFF',
227 #'--diff_algorithm=COURGETTE', 249 #'--diff_algorithm=COURGETTE',
228 ], 250 ],
229 'message': 'Create installer archive' 251 'message': 'Create installer archive'
230 }, 252 },
231 ], 253 ],
232 }, 254 },
233 ], 255 ],
234 }], 256 }],
235 [ 'branding == "Chrome"', { 257 [ 'branding == "Chrome"', {
236 'variables': { 258 'variables': {
237 'branding_dir': '../app/theme/google_chrome', 259 'branding_dir': '../app/theme/google_chrome',
238 }, 260 },
239 }, { # else branding!="Chrome" 261 }, { # else branding!="Chrome"
240 'variables': { 262 'variables': {
241 'branding_dir': '../app/theme/chromium', 263 'branding_dir': '../app/theme/chromium',
242 }, 264 },
243 }], 265 }],
244 ], 266 ],
245 } 267 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/installer/mini_installer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698