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

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

Issue 150045: Learned that mini_installer's linker settings cannot actually be shared... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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
« build/common.gypi ('K') | « chrome/installer/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')
Property Changes:
Added: svn:executable
+ *
OLDNEW
(Empty)
1 {
2 'variables': {
3 'version_py': '../../chrome/tools/build/version.py',
4 'version_path': '../../chrome/VERSION',
5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
6 # 'branding_dir' is set in the 'conditions' section at the bottom.
7 'msvs_use_common_linker_extras': 0,
8 'msvs_use_common_release': 0,
9 },
10 'includes': [
11 '../../build/common.gypi',
12 ],
13 'conditions': [
14 ['OS=="win"', {
15 'targets': [
16 {
17 'target_name': 'mini_installer',
18 'type': 'executable',
19 'msvs_guid': '24A5AC7C-280B-4899-9153-6BA570A081E7',
20 'dependencies': [
21 '../chrome.gyp:chrome',
22 '../chrome.gyp:chrome_dll',
23 '../../testing/gtest.gyp:gtest',
24 'installer.gyp:setup',
25 ],
26 'include_dirs': [
27 '../..',
28 '<(PRODUCT_DIR)',
29 '<(INTERMEDIATE_DIR)',
30 ],
31 'sources': [
32 'mini_installer/chrome.release',
33 'mini_installer/mini_installer.cc',
34 'mini_installer/mini_installer.h',
35 'mini_installer/mini_installer.ico',
36 'mini_installer/mini_installer.rc',
37 'mini_installer/mini_installer_exe_version.rc.version',
38 'mini_installer/mini_installer_resource.h',
39 'mini_installer/pe_resource.cc',
40 'mini_installer/pe_resource.h',
41 ],
42 'msvs_settings': {
43 'VCCLCompilerTool': {
44 'EnableIntrinsicFunctions': 'true',
45 'BufferSecurityCheck': 'false',
46 },
47 'VCLinkerTool': {
48 'AdditionalOptions':
49 '/safeseh:no /dynamicbase:no /ignore:4199 /ignore:4221 /nxcompat ',
50 'RandomizedBaseAddress': '1',
51 'DataExecutionPrevention': '0',
52 'AdditionalLibraryDirectories':
53 ['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib;<(PRODU CT_DIR)/lib'],
54 # TODO(bradnelson): change when vsprops are all in gyp.
55 'DelayLoadDLLs': [],
56 'EntryPointSymbol': 'MainEntryPoint',
57 'GenerateMapFile': 'true',
58 'IgnoreAllDefaultLibraries': 'true',
59 'OptimizeForWindows98': '1',
60 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
61 },
62 },
63 'configurations': {
64 'Debug': {
65 'msvs_settings': {
66 'VCCLCompilerTool': {
67 'BasicRuntimeChecks': '0',
68 },
69 # TODO(bradnelson): Add these back to common configuration
70 # when vsprops goes away.
71 'VCLinkerTool': {
72 'AdditionalDependencies': [
73 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"',
74 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"',
75 'shlwapi.lib',
76 ],
77 },
78 },
79 },
80 'Release': {
81 'msvs_props': ['mini_installer/mini_installer_release.vsprops'],
82 'msvs_settings': {
83 'VCCLCompilerTool': {
84 'BasicRuntimeChecks': '0',
85 },
86 },
87 },
88 },
89 'rules': [
90 {
91 'rule_name': 'mini_installer_version',
92 'extension': 'version',
93 'variables': {
94 'template_input_path': 'mini_installer/mini_installer_exe_versio n.rc.version',
95 },
96 'inputs': [
97 '<(template_input_path)',
98 '<(version_path)',
99 '<(lastchange_path)',
100 '<(branding_dir)/BRANDING',
101 ],
102 'outputs': [
103 '<(INTERMEDIATE_DIR)/mini_installer_exe_version.rc',
104 ],
105 'action': [
106 'python', '<(version_py)',
107 '-f', '<(version_path)',
108 '-f', '<(lastchange_path)',
109 '-f', '<(branding_dir)/BRANDING',
110 '<(template_input_path)',
111 '<@(_outputs)',
112 ],
113 'process_outputs_as_sources': 1,
114 'message': 'Generating version information'
115 },
116 {
117 'rule_name': 'installer_archive',
118 'extension': 'release',
119 'variables': {
120 'create_installer_archive_py_path':
121 '../tools/build/win/create_installer_archive.py',
122 },
123 'inputs': [
124 '<(create_installer_archive_py_path)',
125 '<(PRODUCT_DIR)/chrome.exe',
126 '<(PRODUCT_DIR)/chrome.dll',
127 '<(PRODUCT_DIR)/locales/en-US.dll',
128 '<(PRODUCT_DIR)/icudt38.dll',
129 ],
130 'outputs': [
131 'xxx.out',
132 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z',
133 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z',
134 '<(PRODUCT_DIR)/setup.ex_',
135 '<(PRODUCT_DIR)/packed_files.txt',
136 ],
137 'action': [
138 'python',
139 '<(create_installer_archive_py_path)',
140 '--output_dir=<(PRODUCT_DIR)',
141 '--input_file=<(RULE_INPUT_PATH)',
142 # TODO(sgk): may just use environment variables
143 #'--distribution=$(CHROMIUM_BUILD)',
144 '--distribution=_google_chrome',
145 ],
146 'message': 'Create installer archive'
147 },
148 ],
149 # TODO(mark): <(branding_dir) should be defined by the
150 # global condition block at the bottom of the file, but
151 # this doesn't work due to the following issue:
152 #
153 # http://code.google.com/p/gyp/issues/detail?id=22
154 #
155 # Remove this block once the above issue is fixed.
156 'conditions': [
157 [ 'branding == "Chrome"', {
158 'variables': {
159 'branding_dir': '../app/theme/google_chrome',
160 },
161 }, { # else branding!="Chrome"
162 'variables': {
163 'branding_dir': '../app/theme/chromium',
164 },
165 }],
166 ],
167 },
168 ],
169 }],
170 [ 'branding == "Chrome"', {
171 'variables': {
172 'branding_dir': '../app/theme/google_chrome',
173 },
174 }, { # else branding!="Chrome"
175 'variables': {
176 'branding_dir': '../app/theme/chromium',
177 },
178 }],
179 ],
180 }
OLDNEW
« build/common.gypi ('K') | « chrome/installer/installer.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698