OLD | NEW |
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') | 5 Import('env') |
6 | 6 |
7 env = env.Clone() | 7 env = env.Clone() |
8 | 8 |
9 env.ApplySConscript([ | 9 env.ApplySConscript([ |
10 '$BREAKPAD_DIR/using_breakpad.scons', | 10 '$BREAKPAD_DIR/using_breakpad.scons', |
11 '$CHROME_DIR/third_party/wtl/using_wtl.scons', | 11 '$CHROME_DIR/third_party/wtl/using_wtl.scons', |
12 '$ICU38_DIR/using_icu38.scons', | 12 '$ICU38_DIR/using_icu38.scons', |
13 '$LIBJPEG_DIR/using_libjpeg.scons', | 13 '$LIBJPEG_DIR/using_libjpeg.scons', |
14 '$LIBPNG_DIR/using_libpng.scons', | 14 '$LIBPNG_DIR/using_libpng.scons', |
15 '$LIBXML_DIR/using_libxml.scons', | 15 '$LIBXML_DIR/using_libxml.scons', |
16 '$LZMA_SDK_DIR/using_lzma_sdk.scons', | 16 '$LZMA_SDK_DIR/using_lzma_sdk.scons', |
17 '$NPAPI_DIR/using_npapi.scons', | 17 '$NPAPI_DIR/using_npapi.scons', |
18 '$SKIA_DIR/using_skia.scons', | 18 '$SKIA_DIR/using_skia.scons', |
19 '$ZLIB_DIR/using_zlib.scons', | 19 '$ZLIB_DIR/using_zlib.scons', |
20 ]) | 20 ]) |
21 | 21 |
22 env.Prepend( | 22 env.Prepend( |
23 CPPPATH = [ | 23 CPPPATH = [ |
24 '$CHROME_SRC_DIR', | 24 '$CHROME_SRC_DIR', |
25 '.', | 25 '.', |
26 ], | 26 ], |
27 ) | 27 ) |
28 | 28 |
29 input_files = [ | 29 input_files = ChromeFileList([ |
30 'browser_distribution.cc', | 30 'browser_distribution.cc', |
| 31 'browser_distribution.h', |
31 'copy_tree_work_item.cc', | 32 'copy_tree_work_item.cc', |
| 33 'copy_tree_work_item.h', |
32 'create_dir_work_item.cc', | 34 'create_dir_work_item.cc', |
| 35 'create_dir_work_item.h', |
33 'create_reg_key_work_item.cc', | 36 'create_reg_key_work_item.cc', |
| 37 'create_reg_key_work_item.h', |
34 'delete_reg_value_work_item.cc', | 38 'delete_reg_value_work_item.cc', |
| 39 'delete_reg_value_work_item.h', |
35 'delete_tree_work_item.cc', | 40 'delete_tree_work_item.cc', |
| 41 'delete_tree_work_item.h', |
36 'google_chrome_distribution.cc', | 42 'google_chrome_distribution.cc', |
| 43 'google_chrome_distribution.h', |
37 'google_update_constants.cc', | 44 'google_update_constants.cc', |
| 45 'google_update_constants.h', |
38 'google_update_settings.cc', | 46 'google_update_settings.cc', |
| 47 'google_update_settings.h', |
39 'helper.cc', | 48 'helper.cc', |
| 49 'helper.h', |
| 50 'html_dialog.h', |
40 'html_dialog_impl.cc', | 51 'html_dialog_impl.cc', |
41 'install_util.cc', | 52 'install_util.cc', |
| 53 'install_util.h', |
42 'l10n_string_util.cc', | 54 'l10n_string_util.cc', |
| 55 'l10n_string_util.h', |
43 'logging_installer.cc', | 56 'logging_installer.cc', |
| 57 'logging_installer.h', |
44 'lzma_util.cc', | 58 'lzma_util.cc', |
| 59 'lzma_util.h', |
45 'master_preferences.cc', | 60 'master_preferences.cc', |
| 61 'master_preferences.h', |
46 'set_reg_value_work_item.cc', | 62 'set_reg_value_work_item.cc', |
| 63 'set_reg_value_work_item.h', |
47 'shell_util.cc', | 64 'shell_util.cc', |
| 65 'shell_util.h', |
48 'util_constants.cc', | 66 'util_constants.cc', |
| 67 'util_constants.h', |
49 'version.cc', | 68 'version.cc', |
| 69 'version.h', |
50 'work_item.cc', | 70 'work_item.cc', |
| 71 'work_item.h', |
51 'work_item_list.cc', | 72 'work_item_list.cc', |
52 ] | 73 'work_item_list.h', |
| 74 ]) |
53 | 75 |
54 # TODO(port): | 76 # TODO(port): |
55 if env.Bit('windows'): | 77 if env.Bit('windows'): |
56 env.ChromeLibrary('util', input_files) | 78 env.ChromeLibrary('util', input_files) |
57 | 79 |
58 env.ChromeMSVSProject('$CHROME_DIR/installer/util/util.vcproj', | 80 p = env.ChromeMSVSProject('util.vcproj', |
59 dependencies = [ | 81 dest=('$CHROME_SRC_DIR/chrome/' |
60 ('$CHROME_DIR/installer/util/prebuild/' + | 82 + 'installer/util/util.vcproj'), |
61 'util_prebuild.vcproj'), | 83 guid='{EFBB1436-A63F-4CD8-9E99-B89226E782EC}', |
62 ], | 84 dependencies = [ |
63 guid='{EFBB1436-A63F-4CD8-9E99-B89226E782EC}') | 85 ('$CHROME_DIR/installer/util/prebuild/' + |
| 86 'util_prebuild.vcproj'), |
| 87 ], |
| 88 # TODO(sgk): when we can intuit the hierarchy |
| 89 # from the built targets. |
| 90 #buildtargets=TODO, |
| 91 files=input_files, |
| 92 local_directory_prefix='./', |
| 93 tools=[ |
| 94 'VCPreBuildEventTool', |
| 95 'VCCustomBuildTool', |
| 96 'VCXMLDataGeneratorTool', |
| 97 'VCWebServiceProxyGeneratorTool', |
| 98 'VCMIDLTool', |
| 99 'VCCLCompilerTool', |
| 100 'VCManagedResourceCompilerTool', |
| 101 'VCResourceCompilerTool', |
| 102 'VCPreLinkEventTool', |
| 103 'VCLibrarianTool', |
| 104 'VCALinkTool', |
| 105 'VCXDCMakeTool', |
| 106 'VCBscMakeTool', |
| 107 'VCFxCopTool', |
| 108 'VCPostBuildEventTool', |
| 109 ], |
| 110 ConfigurationType='4') |
64 | 111 |
65 | 112 |
| 113 p.AddConfig('Debug|Win32', |
| 114 InheritedPropertySheets=[ |
| 115 '$(SolutionDir)../build/common.vsprops', |
| 116 '$(SolutionDir)../build/debug.vsprops', |
| 117 '$(SolutionDir)common/common.vsprops', |
| 118 '$(SolutionDir)installer/util/using_util.vsprops', |
| 119 '$(SolutionDir)../third_party/lzma_sdk/using_lzma_sdk.vsprops', |
| 120 ]) |
| 121 |
| 122 p.AddConfig('Release|Win32', |
| 123 InheritedPropertySheets=[ |
| 124 '$(SolutionDir)../build/common.vsprops', |
| 125 '$(SolutionDir)../build/release.vsprops', |
| 126 '$(SolutionDir)common/common.vsprops', |
| 127 '$(SolutionDir)installer/util/using_util.vsprops', |
| 128 '$(SolutionDir)../third_party/lzma_sdk/using_lzma_sdk.vsprops', |
| 129 ]) |
| 130 |
| 131 |
| 132 ############################################################################## |
| 133 |
| 134 input_files = ChromeFileList([ |
| 135 'prebuild/create_string_rc.bat', |
| 136 'prebuild/create_string_rc.py', |
| 137 ]) |
| 138 |
66 # TODO(port): | 139 # TODO(port): |
67 if env.Bit('windows'): | 140 if env.Bit('windows'): |
68 # create_string_rc.py imports FP.py from the tools/grit/grit/extern | 141 # create_string_rc.py imports FP.py from the tools/grit/grit/extern |
69 # directory, so add that to PYTHONPATH for this command execution. | 142 # directory, so add that to PYTHONPATH for this command execution. |
70 env_x = env.Clone() | 143 env_x = env.Clone() |
71 env_x.AppendENVPath('PYTHONPATH', | 144 env_x.AppendENVPath('PYTHONPATH', |
72 [env_x.Dir('$CHROME_SRC_DIR/tools/grit/grit/extern').abspath]) | 145 [env_x.Dir('$CHROME_SRC_DIR/tools/grit/grit/extern').abspath]) |
73 env_x.Command(['$CHROME_DIR/installer/util/installer_util_strings.rc', | 146 env_x.Command(['$CHROME_DIR/installer/util/installer_util_strings.rc', |
74 '$CHROME_DIR/installer/util/installer_util_strings.h'], | 147 '$CHROME_DIR/installer/util/installer_util_strings.h'], |
75 ['$CHROME_DIR/installer/util/prebuild/create_string_rc.py', | 148 ['$CHROME_DIR/installer/util/prebuild/create_string_rc.py', |
76 '$CHROME_DIR/app/generated_resources.grd'] + | 149 '$CHROME_DIR/app/generated_resources.grd'] + |
77 env.Glob('$CHROME_DIR/app/resources/*.xtb'), | 150 env.Glob('$CHROME_DIR/app/resources/*.xtb'), |
78 "$PYTHON ${SOURCES[0]} ${TARGET.dir}") | 151 "$PYTHON ${SOURCES[0]} ${TARGET.dir}") |
| 152 |
| 153 p = env.ChromeMSVSProject('prebuild/util_prebuild.vcproj', |
| 154 dest=('$CHROME_SRC_DIR/chrome/installer/' |
| 155 + 'util/prebuild/util_prebuild.vcproj'), |
| 156 guid='{0026A376-C4F1-4575-A1BA-578C69F07013}', |
| 157 # TODO(sgk): when we can intuit the hierarchy |
| 158 # from the built targets. |
| 159 #buildtargets=TODO, |
| 160 files=input_files, |
| 161 relative_path_prefix='./', |
| 162 tools=[ |
| 163 'VCPreBuildEventTool', |
| 164 MSVSTool('VCCustomBuildTool', |
| 165 CommandLine=('create_string_rc.bat ' |
| 166 + '$(IntDir)'), |
| 167 AdditionalDependencies=( |
| 168 'create_string_rc.py;' |
| 169 + '$(SolutionDir)/app/' |
| 170 + 'generated_resources.grd'), |
| 171 Outputs=('$(IntDir)/' |
| 172 + 'installer_util_strings.rc;' |
| 173 + '$(IntDir)/' |
| 174 + 'installer_util_strings.h')), |
| 175 'VCMIDLTool', |
| 176 'VCPostBuildEventTool', |
| 177 ], |
| 178 ConfigurationType='10') |
| 179 |
| 180 |
| 181 p.AddConfig('Debug|Win32', |
| 182 InheritedPropertySheets=[ |
| 183 '$(SolutionDir)../build/common.vsprops', |
| 184 '$(SolutionDir)../build/debug.vsprops', |
| 185 ]) |
| 186 |
| 187 p.AddConfig('Release|Win32', |
| 188 InheritedPropertySheets=[ |
| 189 '$(SolutionDir)../build/common.vsprops', |
| 190 '$(SolutionDir)../build/release.vsprops', |
| 191 ]) |
OLD | NEW |