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

Side by Side Diff: installer/win/installer.gyp

Issue 210044: This removes some redundant copying of the cactions dll into (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: Created 11 years, 3 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 | « no previous file | 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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'chromium_code': 1, 7 'chromium_code': 1,
8 'wixdir': 'third_party\\wix_2_0_4221\\files', 8 'wixdir': 'third_party\\wix_2_0_4221\\files',
9 'dx_redist_path': '../../../o3d-internal/third_party/dx_nov_2007_redist', 9 'dx_redist_path': '../../../o3d-internal/third_party/dx_nov_2007_redist',
10 'dx_redist_exists': '<!(python ../../build/file_exists.py ../../../o3d-inter nal/third_party/dx_nov_2007_redist/d3dx9_36.dll)', 10 'dx_redist_exists': '<!(python ../../build/file_exists.py ../../../o3d-inter nal/third_party/dx_nov_2007_redist/d3dx9_36.dll)',
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 '-lshell32.lib', 69 '-lshell32.lib',
70 '-lshlwapi.lib', 70 '-lshlwapi.lib',
71 '-luser32.lib', 71 '-luser32.lib',
72 ], 72 ],
73 # Disable the #pragma deprecated warning because 73 # Disable the #pragma deprecated warning because
74 # ATL seems to use deprecated CRT libs. 74 # ATL seems to use deprecated CRT libs.
75 'msvs_disabled_warnings': [4995], 75 'msvs_disabled_warnings': [4995],
76 'msvs_configuration_attributes': { 76 'msvs_configuration_attributes': {
77 'UseOfATL': '1', # 1 = static link to ATL, 2 = dynamic link 77 'UseOfATL': '1', # 1 = static link to ATL, 2 = dynamic link
78 }, 78 },
79 'copies': [
80 {
81 'destination': '<(PRODUCT_DIR)',
82 'files': [
83 'cactions.dll',
84 ],
85 },
86 ],
87 }, 79 },
88 { 80 {
89 'target_name': 'installer', 81 'target_name': 'installer',
90 'type': 'none', 82 'type': 'none',
91 'variables': { 83 'variables': {
92 'candle_exe': '../../../<(wixdir)/candle.exe', 84 'candle_exe': '../../../<(wixdir)/candle.exe',
93 'light_exe': '../../../<(wixdir)/light.exe', 85 'light_exe': '../../../<(wixdir)/light.exe',
94 'custom_actions_path': '<(PRODUCT_DIR)/cactions.dll', 86 'custom_actions_path': '<(PRODUCT_DIR)/cactions.dll',
95 'd3dx_guid': '<!(<(guidgen) <(o3d_namespace_guid) d3dx-<(nppversion))', 87 'd3dx_guid': '<!(<(guidgen) <(o3d_namespace_guid) d3dx-<(nppversion))',
96 'dbl_path': '../../installer/win/driver_blacklist.txt', 88 'dbl_path': '../../installer/win/driver_blacklist.txt',
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 'targets': [ 285 'targets': [
294 { 286 {
295 'target_name': 'extras_installer', 287 'target_name': 'extras_installer',
296 'type': 'none', 288 'type': 'none',
297 }, 289 },
298 ], 290 ],
299 }, 291 },
300 ], 292 ],
301 ], 293 ],
302 } 294 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698