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

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

Issue 6693015: Switch out the setup api for using the cabinet API directly.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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 { 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': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/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 'conditions': [ 10 'conditions': [
11 ['OS=="win"', { 11 ['OS=="win"', {
12 'target_defaults': { 12 'target_defaults': {
13 'dependencies': [ 13 'dependencies': [
14 '../chrome.gyp:chrome', 14 '../chrome.gyp:chrome',
15 '../chrome.gyp:chrome_nacl_win64', 15 '../chrome.gyp:chrome_nacl_win64',
16 '../chrome.gyp:chrome_dll', 16 '../chrome.gyp:chrome_dll',
17 '../chrome.gyp:default_extensions', 17 '../chrome.gyp:default_extensions',
18 '../chrome.gyp:setup', 18 '../chrome.gyp:setup',
19 ], 19 ],
20 'include_dirs': [ 20 'include_dirs': [
21 '../..', 21 '../..',
22 '<(PRODUCT_DIR)', 22 '<(PRODUCT_DIR)',
23 '<(INTERMEDIATE_DIR)', 23 '<(INTERMEDIATE_DIR)',
24 '<(SHARED_INTERMEDIATE_DIR)/chrome', 24 '<(SHARED_INTERMEDIATE_DIR)/chrome',
25 ], 25 ],
26 'sources': [ 26 'sources': [
27 'mini_installer/appid.h', 27 'mini_installer/appid.h',
28 'mini_installer/decompress.cc',
29 'mini_installer/decompress.h',
28 'mini_installer/mini_installer.cc', 30 'mini_installer/mini_installer.cc',
29 'mini_installer/mini_installer.h', 31 'mini_installer/mini_installer.h',
30 'mini_installer/mini_installer.ico', 32 'mini_installer/mini_installer.ico',
31 'mini_installer/mini_installer.rc', 33 'mini_installer/mini_installer.rc',
32 'mini_installer/mini_installer_exe_version.rc.version', 34 'mini_installer/mini_installer_exe_version.rc.version',
33 'mini_installer/mini_installer_resource.h', 35 'mini_installer/mini_installer_resource.h',
34 'mini_installer/mini_string.cc', 36 'mini_installer/mini_string.cc',
35 'mini_installer/mini_string.h', 37 'mini_installer/mini_string.h',
36 'mini_installer/pe_resource.cc', 38 'mini_installer/pe_resource.cc',
37 'mini_installer/pe_resource.h', 39 'mini_installer/pe_resource.h',
(...skipping 22 matching lines...) Expand all
60 ['MSVS_VERSION=="2010"', { 62 ['MSVS_VERSION=="2010"', {
61 'AdditionalDependencies': [ 63 'AdditionalDependencies': [
62 # These two object files are included in Visual Studio 2008 64 # These two object files are included in Visual Studio 2008
63 # but not 2010. 65 # but not 2010.
64 # TODO(bradnelson): 66 # TODO(bradnelson):
65 # http://code.google.com/p/chromium/issues/detail?id=72885 67 # http://code.google.com/p/chromium/issues/detail?id=72885
66 '"$(VCInstallDir)..\\..\\Microsoft Visual Studio 9.0\\VC\\' 68 '"$(VCInstallDir)..\\..\\Microsoft Visual Studio 9.0\\VC\\'
67 'crt\\src\\intel\\mt_lib\\memset.obj"', 69 'crt\\src\\intel\\mt_lib\\memset.obj"',
68 '"$(VCInstallDir)..\\..\\Microsoft Visual Studio 9.0\\VC\\' 70 '"$(VCInstallDir)..\\..\\Microsoft Visual Studio 9.0\\VC\\'
69 'crt\\src\\intel\\mt_lib\\P4_memset.obj"', 71 'crt\\src\\intel\\mt_lib\\P4_memset.obj"',
70 'setupapi.lib',
71 ], 72 ],
72 },{ 73 },{
73 'AdditionalDependencies': [ 74 'AdditionalDependencies': [
74 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"', 75 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"',
75 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"', 76 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"',
76 'setupapi.lib',
77 ], 77 ],
78 }], 78 }],
79 ], 79 ],
80 }, 80 },
81 'VCManifestTool': { 81 'VCManifestTool': {
82 'AdditionalManifestFiles': [ 82 'AdditionalManifestFiles': [
83 '$(ProjectDir)\\mini_installer\\mini_installer.exe.manifest', 83 '$(ProjectDir)\\mini_installer\\mini_installer.exe.manifest',
84 ], 84 ],
85 }, 85 },
86 }, 86 },
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 }, 235 },
236 }], 236 }],
237 ], 237 ],
238 } 238 }
239 239
240 # Local Variables: 240 # Local Variables:
241 # tab-width:2 241 # tab-width:2
242 # indent-tabs-mode:nil 242 # indent-tabs-mode:nil
243 # End: 243 # End:
244 # vim: set expandtab tabstop=2 shiftwidth=2: 244 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698