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

Side by Side Diff: remoting/remoting.gyp

Issue 10081026: Chromoting Host installation should take into account both buildtype% and branding%. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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 | « remoting/host/installer/chromoting.wxs ('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 { 5 {
6 'variables': { 6 'variables': {
7 # TODO(dmaclach): can we pick this up some other way? Right now it's 7 # TODO(dmaclach): can we pick this up some other way? Right now it's
8 # duplicated from chrome.gyp 8 # duplicated from chrome.gyp
9 'chromium_code': 1, 9 'chromium_code': 1,
10 # Use consistent strings across all platforms. Note that the plugin name 10 # Use consistent strings across all platforms. Note that the plugin name
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 'remoting_service', 407 'remoting_service',
408 'remoting_me2me_host', 408 'remoting_me2me_host',
409 ], 409 ],
410 'sources': [ 410 'sources': [
411 'host/installer/chromoting.wxs', 411 'host/installer/chromoting.wxs',
412 ], 412 ],
413 'outputs': [ 413 'outputs': [
414 '<(PRODUCT_DIR)/chromoting.msi', 414 '<(PRODUCT_DIR)/chromoting.msi',
415 ], 415 ],
416 'conditions': [ 416 'conditions': [
417 ['branding == "Chrome"', { 417 ['buildtype == "Official"', {
418 'variables': { 418 'variables': {
419 'branding': '-dOfficialBuild=1', 419 'official_build': '-dOfficialBuild=1',
420 }, 420 },
421 }, { # else branding!="Chrome" 421 }, { # else branding!="Chrome"
422 'variables': { 422 'variables': {
423 'branding': '', 423 'official_build': '',
424 }, 424 },
425 }], 425 }],
426 ], 426 ],
427 'rules': [ 427 'rules': [
428 { 428 {
429 'rule_name': 'candle', 429 'rule_name': 'candle',
430 'extension': 'wxs', 430 'extension': 'wxs',
431 'inputs': [ 431 'inputs': [
432 '<(PRODUCT_DIR)/remoting_host_controller.exe', 432 '<(PRODUCT_DIR)/remoting_host_controller.exe',
433 '<(PRODUCT_DIR)/remoting_me2me_host.exe', 433 '<(PRODUCT_DIR)/remoting_me2me_host.exe',
434 '<(PRODUCT_DIR)/remoting_service.exe', 434 '<(PRODUCT_DIR)/remoting_service.exe',
435 '<(platformsdk_path)/redist/x86/sas.dll' 435 '<(platformsdk_path)/redist/x86/sas.dll'
436 ], 436 ],
437 'outputs': [ 437 'outputs': [
438 '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).wixobj', 438 '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).wixobj',
439 ], 439 ],
440 'process_outputs_as_sources': 1, 440 'process_outputs_as_sources': 1,
441 'msvs_cygwin_shell': 0, 441 'msvs_cygwin_shell': 0,
442 'msvs_quote_cmd': 0, 442 'msvs_quote_cmd': 0,
443 'action': [ 443 'action': [
444 '"<(wix_path)\\candle"', 444 '"<(wix_path)\\candle"',
445 '-ext "<(wix_path)\\WixFirewallExtension.dll"', 445 '-ext "<(wix_path)\\WixFirewallExtension.dll"',
446 '-ext "<(wix_path)\\WixUIExtension.dll"', 446 '-ext "<(wix_path)\\WixUIExtension.dll"',
447 '-ext "<(wix_path)\\WixUtilExtension.dll"', 447 '-ext "<(wix_path)\\WixUtilExtension.dll"',
448 '-dVersion=<(version_full) ' 448 '-dVersion=<(version_full) '
449 '"-dFileSource=<(PRODUCT_DIR)." ' 449 '"-dFileSource=<(PRODUCT_DIR)." '
450 '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll" ' 450 '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll" '
451 '<(branding) ' 451 '<(official_build) '
452 '"-dBranding=<(branding)" '
452 '-out <@(_outputs)', 453 '-out <@(_outputs)',
453 '"<(RULE_INPUT_PATH)"', 454 '"<(RULE_INPUT_PATH)"',
454 ], 455 ],
455 'message': 'Generating <@(_outputs)', 456 'message': 'Generating <@(_outputs)',
456 }, 457 },
457 { 458 {
458 'rule_name': 'light', 459 'rule_name': 'light',
459 'extension': 'wixobj', 460 'extension': 'wixobj',
460 'inputs': [ 461 'inputs': [
461 '<(PRODUCT_DIR)/remoting_host_controller.exe', 462 '<(PRODUCT_DIR)/remoting_host_controller.exe',
462 '<(PRODUCT_DIR)/remoting_me2me_host.exe', 463 '<(PRODUCT_DIR)/remoting_me2me_host.exe',
463 '<(PRODUCT_DIR)/remoting_service.exe', 464 '<(PRODUCT_DIR)/remoting_service.exe',
464 '<(platformsdk_path)/redist/x86/sas.dll' 465 '<(platformsdk_path)/redist/x86/sas.dll'
465 ], 466 ],
466 'outputs': [ 467 'outputs': [
467 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi', 468 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi',
468 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).wixpdb', 469 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).wixpdb',
469 ], 470 ],
470 'msvs_cygwin_shell': 0, 471 'msvs_cygwin_shell': 0,
471 'msvs_quote_cmd': 0, 472 'msvs_quote_cmd': 0,
472 'action': [ 473 'action': [
473 '"<(wix_path)\\light"', 474 '"<(wix_path)\\light"',
474 '-ext "<(wix_path)\\WixFirewallExtension.dll"', 475 '-ext "<(wix_path)\\WixFirewallExtension.dll"',
475 '-ext "<(wix_path)\\WixUIExtension.dll"', 476 '-ext "<(wix_path)\\WixUIExtension.dll"',
476 '-ext "<(wix_path)\\WixUtilExtension.dll"', 477 '-ext "<(wix_path)\\WixUtilExtension.dll"',
477 '-cultures:en-us', 478 '-cultures:en-us',
478 '-dVersion=<(version_full) ' 479 '-dVersion=<(version_full) '
479 '"-dFileSource=<(PRODUCT_DIR)." ' 480 '"-dFileSource=<(PRODUCT_DIR)." '
480 '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll" ' 481 '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll" '
481 '<(branding) ' 482 '<(official_build) '
483 '"-dBranding=<(branding)" '
482 '-out "<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi"', 484 '-out "<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi"',
483 '"<(RULE_INPUT_PATH)"', 485 '"<(RULE_INPUT_PATH)"',
484 ], 486 ],
485 'message': 'Generating <(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi', 487 'message': 'Generating <(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi',
486 }, 488 },
487 ], 489 ],
488 }, # end of target 'remoting_host_installation' 490 }, # end of target 'remoting_host_installation'
489 ], # end of 'targets' 491 ], # end of 'targets'
490 }], # '<(wix_path) != ""' 492 }], # '<(wix_path) != ""'
491 493
(...skipping 893 matching lines...) Expand 10 before | Expand all | Expand 10 after
1385 '../base/allocator/allocator.gyp:allocator', 1387 '../base/allocator/allocator.gyp:allocator',
1386 ], 1388 ],
1387 }, 1389 },
1388 ], 1390 ],
1389 ], 1391 ],
1390 }], 1392 }],
1391 ], # end of 'conditions' 1393 ], # end of 'conditions'
1392 }, # end of target 'remoting_unittests' 1394 }, # end of target 'remoting_unittests'
1393 ], # end of targets 1395 ], # end of targets
1394 } 1396 }
OLDNEW
« no previous file with comments | « remoting/host/installer/chromoting.wxs ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698