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

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

Issue 10879020: Refactor manifests to allow all executables to use the same base manifests as AdditionalManifestFil… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: pather Created 8 years, 4 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/chrome_installer.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 'mini_installer_internal_deps%': 0, 9 'mini_installer_internal_deps%': 0,
10 'mini_installer_official_deps%': 0, 10 'mini_installer_official_deps%': 0,
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 ], 72 ],
73 'conditions': [ 73 'conditions': [
74 ['MSVS_VERSION=="2005e"', { 74 ['MSVS_VERSION=="2005e"', {
75 'AdditionalDependencies': [ # Must explicitly link in VC2005E 75 'AdditionalDependencies': [ # Must explicitly link in VC2005E
76 'advapi32.lib', 76 'advapi32.lib',
77 'shell32.lib', 77 'shell32.lib',
78 ], 78 ],
79 }], 79 }],
80 ], 80 ],
81 }, 81 },
82 'VCManifestTool': {
83 'AdditionalManifestFiles': [
84 '$(ProjectDir)\\mini_installer\\mini_installer.exe.manifest',
85 ],
86 },
87 }, 82 },
88 'configurations': { 83 'configurations': {
89 'Debug_Base': { 84 'Debug_Base': {
90 'msvs_settings': { 85 'msvs_settings': {
91 'VCCLCompilerTool': { 86 'VCCLCompilerTool': {
92 'BasicRuntimeChecks': '0', 87 'BasicRuntimeChecks': '0',
93 'BufferSecurityCheck': 'false', 88 'BufferSecurityCheck': 'false',
94 'ExceptionHandling': '0', 89 'ExceptionHandling': '0',
95 }, 90 },
96 'VCLinkerTool': { 91 'VCLinkerTool': {
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 { 173 {
179 'target_name': 'mini_installer', 174 'target_name': 'mini_installer',
180 'type': 'executable', 175 'type': 'executable',
181 176
182 # Disable precompiled headers for this project, to avoid 177 # Disable precompiled headers for this project, to avoid
183 # linker errors when building with VS 2008. 178 # linker errors when building with VS 2008.
184 'msvs_precompiled_header': '', 179 'msvs_precompiled_header': '',
185 'msvs_precompiled_source': '', 180 'msvs_precompiled_source': '',
186 181
187 'sources': [ 182 'sources': [
183 '../app/additional.manifest',
188 'mini_installer/chrome.release', 184 'mini_installer/chrome.release',
189 'mini_installer/chrome_appid.cc', 185 'mini_installer/chrome_appid.cc',
190 ], 186 ],
187 'msvs_settings': {
188 'VCManifestTool': {
189 'AdditionalManifestFiles': [
190 '$(ProjectDir)\\..\\app\\additional.manifest',
191 ],
192 },
193 },
191 'rules': [ 194 'rules': [
192 { 195 {
193 'rule_name': 'installer_archive', 196 'rule_name': 'installer_archive',
194 'extension': 'release', 197 'extension': 'release',
195 'variables': { 198 'variables': {
196 'create_installer_archive_py_path': 199 'create_installer_archive_py_path':
197 '../tools/build/win/create_installer_archive.py', 200 '../tools/build/win/create_installer_archive.py',
198 }, 201 },
199 'conditions': [ 202 'conditions': [
200 ['enable_hidpi == 1', { 203 ['enable_hidpi == 1', {
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 'variables': { 294 'variables': {
292 'branding_dir': '../app/theme/google_chrome', 295 'branding_dir': '../app/theme/google_chrome',
293 }, 296 },
294 }, { # else branding!="Chrome" 297 }, { # else branding!="Chrome"
295 'variables': { 298 'variables': {
296 'branding_dir': '../app/theme/chromium', 299 'branding_dir': '../app/theme/chromium',
297 }, 300 },
298 }], 301 }],
299 ], 302 ],
300 } 303 }
OLDNEW
« no previous file with comments | « chrome/chrome_installer.gypi ('k') | chrome/installer/mini_installer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698