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

Side by Side Diff: remoting/remoting.gyp

Issue 10392172: Move remoting dark/candle/light steps to external script (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add message to unittest rule 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
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 668 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 'rules': [ 679 'rules': [
680 { 680 {
681 'rule_name': 'candle', 681 'rule_name': 'candle',
682 'extension': 'wxs', 682 'extension': 'wxs',
683 'inputs': [ 683 'inputs': [
684 '<(PRODUCT_DIR)/remoting_host_controller.exe', 684 '<(PRODUCT_DIR)/remoting_host_controller.exe',
685 '<(PRODUCT_DIR)/remoting_me2me_host.exe', 685 '<(PRODUCT_DIR)/remoting_me2me_host.exe',
686 '<(PRODUCT_DIR)/remoting_service.exe', 686 '<(PRODUCT_DIR)/remoting_service.exe',
687 '<(platformsdk_path)/redist/x86/sas.dll', 687 '<(platformsdk_path)/redist/x86/sas.dll',
688 'resources/chromoting.ico', 688 'resources/chromoting.ico',
689 ], 689 'candle_and_light.py',
690 'outputs': [
691 '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).wixobj',
692 ],
693 'process_outputs_as_sources': 1,
694 'msvs_cygwin_shell': 0,
695 'action': [
696 '<(wix_path)\\candle',
697 '-ext', '<(wix_path)\\WixFirewallExtension.dll',
698 '-ext', '<(wix_path)\\WixUIExtension.dll',
699 '-ext', '<(wix_path)\\WixUtilExtension.dll',
700 '-dVersion=<(version_full)',
701 '-dFileSource=<(PRODUCT_DIR).',
702 '-dIconPath=resources/chromoting.ico',
703 '-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll',
704 '<@(_wix_defines)',
705 '-out', '<@(_outputs)',
706 '<(RULE_INPUT_PATH)',
707 ],
708 'message': 'Generating <@(_outputs)',
709 },
710 {
711 'rule_name': 'light',
712 'extension': 'wixobj',
713 'inputs': [
714 '<(PRODUCT_DIR)/remoting_host_controller.exe',
715 '<(PRODUCT_DIR)/remoting_me2me_host.exe',
716 '<(PRODUCT_DIR)/remoting_service.exe',
717 '<(platformsdk_path)/redist/x86/sas.dll',
718 'resources/chromoting.ico',
719 ], 690 ],
720 'outputs': [ 691 'outputs': [
721 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi', 692 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi',
722 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).wixpdb', 693 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).wixpdb',
723 ], 694 ],
724 'msvs_cygwin_shell': 0, 695 'msvs_cygwin_shell': 0,
725 'action': [ 696 'action': [
726 '<(wix_path)\\light', 697 'python', 'candle_and_light.py',
727 '-ext', '<(wix_path)\\WixFirewallExtension.dll', 698 '<(wix_path)',
728 '-ext', '<(wix_path)\\WixUIExtension.dll', 699 '<(version_full)',
729 '-ext', '<(wix_path)\\WixUtilExtension.dll', 700 '<(PRODUCT_DIR)',
730 '-cultures:en-us', 701 '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT)',
731 '-sw1076', 702 '<(platformsdk_path)',
732 '-dVersion=<(version_full)',
733 '-dFileSource=<(PRODUCT_DIR).',
734 '-dIconPath=resources/chromoting.ico',
735 '-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll',
736 '<@(_wix_defines)', 703 '<@(_wix_defines)',
737 '-out', '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi',
738 '<(RULE_INPUT_PATH)', 704 '<(RULE_INPUT_PATH)',
705 '<@(_outputs)',
739 ], 706 ],
740 'message': 'Generating <(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi', 707 'message': 'Generating <@(_outputs)',
741 }, 708 },
742 ], 709 ],
743 }, # end of target 'remoting_host_installation' 710 }, # end of target 'remoting_host_installation'
744 711
745 # The 'remoting_host_installation_unittest' target is used to make sure 712 # The 'remoting_host_installation_unittest' target is used to make sure
746 # that the code signing job (running outside of Chromium tree) will be 713 # that the code signing job (running outside of Chromium tree) will be
747 # able to unpack and re-assemble the installation successfully. 714 # able to unpack and re-assemble the installation successfully.
748 # 715 #
749 # *** If this target fails to compile the code signing job will fail 716 # *** If this target fails to compile the code signing job will fail
750 # too, breaking the official build. *** 717 # too, breaking the official build. ***
751 # 718 #
752 # N.B. The command lines passed to the WiX tools here should be in sync 719 # N.B. The command lines passed to the WiX tools here should be in sync
753 # with the code signing script. 720 # with the code signing script.
754 { 721 {
755 'target_name': 'remoting_host_installation_unittest', 722 'target_name': 'remoting_host_installation_unittest',
756 'type': 'none', 723 'type': 'none',
757 'dependencies': [ 724 'dependencies': [
758 'remoting_host_installation', 725 'remoting_host_installation',
759 ], 726 ],
760 'sources': [ 727 'sources': [
761 '<(PRODUCT_DIR)/chromoting.msi', 728 '<(PRODUCT_DIR)/chromoting.msi',
762 ], 729 ],
763 'outputs': [ 730 'outputs': [
764 '<(INTERMEDIATE_DIR)/chromoting-test.msi', 731 '<(INTERMEDIATE_DIR)/chromoting-test.msi',
765 ], 732 ],
766 'rules': [ 733 'rules': [
767 { 734 {
768 'rule_name': 'dark', 735 'rule_name': 'dark_and_candle_and_light',
769 'extension': 'msi', 736 'extension': 'msi',
737 'inputs': [
738 'dark_and_candle_and_light.py',
739 ],
770 'outputs': [ 740 'outputs': [
771 '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).wxs', 741 '<(INTERMEDIATE_DIR)/chromoting-test.msi',
772 ],
773 'process_outputs_as_sources': 1,
774 'msvs_cygwin_shell': 0,
775 'action': [
776 '<(wix_path)\\dark',
777 '<(RULE_INPUT_PATH)',
778 '-o', '<@(_outputs)',
779 '-x', '<(INTERMEDIATE_DIR).',
780 ],
781 'message': 'Dark: unpacking <(RULE_INPUT_PATH)',
782 },
783 {
784 'rule_name': 'candle',
785 'extension': 'wxs',
786 'outputs': [
787 '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).wixobj',
788 ],
789 'process_outputs_as_sources': 1,
790 'msvs_cygwin_shell': 0,
791 'action': [
792 '<(wix_path)\\candle',
793 '<(RULE_INPUT_PATH)',
794 '-o', '<@(_outputs)',
795 '-ext', '<(wix_path)\\WixFirewallExtension.dll',
796 ],
797 'message': 'Candle: compiling <(RULE_INPUT_PATH)',
798 },
799 {
800 'rule_name': 'light',
801 'extension': 'wixobj',
802 'outputs': [
803 '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT)-test.msi',
804 ], 742 ],
805 'msvs_cygwin_shell': 0, 743 'msvs_cygwin_shell': 0,
806 'action': [ 744 'action': [
807 '<(wix_path)\\light', 745 'python',
746 'dark_and_candle_and_light.py',
747 '<(wix_path)',
808 '<(RULE_INPUT_PATH)', 748 '<(RULE_INPUT_PATH)',
809 '-o', '<@(_outputs)', 749 '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT)',
810 '-ext', '<(wix_path)\\WixFirewallExtension.dll', 750 '<(INTERMEDIATE_DIR)',
811 '-sw1076', 751 '<@(_outputs)',
812 ], 752 ],
813 'message': 'Light: linking <(RULE_INPUT_PATH)', 753 'message': 'Unpacking and repacking to <@(_outputs)',
814 }, 754 },
815 ], 755 ],
816 }, # end of target 'remoting_host_installation_unittest' 756 }, # end of target 'remoting_host_installation_unittest'
817 ], # end of 'targets' 757 ], # end of 'targets'
818 }], # '<(wix_path) != ""' 758 }], # '<(wix_path) != ""'
819 759
820 ], # end of 'conditions' 760 ], # end of 'conditions'
821 761
822 'targets': [ 762 'targets': [
823 { 763 {
(...skipping 945 matching lines...) Expand 10 before | Expand all | Expand 10 after
1769 '../base/allocator/allocator.gyp:allocator', 1709 '../base/allocator/allocator.gyp:allocator',
1770 ], 1710 ],
1771 }, 1711 },
1772 ], 1712 ],
1773 ], 1713 ],
1774 }], 1714 }],
1775 ], # end of 'conditions' 1715 ], # end of 'conditions'
1776 }, # end of target 'remoting_unittests' 1716 }, # end of target 'remoting_unittests'
1777 ], # end of targets 1717 ], # end of targets
1778 } 1718 }
OLDNEW
« remoting/candle_and_light.py ('K') | « remoting/dark_and_candle_and_light.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698