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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/app/theme/SConscript

Issue 24011: chrome_resources take 2 (Closed)
Patch Set: rebase Created 11 years, 10 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
« no previous file with comments | « chrome/app/chrome_resources.vcproj ('k') | chrome/app/theme/distribution_resources.rc » ('j') | 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) 2006-2008 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2006-2008 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 Import('env', 'env_res') 5 Import('env', 'env_res')
6 6
7 env = env.Clone() 7 env = env.Clone()
8 env_res = env_res.Clone() 8 env_res = env_res.Clone()
9 9
10 env_res.Append( 10 env_res.Append(
11 CPPPATH = [ 11 CPPPATH = [
12 '.', 12 '.',
13 '$CHROME_SRC_DIR', 13 '$CHROME_SRC_DIR',
14 ], 14 ],
15 RCFLAGS = [
16 ['/l', '0x409'],
17 ],
18 ) 15 )
19 16
17 if env.Bit('windows'):
18 env_res.Append(
19 RCFLAGS = [
20 ['/l', '0x409'],
21 ],
22 )
20 23
21 env.Append( 24 env.Append(
22 LINKFLAGS = [ 25 LINKFLAGS = [
23 '/INCREMENTAL:NO', 26 '/INCREMENTAL:NO',
24 '/DELAYLOAD:"dwmapi.dll"', 27 '/DELAYLOAD:"dwmapi.dll"',
25 '/DELAYLOAD:"uxtheme.dll"', 28 '/DELAYLOAD:"uxtheme.dll"',
26 29
27 '/NOENTRY', 30 '/NOENTRY',
28 '/BASE:"0x3CE00000"', 31 '/BASE:"0x3CE00000"',
29 '/MACHINE:X86', 32 '/MACHINE:X86',
30 '/FIXED:No', 33 '/FIXED:No',
31 34
32 '/safeseh', 35 '/safeseh',
33 '/dynamicbase', 36 '/dynamicbase',
34 '/ignore:4199', 37 '/ignore:4199',
35 '/nxcompat', 38 '/nxcompat',
36 ], 39 ],
37 ) 40 )
38 41
39 input_files = ChromeFileList([ 42 # TODO(tc): We need to pass in a preprocessor define for official builds.
40 'theme_resources.h', 43 generated = env.GRIT(
41 'theme_resources.rc', 44 '$TARGET_ROOT/grit_derived_sources/fake_theme_target',
42 'distribution_resources.rc', 45 '$CHROME_SRC_DIR/chrome/app/theme/theme_resources.grd')
43 ])
44 46
45 res = [] 47 if env.Bit('windows'):
46 res.extend(env_res.RES('theme_resources.rc')) 48 input_files = ChromeFileList([
47 res.extend(env_res.RES('distribution_resources.rc')) 49 '$TARGET_ROOT/grit_derived_sources/theme_resources.rc',
50 ])
48 51
49 themes_default = env.ChromeSharedLibrary("default", res) 52 # TODO(tc): This causes scons to die because the regular expression that
50 env.Install("$DESTINATION_ROOT/themes", themes_default) 53 # scans .rc files for dependencies overflows (see
54 # SCons/Tool/Scanner/RC.py). Disable it for now because it's only for the
55 # Windows build.
56 #res = env.RES('$TARGET_ROOT/grit_derived_sources/theme_resources.rc')
51 57
52 p = env.ChromeMSVSProject('theme_dll.vcproj', 58 #themes_default = env.ChromeSharedLibrary("default", res)
53 dest=('$CHROME_SRC_DIR/chrome/' 59 #env.Install("$DESTINATION_ROOT/themes", themes_default)
54 + 'app/theme/theme_dll.vcproj'), 60
55 guid='{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}', 61 p = env.ChromeMSVSProject('theme_dll.vcproj',
56 keyword='Win32Proj', 62 dest=('$CHROME_SRC_DIR/chrome/'
57 # TODO(sgk): when we can intuit the hierarchy 63 + 'app/theme/theme_dll.vcproj'),
58 # from the built targets. 64 guid='{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}',
59 #buildtargets=TODO, 65 keyword='Win32Proj',
60 files=input_files, 66 # TODO(sgk): when we can intuit the hierarchy
61 tools=[ 67 # from the built targets.
62 'VCPreBuildEventTool', 68 #buildtargets=TODO,
63 'VCCustomBuildTool', 69 files=input_files,
64 'VCXMLDataGeneratorTool', 70 tools=[
65 'VCWebServiceProxyGeneratorTool', 71 'VCPreBuildEventTool',
66 'VCMIDLTool', 72 'VCCustomBuildTool',
67 'VCCLCompilerTool', 73 'VCXMLDataGeneratorTool',
68 'VCManagedResourceCompilerTool', 74 'VCWebServiceProxyGeneratorTool',
69 'VCResourceCompilerTool', 75 'VCMIDLTool',
70 'VCPreLinkEventTool', 76 'VCCLCompilerTool',
71 'VCLinkerTool', 77 'VCManagedResourceCompilerTool',
72 'VCALinkTool', 78 'VCResourceCompilerTool',
73 'VCManifestTool', 79 'VCPreLinkEventTool',
74 'VCXDCMakeTool', 80 'VCLinkerTool',
75 'VCBscMakeTool', 81 'VCALinkTool',
76 'VCFxCopTool', 82 'VCManifestTool',
77 'VCAppVerifierTool', 83 'VCXDCMakeTool',
78 'VCWebDeploymentTool', 84 'VCBscMakeTool',
79 'VCPostBuildEventTool', 85 'VCFxCopTool',
80 ], 86 'VCAppVerifierTool',
81 ConfigurationType='2') 87 'VCWebDeploymentTool',
88 'VCPostBuildEventTool',
89 ],
90 ConfigurationType='2')
82 91
83 92
84 p.AddConfig('Debug|Win32', 93 p.AddConfig('Debug|Win32',
85 InheritedPropertySheets=[ 94 InheritedPropertySheets=[
86 '$(SolutionDir)../build/debug.vsprops', 95 '$(SolutionDir)../build/debug.vsprops',
87 './theme_dll.vsprops', 96 './theme_dll.vsprops',
88 ]) 97 ])
89 98
90 p.AddConfig('Release|Win32', 99 p.AddConfig('Release|Win32',
91 InheritedPropertySheets=[ 100 InheritedPropertySheets=[
92 '$(SolutionDir)../build/release.vsprops', 101 '$(SolutionDir)../build/release.vsprops',
93 './theme_dll.vsprops', 102 './theme_dll.vsprops',
94 ]) 103 ])
OLDNEW
« no previous file with comments | « chrome/app/chrome_resources.vcproj ('k') | chrome/app/theme/distribution_resources.rc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698